From 28f7dbe1299de0f6a75529af5737abab62f2408f Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Wed, 19 Nov 2025 14:32:14 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha11=20-=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?ksp-version-codes-processor=20=E6=A8=A1=E5=9D=97=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=9B=A0=20Java=20=E7=89=88=E6=9C=AC=E4=B8=8D?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=80=8C=E6=97=A0=E6=B3=95=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-logic/build.gradle.kts | 12 ++++++++--- .../main/kotlin/org/autojs/build/Versions.kt | 2 +- .../build.gradle.kts | 21 +++++++------------ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index ff130e8b..afbad1d2 100644 --- a/build-logic/build.gradle.kts +++ b/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() diff --git a/build-logic/convention/src/main/kotlin/org/autojs/build/Versions.kt b/build-logic/convention/src/main/kotlin/org/autojs/build/Versions.kt index 8c724a45..d449fce6 100644 --- a/build-logic/convention/src/main/kotlin/org/autojs/build/Versions.kt +++ b/build-logic/convention/src/main/kotlin/org/autojs/build/Versions.kt @@ -51,7 +51,7 @@ class Versions @JvmOverloads constructor( operator fun get(propertyInfo: List) = 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}" diff --git a/build-logic/ksp-version-codes-processor/build.gradle.kts b/build-logic/ksp-version-codes-processor/build.gradle.kts index 6b74d6d4..e84e3952 100644 --- a/build-logic/ksp-version-codes-processor/build.gradle.kts +++ b/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()) } -} \ No newline at end of file +}