6.7.0 - Alpha6 - 使用 Toolchain 替代 sourceCompatibility/targetCompatibility 以降低构建环境差异

modules/apk-parser/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -17,15 +18,6 @@ android {
         consumerProguardFiles "consumer-rules.pro"
         multiDexEnabled true
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
 }
 
 dependencies {

modules/apk-signer/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -18,15 +19,6 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
-
     sourceSets {
         main {
             java.srcDirs = ['src/main/java']

modules/color-picker/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -18,15 +19,6 @@ android {
         versionName '1.1.0'
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
-
     lintOptions {
         abortOnError false
     }

modules/jieba-analysis/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -19,15 +20,6 @@ android {
         testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
-
     sourceSets {
         main {
             // 主 Java/Kotlin 目录

modules/material-date-time-picker/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -25,15 +26,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
-
     lintOptions {
         abortOnError false
     }

modules/material-dialogs/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'org.autojs.build.versions'
+    id 'org.autojs.build.jvm-convention'
     id 'com.android.library'
     id 'kotlin-android'
 }
@@ -19,15 +20,6 @@ android {
         consumerProguardFiles 'progress-proguard.txt'
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-        targetCompatibility = JavaVersion.toVersion(project.ext.javaVersion)
-    }
-
-    kotlinOptions {
-        jvmTarget = project.ext.javaVersion
-    }
-
     lintOptions {
         abortOnError false
     }