Pass -Xjdk-release option to Kotlin compiler

Author: marcphilipp

gradle/base/code-generator-model/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
 
 plugins {
     `kotlin-dsl`
@@ -10,5 +10,8 @@ java {
 }
 
 kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_17
+    compilerOptions {
+        jvmTarget = JVM_17
+        freeCompilerArgs.add("-Xjdk-release=17")
+    }
 }

gradle/base/dsl-extensions/build.gradle.kts

@@ -9,5 +9,8 @@ tasks.compileJava {
 }
 
 kotlin {
-    compilerOptions.jvmTarget = JVM_21
+    compilerOptions {
+        jvmTarget = JVM_21
+        freeCompilerArgs.add("-Xjdk-release=21")
+    }
 }

gradle/plugins/code-generator/build.gradle.kts

@@ -18,5 +18,8 @@ tasks.compileJava {
 }
 
 kotlin {
-	compilerOptions.jvmTarget = JVM_21
+	compilerOptions {
+		jvmTarget = JVM_21
+		freeCompilerArgs.add("-Xjdk-release=21")
+	}
 }

gradle/plugins/common/build.gradle.kts

@@ -26,5 +26,8 @@ tasks.compileJava {
 }
 
 kotlin {
-	compilerOptions.jvmTarget = JVM_21
+	compilerOptions {
+		jvmTarget = JVM_21
+		freeCompilerArgs.add("-Xjdk-release=21")
+	}
 }

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

@@ -1,3 +1,4 @@
+
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_1
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -20,7 +21,8 @@ tasks.withType<KotlinCompile>().configureEach {
 		languageVersion = apiVersion
 		allWarningsAsErrors.convention(true)
 		javaParameters = true
-		freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+		freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+		freeCompilerArgs.add(jvmTarget.map { "-Xjdk-release=${JavaVersion.toVersion(it.target).majorVersion}" })
 	}
 }
 

gradle/plugins/publishing/build.gradle.kts

@@ -30,5 +30,8 @@ tasks.compileJava {
 }
 
 kotlin {
-	compilerOptions.jvmTarget = JVM_21
+	compilerOptions {
+		jvmTarget = JVM_21
+		freeCompilerArgs.add("-Xjdk-release=21")
+	}
 }