fix: compile for jvm 11

slisson · slisson · commit 3371600b787a · 2025-02-03T15:55:20.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,4 @@
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 
 plugins {
     alias(libs.plugins.kotlin.jvm) apply false
@@ -62,10 +59,8 @@ for ((majorVersion, fullVersion) in mpsVersions) {
             )
         }
 
-        plugins.withType<KotlinPlatformJvmPlugin> {
-            extensions.configure<KotlinJvmProjectExtension> {
-                jvmToolchain(11)
-            }
+        kotlinExtension.apply {
+            jvmToolchain(11)
         }
     }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -19,6 +19,10 @@ java {
 
 version = rootProject.version
 
+kotlin {
+    jvmToolchain(11)
+}
+
 publishing {
     repositories {
         if (project.hasProperty("artifacts.itemis.cloud.user")) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-import org.gradle.kotlin.dsl.configure`
`2`		`-import org.gradle.kotlin.dsl.withType`
`3`		`-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension`
`4`		`-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension`
`5`	`2`
`6`	`3`	`plugins {`
`7`	`4`	`alias(libs.plugins.kotlin.jvm) apply false`
`@@ -62,10 +59,8 @@ for ((majorVersion, fullVersion) in mpsVersions) {`
`62`	`59`	`)`
`63`	`60`	`}`
`64`	`61`
`65`		`- plugins.withType<KotlinPlatformJvmPlugin> {`
`66`		`- extensions.configure<KotlinJvmProjectExtension> {`
`67`		`- jvmToolchain(11)`
`68`		`- }`
	`62`	`+ kotlinExtension.apply {`
	`63`	`+ jvmToolchain(11)`
`69`	`64`	`}`
`70`	`65`	`}`
`71`	`66`