Use jvmToolchain API to configure builds (#572)

jselbo · Joshua Selbo · web-flow · commit 419997225126 · 2026-01-16T07:44:47.000+01:00
Co-authored-by: Joshua Selbo &lt;jselbo@meta.com&gt;
diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
@@ -43,11 +43,8 @@ dokkaHtml.configure {
     }
 }
 
-tasks.withType(KotlinCompile).configureEach {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-        targetCompatibility = "11"
-    }
+kotlin {
+    jvmToolchain(11) // This handles Kotlin compilation, Java compilation, and Gradle attributes automatically
 }
 
 javadoc.dependsOn dokkaHtml
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -23,9 +23,6 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
 }
 
-tasks.withType(KotlinCompile).configureEach {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-        targetCompatibility = "11"
-    }
+kotlin {
+    jvmToolchain(11) // This handles Kotlin compilation, Java compilation, and Gradle attributes automatically
 }

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,8 @@ dokkaHtml.configure {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-tasks.withType(KotlinCompile).configureEach {`
`47`		`- compilerOptions {`
`48`		`- jvmTarget.set(JvmTarget.JVM_11)`
`49`		`- targetCompatibility = "11"`
`50`		`- }`
	`46`	`+kotlin {`
	`47`	`+ jvmToolchain(11) // This handles Kotlin compilation, Java compilation, and Gradle attributes automatically`
`51`	`48`	`}`
`52`	`49`
`53`	`50`	`javadoc.dependsOn dokkaHtml`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,6 @@ dependencies {`
`23`	`23`	`testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"`
`24`	`24`	`}`
`25`	`25`
`26`		`-tasks.withType(KotlinCompile).configureEach {`
`27`		`- compilerOptions {`
`28`		`- jvmTarget.set(JvmTarget.JVM_11)`
`29`		`- targetCompatibility = "11"`
`30`		`- }`
	`26`	`+kotlin {`
	`27`	`+ jvmToolchain(11) // This handles Kotlin compilation, Java compilation, and Gradle attributes automatically`
`31`	`28`	`}`