Set source/target compatibility on JavaPluginExtension

marcphilipp · marcphilipp · commit a797fd8473c2 · 2025-05-29T11:25:13.000+02:00
So plugins like Groovy and Shadow can read it from there.
diff --git a/gradle/base/code-generator-model/build.gradle.kts b/gradle/base/code-generator-model/build.gradle.kts
@@ -1,3 +1,14 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     `kotlin-dsl`
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    compilerOptions.jvmTarget = JvmTarget.JVM_17
+}
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts
@@ -253,13 +253,13 @@ tasks {
 }
 
 afterEvaluate {
+	java {
+		// For Groovy and Shadow plugins
+		sourceCompatibility = extension.mainJavaVersion.get()
+		targetCompatibility = extension.mainJavaVersion.get()
+	}
 	pluginManager.withPlugin("groovy") {
-		tasks.named<GroovyCompile>("compileGroovy").configure {
-			// Groovy compiler does not support the --release flag.
-			sourceCompatibility = extension.mainJavaVersion.get().majorVersion
-			targetCompatibility = extension.mainJavaVersion.get().majorVersion
-		}
-		tasks.named<GroovyCompile>("compileTestGroovy").configure {
+		tasks.withType<GroovyCompile>().named { it.startsWith("compileTest") }.configureEach {
 			// Groovy compiler does not support the --release flag.
 			sourceCompatibility = extension.testJavaVersion.get().majorVersion
 			targetCompatibility = extension.testJavaVersion.get().majorVersion
