Use lazy configuration APIs

Author: marcphilipp

gradle/plugins/common/src/main/kotlin/JavaLibraryExtension.kt

@@ -1,7 +1,15 @@
 import org.gradle.api.JavaVersion
+import org.gradle.api.provider.Property
+
+@Suppress("LeakingThis")
+abstract class JavaLibraryExtension {
+
+    abstract val mainJavaVersion: Property<JavaVersion>
+    abstract val testJavaVersion: Property<JavaVersion>
+
+    init {
+        mainJavaVersion.convention(JavaVersion.VERSION_17)
+        testJavaVersion.convention(JavaVersion.VERSION_21)
+    }
 
-open class JavaLibraryExtension {
-    var mainJavaVersion: JavaVersion = JavaVersion.VERSION_17
-    var testJavaVersion: JavaVersion = JavaVersion.VERSION_21
-    var configureRelease: Boolean = true
 }

gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts

@@ -276,47 +276,39 @@ tasks.compileTestJava {
 	))
 }
 
-afterEvaluate {
-	configurations {
-		apiElements {
-			attributes {
-				attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, extension.mainJavaVersion.majorVersion.toInt())
-			}
-		}
-		runtimeElements {
-			attributes {
-				attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, extension.mainJavaVersion.majorVersion.toInt())
-			}
+configurations {
+	apiElements {
+		attributes {
+			attributeProvider(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, extension.mainJavaVersion.map { it.majorVersion.toInt() })
 		}
 	}
-	tasks {
-		compileJava {
-			if (extension.configureRelease) {
-				options.release = extension.mainJavaVersion.majorVersion.toInt()
-			} else {
-				sourceCompatibility = extension.mainJavaVersion.majorVersion
-				targetCompatibility = extension.mainJavaVersion.majorVersion
-			}
-		}
-		compileTestJava {
-			if (extension.configureRelease) {
-				options.release = extension.testJavaVersion.majorVersion.toInt()
-			} else {
-				sourceCompatibility = extension.testJavaVersion.majorVersion
-				targetCompatibility = extension.testJavaVersion.majorVersion
-			}
+	runtimeElements {
+		attributes {
+			attributeProvider(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, extension.mainJavaVersion.map { it.majorVersion.toInt() })
 		}
 	}
+}
+
+tasks {
+	compileJava {
+		options.release = extension.mainJavaVersion.map { it.majorVersion.toInt() }
+	}
+	compileTestJava {
+		options.release = extension.testJavaVersion.map { it.majorVersion.toInt() }
+	}
+}
+
+afterEvaluate {
 	pluginManager.withPlugin("groovy") {
 		tasks.named<GroovyCompile>("compileGroovy").configure {
 			// Groovy compiler does not support the --release flag.
-			sourceCompatibility = extension.mainJavaVersion.majorVersion
-			targetCompatibility = extension.mainJavaVersion.majorVersion
+			sourceCompatibility = extension.mainJavaVersion.get().majorVersion
+			targetCompatibility = extension.mainJavaVersion.get().majorVersion
 		}
 		tasks.named<GroovyCompile>("compileTestGroovy").configure {
 			// Groovy compiler does not support the --release flag.
-			sourceCompatibility = extension.testJavaVersion.majorVersion
-			targetCompatibility = extension.testJavaVersion.majorVersion
+			sourceCompatibility = extension.testJavaVersion.get().majorVersion
+			targetCompatibility = extension.testJavaVersion.get().majorVersion
 		}
 	}
 }
@@ -335,6 +327,6 @@ pluginManager.withPlugin("java-test-fixtures") {
 		config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
 	}
 	tasks.named<JavaCompile>("compileTestFixturesJava") {
-		options.release = extension.testJavaVersion.majorVersion.toInt()
+		options.release = extension.testJavaVersion.map { it.majorVersion.toInt() }
 	}
 }

gradle/plugins/common/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts

@@ -11,26 +11,19 @@ tasks.named("kotlinSourcesJar") {
 	enabled = false
 }
 
+val javaLibraryExtension = project.the<JavaLibraryExtension>()
+
 tasks.withType<KotlinCompile>().configureEach {
 	compilerOptions {
+		jvmTarget = javaLibraryExtension.mainJavaVersion.map { JvmTarget.fromTarget(it.toString()) }
 		apiVersion = KotlinVersion.fromVersion("1.6")
 		languageVersion = apiVersion
-		allWarningsAsErrors = false
-		// Compiler arg is required for Kotlin 1.6 and below
-		// see https://kotlinlang.org/docs/whatsnew17.html#stable-opt-in-requirements
-		freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+		allWarningsAsErrors.convention(true)
+		javaParameters = true
+		freeCompilerArgs.addAll("-Xsuppress-version-warnings", "-opt-in=kotlin.RequiresOptIn")
 	}
 }
 
-afterEvaluate {
-	val extension = project.the<JavaLibraryExtension>()
-	tasks {
-		withType<KotlinCompile>().configureEach {
-			compilerOptions.jvmTarget = JvmTarget.fromTarget(extension.mainJavaVersion.toString())
-			compilerOptions.javaParameters = true
-		}
-		named<KotlinCompile>("compileTestKotlin") {
-			compilerOptions.jvmTarget = JvmTarget.fromTarget(extension.testJavaVersion.toString())
-		}
-	}
+tasks.named<KotlinCompile>("compileTestKotlin") {
+	compilerOptions.jvmTarget = javaLibraryExtension.testJavaVersion.map { JvmTarget.fromTarget(it.toString()) }
 }

gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts

@@ -79,8 +79,8 @@ tasks.withType<Jar>().named {
 val osgiProperties by tasks.registering(WriteProperties::class) {
 	destinationFile = layout.buildDirectory.file("verifyOSGiProperties.bndrun")
 	property("-standalone", true)
-	project.extensions.getByType(JavaLibraryExtension::class.java).let { javaLibrary ->
-		property("-runee", "JavaSE-${javaLibrary.mainJavaVersion}")
+	project.extensions.getByType(JavaLibraryExtension::class).let { javaLibrary ->
+		property("-runee", Callable { "JavaSE-${javaLibrary.mainJavaVersion.get()}" })
 	}
 	property("-runrequires", "osgi.identity;filter:='(osgi.identity=${project.name})'")
 	property("-runsystempackages", "jdk.internal.misc,jdk.jfr,sun.misc")

platform-tests/platform-tests.gradle.kts

@@ -131,7 +131,7 @@ tasks {
 		dependsOn(testWoodstox)
 	}
 	named<JavaCompile>(processStarter.compileJavaTaskName).configure {
-		options.release = javaLibrary.testJavaVersion.majorVersion.toInt()
+		options.release = javaLibrary.testJavaVersion.map { it.majorVersion.toInt() }
 	}
 	named<Checkstyle>("checkstyle${processStarter.name.capitalized()}").configure {
 		config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))