Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 19527ad

Browse files
Merge pull request #32 from Kotlin/innk/update-libs
Upgrade Kotlin to 2.2.10 and Gradle to 9.0.0
2 parents 0bff46a + 8fc2fc0 commit 19527ad

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
plugins {
3-
kotlin("jvm") version "1.8.21"
2+
kotlin("jvm") version "2.2.20"
43
}
54

6-
val kotlinVersion: String by extra("1.8.21")
5+
val kotlinVersion: String by extra("2.2.10")
76
val kotlinCoroutinesVersion: String by extra("1.7.0-RC")
87

98
allprojects {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class ResolveTest {
3838
val res = evalFile(File("testData/hello-unresolved-junit.scriptwithdeps.kts"))
3939

4040
Assert.assertTrue(
41-
"test failed - expecting a failure with the message \"Unresolved reference: junit\" but received " +
41+
"test failed - expecting a failure with the message \"Unresolved reference 'junit'\" but received " +
4242
(if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
4343
":\n ${res.reports.joinToString("\n ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
44-
res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference: junit") })
44+
res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference 'junit'.") })
4545
}
4646

4747
@Test

‎jvm/basic/jvm-simple-script/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class SimpleTest {
2828
val res = evalFile(File("testData/error.simplescript.kts"))
2929

3030
Assert.assertTrue(
31-
"test failed - expecting a failure with the message \"Unresolved reference: abracadabra\" but received " +
31+
"test failed - expecting a failure with the message \"Unresolved reference 'abracadabra'\" but received " +
3232
(if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
3333
":\n ${res.reports.joinToString("\n ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
34-
res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference: abracadabra") })
34+
res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference 'abracadabra'") })
3535
}
3636
}

‎jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class SimpleMainKtsTest {
4747
@Test
4848
fun testResolveJunitDynamicVer() {
4949
val errRes = evalFile(File("$TEST_DATA_ROOT/hello-resolve-junit-dynver-error.smain.kts"))
50-
assertFailed("Unresolved reference: assertThrows", errRes)
50+
assertFailed("Unresolved reference 'assertThrows'", errRes)
5151

5252
val res = evalFile(File("$TEST_DATA_ROOT/hello-resolve-junit-dynver.smain.kts"))
5353
assertSucceeded(res)
@@ -56,7 +56,7 @@ class SimpleMainKtsTest {
5656
@Test
5757
fun testUnresolvedJunit() {
5858
val res = evalFile(File("$TEST_DATA_ROOT/hello-unresolved-junit.smain.kts"))
59-
assertFailed("Unresolved reference: junit", res)
59+
assertFailed("Unresolved reference 'junit'", res)
6060
}
6161

6262
@Test

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /