diff --git a/build.gradle.kts b/build.gradle.kts index 30cf71a..24605b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { - kotlin("jvm") version "1.8.21" + kotlin("jvm") version "2.1.21" } -val kotlinVersion: String by extra("1.8.21") -val kotlinCoroutinesVersion: String by extra("1.7.0-RC") +val kotlinVersion: String by extra("2.1.21") +val kotlinCoroutinesVersion: String by extra("1.10.2") allprojects { repositories { diff --git a/jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt b/jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt index 4174c67..dc8bbb8 100644 --- a/jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt +++ b/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 diff --git a/jvm/basic/jvm-simple-script/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt b/jvm/basic/jvm-simple-script/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt index fb3d444..7e745ba 100644 --- a/jvm/basic/jvm-simple-script/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/simple/test/simpleTest.kt +++ b/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'") }) } } \ No newline at end of file diff --git a/jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt b/jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt index 0d142db..e8b3590 100644 --- a/jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt +++ b/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