6.0.2 - 新增images.bilateralFilter() 修复toast多次调用/客户端及服务端模式开关/安卓7无法使用UI模式 部分插件及工具版本更新

inrt/build.gradle

@@ -1,22 +1,22 @@
-apply plugin: "com.android.application"
-apply plugin: "kotlin-android"
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion versions.compile
+    compileSdkVersion versions.project.compile
 
     defaultConfig {
-        applicationId "com.stardust.auojs.inrt"
-        minSdkVersion versions.mini
-        targetSdkVersion versions.target
-        versionCode versions.appVersionCode
-        versionName versions.appVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        applicationId 'com.stardust.auojs.inrt'
+        minSdkVersion versions.project.mini
+        targetSdkVersion versions.project.target
+        versionCode versions.project.appVersionCode
+        versionName versions.project.appVersionName
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled true
     }
     lintOptions {
         abortOnError false
-        disable "MissingTranslation"
-        disable "ExtraTranslation"
+        disable 'MissingTranslation'
+        disable 'ExtraTranslation'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_16
@@ -37,7 +37,7 @@ android {
             reset()
 
             // Specifies a list of ABIs that Gradle should create APKs for.
-            include "armeabi-v7a"
+            include 'x86', 'armeabi-v7a'
 
             // Specifies that we do not want to also generate a universal APK that includes all ABIs.
             universalApk false
@@ -46,51 +46,51 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 def buildApkPluginForAbi(File pluginProjectDir, String abi) {
     copy {
-        from file("..\\app\\release\\")
-        into new File(pluginProjectDir, "app\\src\\main\\assets")
-        def fileName = "inrt-" + abi + "-release.apk"
+        from file('..\\app\\release\\')
+        into new File(pluginProjectDir, 'app\\src\\main\\assets')
+        def fileName = 'inrt-' + abi + '-release.apk'
         include fileName
-        rename fileName, "template.apk"
+        rename fileName, 'template.apk'
     }
     exec {
         workingDir pluginProjectDir
-        commandLine "gradlew.bat", "assembleRelease"
+        commandLine 'gradlew.bat', 'assembleRelease'
     }
     copy {
-        from new File(pluginProjectDir, "app\\build\\outputs\\apk\\release")
-        into file("..\\common\\release")
-        def fileName = "打包插件-" + versions.appVersionName + "-release.apk"
+        from new File(pluginProjectDir, 'app\\build\\outputs\\apk\\release')
+        into file('..\\common\\release')
+        def fileName = '打包插件-' + versions.project.appVersionName + '-release.apk'
         include fileName
-        rename fileName, "打包插件-" + abi + "-" + versions.appVersionName + "-release.apk"
+        rename fileName, '打包插件-' + abi + '-' + versions.project.appVersionName + '-release.apk'
     }
 }
 
 task buildApkPlugin {
     doLast {
-        def pluginProjectDirPath = "..\\..\\AutoJsApkBuilderPlugin"
+        def pluginProjectDirPath = '..\\..\\AutoJsApkBuilderPlugin'
         def pluginProjectDir = file(pluginProjectDirPath)
         if (!pluginProjectDir.exists() || !pluginProjectDir.isDirectory()) {
-            println "pluginProjectDir not exists"
+            println 'pluginProjectDir not exists'
             return
         }
-        buildApkPluginForAbi(pluginProjectDir, "armeabi-v7a")
+        buildApkPluginForAbi(pluginProjectDir, 'armeabi-v7a')
     }
 }
 
 tasks.whenTaskAdded { task ->
-    if (task.name == "assembleRelease") {
-        task.finalizedBy "buildApkPlugin"
+    if (task.name == 'assembleRelease') {
+        task.finalizedBy 'buildApkPlugin'
     }
 }
 
@@ -105,14 +105,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation "junit:junit:${junitVer}"
+    testImplementation "junit:junit:${versions.junit}"
 
-    implementation "com.github.bumptech.glide:glide:4.12.0"
-
-    implementation project(":libs:org.mozilla.rhino-1.7.14")
-    implementation project(":libs:org.opencv-4.5.4")
-
-    implementation project(":automator")
-    implementation project(":common")
-    implementation project(":autojs")
+    implementation project(':automator')
+    implementation project(':common')
+    implementation project(':autojs')
 }