Simplify configuration of jvm target

michaelbull · michaelbull · commit 50fa9958d738 · 2025-12-15T23:05:26.000Z
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,8 +2,6 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import com.github.benmanes.gradle.versions.updates.gradle.GradleReleaseChannel
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinJvm
-import org.gradle.api.JavaVersion.VERSION_1_8
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -27,15 +25,11 @@ tasks.withType<Jar> {
     }
 }
 
-java {
-    sourceCompatibility = VERSION_1_8
-    targetCompatibility = VERSION_1_8
-}
-
 kotlin {
+    jvmToolchain(8)
+
     compilerOptions {
         optIn.add("kotlin.contracts.ExperimentalContracts")
-        jvmTarget.set(JVM_1_8)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask`
`2`	`2`	`import com.github.benmanes.gradle.versions.updates.gradle.GradleReleaseChannel`
`3`	`3`	`import com.vanniktech.maven.publish.JavadocJar`
`4`	`4`	`import com.vanniktech.maven.publish.KotlinJvm`
`5`		`-import org.gradle.api.JavaVersion.VERSION_1_8`
`6`		`-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8`
`7`	`5`
`8`	`6`	`plugins {`
`9`	`7`	`alias(libs.plugins.kotlin.jvm)`
`@@ -27,15 +25,11 @@ tasks.withType<Jar> {`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`
`30`		`-java {`
`31`		`- sourceCompatibility = VERSION_1_8`
`32`		`- targetCompatibility = VERSION_1_8`
`33`		`-}`
`34`		`-`
`35`	`28`	`kotlin {`
	`29`	`+ jvmToolchain(8)`
	`30`	`+`
`36`	`31`	`compilerOptions {`
`37`	`32`	`optIn.add("kotlin.contracts.ExperimentalContracts")`
`38`		`- jvmTarget.set(JVM_1_8)`
`39`	`33`	`}`
`40`	`34`	`}`
`41`	`35`