6.7.0 - Alpha11 - 修复 ksp-version-codes-processor 模块可能因 Java 版本不兼容而无法构建的问题

build-logic/build.gradle.kts

@@ -22,9 +22,15 @@ run determineBuildLogicJdk@{
         requireNotNull(it) { "version.properties does not contain \"$key\"" }
     }.toInt()
 
-    val javaVersionMinSupported = props.requireIntProperty("JAVA_VERSION_MIN_SUPPORTED")
-    val javaVersionMaxSupported = props.requireIntProperty("JAVA_VERSION_MAX_SUPPORTED")
-    val javaVersionMinSuggested = props.requireIntProperty("JAVA_VERSION_MIN_SUGGESTED")
+    val javaVersionMinSupported = props.requireIntProperty("JAVA_VERSION_MIN_SUPPORTED").also {
+        System.setProperty("gradle.java.version.min.supported", "$it")
+    }
+    val javaVersionMaxSupported = props.requireIntProperty("JAVA_VERSION_MAX_SUPPORTED").also {
+        System.setProperty("gradle.java.version.max.supported", "$it")
+    }
+    val javaVersionMinSuggested = props.requireIntProperty("JAVA_VERSION_MIN_SUGGESTED").also {
+        System.setProperty("gradle.java.version.min.suggested", "$it")
+    }
 
     val javaVersionCurrentInt = JavaVersion.current().majorVersion.toInt()
 

build-logic/convention/src/main/kotlin/org/autojs/build/Versions.kt

@@ -51,7 +51,7 @@ class Versions @JvmOverloads constructor(
     operator fun get(propertyInfo: List<String>) = bp[propertyInfo]
 
     fun showInfo() {
-        val title = "Version information for AutoJs6 app library"
+        val title = "Version information for ${project.rootProject.name} app library"
 
         val infoVerName = "Version name: $appVersionName"
         val infoVerCode = "Version code: ${if (isBuildNumberAutoIncremented) "${appVersionCode + 1} [auto-incremented]" else appVersionCode}"

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

@@ -16,25 +16,18 @@ dependencies {
     implementation(libs.kotlin.csv.jvm)
 }
 
-System.getProperty("gradle.java.version.select").toInt().let { jdk ->
+System.getProperty("gradle.java.version.min.supported").let { minJdk ->
     java {
+        sourceCompatibility = JavaVersion.toVersion(minJdk)
+        targetCompatibility = JavaVersion.toVersion(minJdk)
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(jdk))
+            languageVersion.set(JavaLanguageVersion.of(minJdk))
         }
     }
-    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))
+            jvmTarget.set(JvmTarget.fromTarget(minJdk))
         }
+        jvmToolchain(minJdk.toInt())
     }
-}
+}