Update Kotlin JVM and Native to 2.1.20 (hanabi1224#478)

ktlwap · web-flow · commit 0c70f6ff29d1 · 2025-04-14T13:43:23.000+08:00
diff --git a/bench/algorithm/regex-redux/1n.kt b/bench/algorithm/regex-redux/1n.kt
@@ -37,6 +37,7 @@ fun main(args: Array<String>) {
     println("\n$ilen\n$clen\n${content.length}")
 }
 
+@OptIn(ExperimentalForeignApi::class)
 fun readAllText(filePath: String): String {
     val returnBuffer = StringBuilder()
     val file = fopen(filePath, "r")?: 
diff --git a/bench/include/kotlin-jvm/build.gradle.kts b/bench/include/kotlin-jvm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
-    val kotlinVersion = "2.0.21"
+    val kotlinVersion = "2.1.20"
     kotlin("jvm").version(kotlinVersion)
     kotlin("plugin.serialization").version(kotlinVersion)
     // kotlin("plugin.spring").version(kotlinVersion)
@@ -23,7 +23,7 @@ repositories {
 
 application {
     // Define the main class for the application.
-    mainClassName = "MainKt"
+    mainClass.set("MainKt")
 }
 
 dependencies {
diff --git a/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-jvm/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bench/include/kotlin-jvm/settings.gradle.kts b/bench/include/kotlin-jvm/settings.gradle.kts
@@ -1,3 +1 @@
 rootProject.name = "app"
-// https://docs.gradle.org/7.0/release-notes.html
-enableFeaturePreview("VERSION_CATALOGS")
diff --git a/bench/include/kotlin-native/build.gradle.kts b/bench/include/kotlin-native/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-  val kotlinVersion = "1.8.21"
+  val kotlinVersion = "2.1.20"
   kotlin("multiplatform").version(kotlinVersion)
   kotlin("plugin.serialization").version(kotlinVersion)
   id("com.github.ben-manes.versions").version("0.46.0")
@@ -24,8 +24,8 @@ kotlin {
         implementation(libs.bignum)
         implementation(libs.kbignum)
         // implementation("com.ionspin.kotlin:bignum:0.3.1")
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
       }
     }
   }
diff --git a/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties b/bench/include/kotlin-native/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/bench/include/kotlin-native/settings.gradle.kts b/bench/include/kotlin-native/settings.gradle.kts
@@ -1,2 +1 @@
-// https://docs.gradle.org/7.0/release-notes.html
-enableFeaturePreview("VERSION_CATALOGS")
+rootProject.name = "app"

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ fun main(args: Array<String>) {`
`37`	`37`	`println("\n$ilen\n$clen\n${content.length}")`
`38`	`38`	`}`
`39`	`39`
	`40`	`+@OptIn(ExperimentalForeignApi::class)`
`40`	`41`	`fun readAllText(filePath: String): String {`
`41`	`42`	`val returnBuffer = StringBuilder()`
`42`	`43`	`val file = fopen(filePath, "r")?:`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`	`1`	`rootProject.name = "app"`
`2`		`-// https://docs.gradle.org/7.0/release-notes.html`
`3`		`-enableFeaturePreview("VERSION_CATALOGS")`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion`
`3`	`3`	`import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget`
`4`	`4`
`5`	`5`	`plugins {`
`6`		`- val kotlinVersion = "1.8.21"`
	`6`	`+ val kotlinVersion = "2.1.20"`
`7`	`7`	`kotlin("multiplatform").version(kotlinVersion)`
`8`	`8`	`kotlin("plugin.serialization").version(kotlinVersion)`
`9`	`9`	`id("com.github.ben-manes.versions").version("0.46.0")`
`@@ -24,8 +24,8 @@ kotlin {`
`24`	`24`	`implementation(libs.bignum)`
`25`	`25`	`implementation(libs.kbignum)`
`26`	`26`	`// implementation("com.ionspin.kotlin:bignum:0.3.1")`
`27`		`- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")`
`28`		`- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")`
	`27`	`+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")`
	`28`	`+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-// https://docs.gradle.org/7.0/release-notes.html`
`2`		`-enableFeaturePreview("VERSION_CATALOGS")`
	`1`	`+rootProject.name = "app"`