Upgrade to Kotlin 2.1.20-RC

Use the new application plugin replacement.
JakeWharton · Feb 24, 2025 · 9caf891 · 9caf891
1 parent 7b5b477
commit 9caf891
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 jetbrains-compose = "1.7.3"
-kotlin = "2.1.10"
+kotlin = "2.1.20-RC"
 kotlinx-coroutines = "1.10.1"
 
 [libraries]

diff --git a/samples/counter/build.gradle b/samples/counter/build.gradle
@@ -5,11 +5,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 apply from: "$rootDir/addAllTargets.gradle"
-apply plugin: 'application'
-
-application {
-	mainClass = 'example.Main'
-}
 
 kotlin {
 	sourceSets {
@@ -28,6 +23,14 @@ kotlin {
 		}
 	}
 
+	jvm {
+		binaries {
+			executable {
+				mainClass = 'example.Main'
+			}
+		}
+	}
+
 	targets.withType(KotlinNativeTarget).configureEach { target ->
 		target.binaries.executable {
 			entryPoint = 'example.main'
@@ -38,10 +41,4 @@ kotlin {
 			}
 		}
 	}
-
-	//noinspection ConfigurationAvoidance Cannot mutate this after buildscript evaluation.
-	targets.withType(KotlinJvmTarget) {
-		// Needed for 'application' plugin.
-		withJava()
-	}
 }
diff --git a/samples/robot/build.gradle b/samples/robot/build.gradle
@@ -5,11 +5,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 apply from: "$rootDir/addAllTargets.gradle"
-apply plugin: 'application'
-
-application {
-	mainClass = 'example.RobotKt'
-}
 
 kotlin {
 	sourceSets {
@@ -20,6 +15,14 @@ kotlin {
 		}
 	}
 
+	jvm {
+		binaries {
+			executable {
+				mainClass = 'example.RobotKt'
+			}
+		}
+	}
+
 	targets.withType(KotlinNativeTarget).configureEach { target ->
 		target.binaries.executable {
 			entryPoint = 'example.main'
@@ -30,10 +33,4 @@ kotlin {
 			}
 		}
 	}
-
-	//noinspection ConfigurationAvoidance Cannot mutate this after buildscript evaluation.
-	targets.withType(KotlinJvmTarget) {
-		// Needed for 'application' plugin.
-		withJava()
-	}
 }
diff --git a/tools/raw-mode-echo/build.gradle b/tools/raw-mode-echo/build.gradle
@@ -3,16 +3,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 apply from: "$rootDir/addAllTargets.gradle"
-apply plugin: 'application'
-
-application {
-	mainClass = 'example.Main'
-}
 
 kotlin {
-	// Needed for 'application' plugin.
-	jvm().withJava()
-
 	sourceSets {
 		commonMain {
 			dependencies {
@@ -23,6 +15,14 @@ kotlin {
 		}
 	}
 
+	jvm {
+		binaries {
+			executable {
+				mainClass = 'example.Main'
+			}
+		}
+	}
+
 	targets.withType(KotlinNativeTarget).configureEach { target ->
 		target.binaries.executable {
 			entryPoint = 'example.main'