Pass --release=21 to javac rather than source/target compatibility

marcphilipp · marcphilipp · commit e7860393fa63 · 2025-06-06T16:11:14.000+02:00
diff --git a/gradle/base/dsl-extensions/build.gradle.kts b/gradle/base/dsl-extensions/build.gradle.kts
@@ -4,9 +4,8 @@ plugins {
     `kotlin-dsl`
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+tasks.compileJava {
+    options.release = 21
 }
 
 kotlin {
diff --git a/gradle/plugins/build-parameters/build.gradle.kts b/gradle/plugins/build-parameters/build.gradle.kts
@@ -4,9 +4,8 @@ plugins {
 
 group = "junitbuild"
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+tasks.compileJava {
+	options.release = 21
 }
 
 buildParameters {
diff --git a/gradle/plugins/code-generator/build.gradle.kts b/gradle/plugins/code-generator/build.gradle.kts
@@ -13,9 +13,8 @@ dependencies {
 	implementation(libs.jte)
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+tasks.compileJava {
+	options.release = 21
 }
 
 kotlin {
diff --git a/gradle/plugins/common/build.gradle.kts b/gradle/plugins/common/build.gradle.kts
@@ -21,9 +21,8 @@ dependencies {
 	implementation(libs.plugins.spotless.markerCoordinates)
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+tasks.compileJava {
+	options.release = 21
 }
 
 kotlin {
diff --git a/gradle/plugins/publishing/build.gradle.kts b/gradle/plugins/publishing/build.gradle.kts
@@ -25,9 +25,8 @@ configurations.configureEach {
 	}
 }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+tasks.compileJava {
+	options.release = 21
 }
 
 kotlin {

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@ plugins {`
`4`	`4`	`kotlin-dsl`
`5`	`5`	`}`
`6`	`6`
`7`		`-java {`
`8`		`- sourceCompatibility = JavaVersion.VERSION_21`
`9`		`- targetCompatibility = JavaVersion.VERSION_21`
	`7`	`+tasks.compileJava {`
	`8`	`+ options.release = 21`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@ plugins {`
`4`	`4`
`5`	`5`	`group = "junitbuild"`
`6`	`6`
`7`		`-java {`
`8`		`- sourceCompatibility = JavaVersion.VERSION_21`
`9`		`- targetCompatibility = JavaVersion.VERSION_21`
	`7`	`+tasks.compileJava {`
	`8`	`+ options.release = 21`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`buildParameters {`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ dependencies {`
`13`	`13`	`implementation(libs.jte)`
`14`	`14`	`}`
`15`	`15`
`16`		`-java {`
`17`		`- sourceCompatibility = JavaVersion.VERSION_21`
`18`		`- targetCompatibility = JavaVersion.VERSION_21`
	`16`	`+tasks.compileJava {`
	`17`	`+ options.release = 21`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,8 @@ dependencies {`
`21`	`21`	`implementation(libs.plugins.spotless.markerCoordinates)`
`22`	`22`	`}`
`23`	`23`
`24`		`-java {`
`25`		`- sourceCompatibility = JavaVersion.VERSION_21`
`26`		`- targetCompatibility = JavaVersion.VERSION_21`
	`24`	`+tasks.compileJava {`
	`25`	`+ options.release = 21`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ configurations.configureEach {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-java {`
`29`		`- sourceCompatibility = JavaVersion.VERSION_21`
`30`		`- targetCompatibility = JavaVersion.VERSION_21`
	`28`	`+tasks.compileJava {`
	`29`	`+ options.release = 21`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`kotlin {`