6.7.0 - Alpha6 - 使用 Toolchain 替代 sourceCompatibility/targetCompatibility 以降低构建环境差异
This commit is contained in:
@@ -10,6 +10,7 @@ plugins {
|
||||
id("org.autojs.build.utils")
|
||||
id("org.autojs.build.versions")
|
||||
id("org.autojs.build.signs")
|
||||
id("org.autojs.build.jvm-convention")
|
||||
id("com.android.application")
|
||||
id("com.google.devtools.ksp")
|
||||
id("org.jetbrains.kotlin.android") /* kotlin("android") */
|
||||
@@ -567,8 +568,6 @@ android {
|
||||
|
||||
compileOptions {
|
||||
isCoreLibraryDesugaringEnabled = true
|
||||
sourceCompatibility = versions.javaVersion
|
||||
targetCompatibility = versions.javaVersion
|
||||
}
|
||||
|
||||
// @Hint by SuperMonster003 on Sep 25, 2024.
|
||||
@@ -619,12 +618,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
kotlinOptions {
|
||||
jvmTarget = versions.javaVersion.toString()
|
||||
// freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
|
||||
}
|
||||
|
||||
lint {
|
||||
abortOnError = false
|
||||
}
|
||||
@@ -745,12 +738,6 @@ tasks {
|
||||
// options.compilerArgs.addAll(listOf("-Xlint:deprecation", "-Xlint:unchecked"))
|
||||
}
|
||||
|
||||
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
|
||||
// @Archived by SuperMonster003 on Aug 14, 2024.
|
||||
// # kotlinOptions { jvmTarget = versions.javaVersion.toString() }
|
||||
compilerOptions { jvmTarget.set(JvmTarget.valueOf("JVM_${versions.javaVersion}")) }
|
||||
}
|
||||
|
||||
register<Copy>("appendDigestToReleasedFiles") {
|
||||
listOf(flavorNameApp, flavorNameInrt).forEach { flavorName ->
|
||||
val src = "$flavorName/$buildTypeRelease"
|
||||
|
||||
Reference in New Issue
Block a user