Merge pull request #32 from Kotlin/innk/update-libs

Upgrade Kotlin to 2.2.10 and Gradle to 9.0.0

Author: imbananko

build.gradle.kts

@@ -1,9 +1,8 @@
-
 plugins {
-    kotlin("jvm") version "1.8.21"
+    kotlin("jvm") version "2.2.20"
 }
 
-val kotlinVersion: String by extra("1.8.21")
+val kotlinVersion: String by extra("2.2.10")
 val kotlinCoroutinesVersion: String by extra("1.7.0-RC")
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -38,10 +38,10 @@ class ResolveTest {
         val res = evalFile(File("testData/hello-unresolved-junit.scriptwithdeps.kts"))
 
         Assert.assertTrue(
-            "test failed - expecting a failure with the message \"Unresolved reference: junit\" but received " +
+            "test failed - expecting a failure with the message \"Unresolved reference 'junit'\" but received " +
                     (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
                     ":\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
-            res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference: junit") })
+            res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference 'junit'.") })
     }
 
     @Test

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

@@ -28,9 +28,9 @@ class SimpleTest {
         val res = evalFile(File("testData/error.simplescript.kts"))
 
         Assert.assertTrue(
-            "test failed - expecting a failure with the message \"Unresolved reference: abracadabra\" but received " +
+            "test failed - expecting a failure with the message \"Unresolved reference 'abracadabra'\" but received " +
                     (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
                     ":\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
-            res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference: abracadabra") })
+            res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unresolved reference 'abracadabra'") })
     }
 }

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

@@ -47,7 +47,7 @@ class SimpleMainKtsTest {
     @Test
     fun testResolveJunitDynamicVer() {
         val errRes = evalFile(File("$TEST_DATA_ROOT/hello-resolve-junit-dynver-error.smain.kts"))
-        assertFailed("Unresolved reference: assertThrows", errRes)
+        assertFailed("Unresolved reference 'assertThrows'", errRes)
 
         val res = evalFile(File("$TEST_DATA_ROOT/hello-resolve-junit-dynver.smain.kts"))
         assertSucceeded(res)
@@ -56,7 +56,7 @@ class SimpleMainKtsTest {
     @Test
     fun testUnresolvedJunit() {
         val res = evalFile(File("$TEST_DATA_ROOT/hello-unresolved-junit.smain.kts"))
-        assertFailed("Unresolved reference: junit", res)
+        assertFailed("Unresolved reference 'junit'", res)
     }
 
     @Test