tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SuperMonster003
2025-11-19 14:32:14 +08:00
parent 73e23e9e8f
commit 28f7dbe129
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build-logic/build.gradle.kts
View File

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

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

@@ -51,7 +51,7 @@ class Versions @JvmOverloads constructor(
operator fun get(propertyInfo: List<String>) = bp[propertyInfo] operator fun get(propertyInfo: List<String>) = bp[propertyInfo]
fun showInfo() { 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 infoVerName = "Version name: $appVersionName"
val infoVerCode = "Version code: ${if (isBuildNumberAutoIncremented) "${appVersionCode + 1} [auto-incremented]" else appVersionCode}" val infoVerCode = "Version code: ${if (isBuildNumberAutoIncremented) "${appVersionCode + 1} [auto-incremented]" else appVersionCode}"

21
build-logic/ksp-version-codes-processor/build.gradle.kts
View File

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