升级gradle 6.1修复 一些bug

Author: kkevsekk2

app/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'kotlin-kapt'
 
 def AAVersion = '4.5.2'
 def SupportLibVersion = '28.0.0'
@@ -24,6 +25,16 @@ android {
         versionName versions.appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [
+                        'resourcePackageName': applicationId,
+                        "androidManifestFile": "$projectDir/src/main/AndroidManifest.xml".toString()
+                ]
+            }
+        }
+
+
     }
     buildTypes {
         debug {
@@ -104,17 +115,19 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1"
     // Android Annotations
     annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
+    kapt "org.androidannotations:androidannotations:$AAVersion"
     implementation "org.androidannotations:androidannotations-api:$AAVersion"
     // ButterKnife
-    implementation('com.jakewharton:butterknife:9.0.0-rc2', {
+    implementation('com.jakewharton:butterknife:10.2.1', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    kapt 'com.jakewharton:butterknife-compiler:10.2.1'
     // Android supports
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
+    implementation 'androidx.multidex:multidex:2.0.1'
     // Personal libraries
     implementation 'com.github.hyb1996:MutableTheme:1.0.0'
     // Material Dialogs
@@ -147,7 +160,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.1.2"
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
@@ -157,6 +170,7 @@ dependencies {
         exclude group: 'com.android.support'
     })
     kapt 'com.github.bumptech.glide:compiler:4.8.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
     //joda time
     implementation 'joda-time:joda-time:2.9.9'
     // Tasker Plugin

app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt

@@ -96,9 +96,7 @@ class NodeInfoView : RecyclerView {
 
     internal inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        @BindView(R.id.name)
-        val attrName: TextView = itemView.findViewById(R.id.name)
-
+        val attrName: TextView = itemView.findViewById(R.id.name);
         val attrValue: TextView = itemView.findViewById(R.id.value)
 
         init {

app/src/main/java/org/autojs/autojs/ui/main/market/ImageText.kt

@@ -39,7 +39,7 @@ class ImageText : LinearLayout {
         a.getString(R.styleable.ImageText_text)?.let {
             textView.text = it
         }
-        val iconResId = a.getResourceId(R.styleable.ImageText_src, 0)
+        val iconResId = a.getResourceId(R.styleable.ImageText_altSrc, 0)
         if (iconResId != 0) {
             imageView.setImageResource(iconResId)
         }

app/src/main/res/layout/item_topic.xml

@@ -101,7 +101,7 @@
                 android:background="?selectableItemBackgroundBorderless"
                 android:tint="#939393"
                 app:image_width="30dp"
-                app:src="@drawable/download"
+                app:altSrc="@drawable/download"
                 app:text="@string/text_download"/>
 
             <org.autojs.autojs.ui.main.market.ImageText
@@ -111,7 +111,7 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackgroundBorderless"
                 app:image_width="30dp"
-                app:src="@drawable/upvote"/>
+                app:altSrc="@drawable/upvote"/>
 
             <org.autojs.autojs.ui.main.market.ImageText
                 android:id="@+id/downvote"
@@ -120,7 +120,7 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackgroundBorderless"
                 app:image_width="30dp"
-                app:src="@drawable/downvote"/>
+                app:altSrc="@drawable/downvote"/>
 
             <org.autojs.autojs.ui.main.market.ImageText
                 android:id="@+id/star"
@@ -129,7 +129,7 @@
                 android:layout_weight="1"
                 android:background="?selectableItemBackgroundBorderless"
                 app:image_width="30dp"
-                app:src="@drawable/star"
+                app:altSrc="@drawable/star"
                 app:text="@string/text_star"/>
 
         </LinearLayout>

app/src/main/res/layout/preference_category_custom.xml

@@ -6,7 +6,7 @@
               android:orientation="vertical">
 
     <TextView
-        android:id="@+android:id/title"
+        android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"

app/src/main/res/values/attrs.xml

@@ -37,7 +37,7 @@
 
     <declare-styleable name="ImageText">
         <attr name="text"/>
-        <attr name="src"/>
+        <attr name="altSrc"/>
         <attr name="image_width" format="dimension|reference"/>
     </declare-styleable>
 

app/src/main/res/values/strings.xml

@@ -5,7 +5,7 @@
     <string name="text_please_input_name">请输入名称</string>
     <string name="text_name">名称</string>
     <string name="text_go_to_setting">去设置</string>
-    <string name="explain_accessibility_permission">软件需要打开\"无障碍服务\"才能运行，请在随后的设置中选择\"Auto.js\"并开启服务。\n您也可以稍后在侧拉菜单中设置。</string>
+    <string name="explain_accessibility_permission">软件需要打开\"无障碍服务\"才能运行，请在随后的设置中选择\"Autox.js\"并开启服务。\n您也可以稍后在侧拉菜单中设置。</string>
     <string name="text_cancel">取消</string>
     <string name="text_path_is_empty">路径为空</string>
     <string name="text_file_not_exists">文件不存在</string>
@@ -27,14 +27,14 @@
     <string name="text_about">关于</string>
     <string name="text_licenses">开放源代码许可</string>
     <string name="text_do_not_remind_again">不再提示</string>
-    <string name="copyright">Copyright©2018-2019 All right reserves.</string>
-    <string name="developer">星尘幻影</string>
-    <string name="qq" translatable="false">2732014414</string>
-    <string name="email" translatable="false">hybbbb1996@gmail.com</string>
+    <string name="copyright">Copyright©2020-2025 All right reserves.</string>
+    <string name="developer">aaron</string>
+    <string name="qq" translatable="false">470722660</string>
+    <string name="email" translatable="false">kkevsekk@163.com</string>
     <string name="github">软件源代码</string>
     <string name="text_already_copy_to_clip">已复制到剪贴板</string>
-    <string name="my_github">https://github.com/hyb1996/NoRootScriptDroid</string>
-    <string name="share_app">[Auto.js]下载地址：http://www.coolapk.com/apk/org.autojs.autojs </string>
+    <string name="my_github">https://github.com/kkevsekk1/autox</string>
+    <string name="share_app">[Autox.js]下载地址：https://github.com/kkevsekk1/AutoX/releases </string>
     <string name="text_floating_window">悬浮窗</string>
     <string name="text_error_report">错误报告</string>
     <string name="text_press_again_to_exit">再按一次退出程序</string>

autojs/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     api('com.afollestad.material-dialogs:core:0.9.2.3', {
         exclude group: 'com.android.support'
     })
-    api 'com.google.android.material:material:1.1.0-alpha01'
+    api 'com.google.android.material:material:1.3.0-alpha02'
     api 'com.github.hyb1996:EnhancedFloaty:0.31'
     api 'com.makeramen:roundedimageview:2.3.0'
     // OpenCv

build.gradle

@@ -4,15 +4,15 @@ import groovy.json.JsonSlurper
 
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.70'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2'
+        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
 
     }
 }

common/build.gradle

@@ -11,7 +11,6 @@ android {
         targetSdkVersion versions.target
         versionCode 1
         versionName "1.0"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }

gradle.properties

@@ -6,7 +6,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -15,7 +15,7 @@
 #Mon Jan 23 10:16:46 CST 2017
 #systemProp.https.proxyPort=1080
 #systemProp.http.proxyHost=127.0.0.1
-org.gradle.jvmargs=-Xms2192m -Xmx2192m -Dfile.encoding=UTF-8
+#org.gradle.jvmargs=-Xms4192m -Xmx2192m -Dfile.encoding=UTF-8
 #systemProp.https.proxyHost=127.0.0.1
 #systemProp.http.proxyPort=1080
 android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 13 16:26:07 CST 2020
+#Mon Sep 14 18:07:46 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

project-versions.json

@@ -4,5 +4,5 @@
   "target": 28,
   "mini": 17,
   "compile": 28,
-  "buildTool": "28.0.3"
+  "buildTool": "29.0.2"
 }