6.7.0 - Alpha11 - 修复 Gradle 构建脚本 Java 与 Kotlin 的 JVM 目标版本一致性问题

build-logic/ksp-version-codes-processor/build.gradle.kts

@@ -1,5 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    kotlin("jvm")
+    `kotlin-dsl`
 }
 
 repositories {
@@ -9,12 +11,30 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation(kotlin("stdlib"))
+
     implementation("com.google.devtools.ksp:symbol-processing-api:${System.getProperty("com.google.devtools.ksp")}")
     implementation(libs.kotlin.csv.jvm)
 }
 
-(gradle.extra["jdk"] as Int).let { jdk ->
-    kotlin { jvmToolchain(jdk) }
-    java { toolchain.languageVersion.set(JavaLanguageVersion.of(jdk)) }
+System.getProperty("gradle.java.version.select").toInt().let { jdk ->
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(jdk))
+        }
+    }
+    kotlin {
+        jvmToolchain(jdk)
+    }
 }
+
+System.getProperty("gradle.jvm.target.effective").let { jvm ->
+    java {
+        sourceCompatibility = JavaVersion.toVersion(jvm)
+        targetCompatibility = JavaVersion.toVersion(jvm)
+    }
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(jvm))
+        }
+    }
+}