Merge pull request clearw5#534 from hyb1996/dev

merge 4.1.1 int omaster
Ericwyn · Oct 11, 2019 · d4b731a · d4b731a
2 parents a27f868 + 4952ec7
commit d4b731a
Show file tree

Hide file tree

Showing 800 changed files with 32,504 additions and 14,744 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,12 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/caches
 .DS_Store
 /build
 /release
 /captures
 .externalNativeBuild
 *.apk
-*.exe
+*.exe
+.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/dictionaries/Stardust.xml b/.idea/dictionaries/Stardust.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,20 +1,29 @@
 apply plugin: 'com.android.application'
-def AAVersion = '4.3.1'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.jakewharton.butterknife'
+
+def AAVersion = '4.5.2'
+def SupportLibVersion = '28.0.0'
+
+configurations.all {
+    resolutionStrategy {
+        force "com.android.support:appcompat-v7:${SupportLibVersion}"
+        force "com.android.support:support-v4:${SupportLibVersion}"
+    }
+}
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion versions.compile
+    buildToolsVersion versions.buildTool
     defaultConfig {
         applicationId "org.autojs.autojs"
-        minSdkVersion 17
-        targetSdkVersion 23
-        versionCode 403
-        versionName "4.0.2 Alpha"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion versions.mini
+        targetSdkVersion versions.target
+        versionCode versions.appVersionCode
+        versionName versions.appVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
-        ndk {
-            abiFilters 'armeabi-v7a'
-        }
     }
     buildTypes {
         debug {
@@ -37,18 +46,33 @@ android {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
     }
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "${variant.name}-${variant.versionName}.apk"
-        }
-    }
 
     configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1'
     }
 
     flavorDimensions "channel"
+    splits {
+
+        // Configures multiple APKs based on ABI.
+        abi {
 
+            // Enables building multiple APKs per ABI.
+            enable true
+
+            // By default all ABIs are included, so use reset() and include to specify that we only
+            // want APKs for x86 and x86_64.
+
+            // Resets the list of ABIs that Gradle should create APKs for to none.
+            reset()
+
+            // Specifies a list of ABIs that Gradle should create APKs for.
+            include "x86", "armeabi-v7a"
+
+            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
+            universalApk false
+        }
+    }
     productFlavors {
         common {
             buildConfigField "String", "CHANNEL", '"common"'
@@ -62,6 +86,7 @@ android {
 
 
 
+
 repositories {
     flatDir {
         dirs 'libs'
@@ -70,82 +95,86 @@ repositories {
 }
 
 dependencies {
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
+    // Kotlin
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.1"
     // Android Annotations
     annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
-    compile "org.androidannotations:androidannotations-api:$AAVersion"
+    implementation "org.androidannotations:androidannotations-api:$AAVersion"
     // ButterKnife
-    compile('com.jakewharton:butterknife:8.6.0', {
+    implementation('com.jakewharton:butterknife:9.0.0-rc2', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
     // Android supports
-    compile 'com.android.support:appcompat-v7:25.4.0'
-    compile 'com.android.support:cardview-v7:25.4.0'
-    compile 'com.android.support:design:25.4.0'
-    compile 'com.android.support:multidex:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.0'
     // Personal libraries
-    compile 'com.github.hyb1996:MutableTheme:0.2.2'
+    implementation 'com.github.hyb1996:MutableTheme:1.0.0'
     // Material Dialogs
-    compile('com.afollestad.material-dialogs:core:0.9.2.3', {
+    implementation('com.afollestad.material-dialogs:core:0.9.2.3', {
         exclude group: 'com.android.support'
     })
     // Common Markdown
-    compile 'com.github.atlassian:commonmark-java:commonmark-parent-0.9.0'
+    implementation 'com.github.atlassian:commonmark-java:commonmark-parent-0.9.0'
     // Android issue reporter (a github issue reporter)
-    compile('com.heinrichreimersoftware:android-issue-reporter:1.3.1', {
+    implementation('com.heinrichreimersoftware:android-issue-reporter:1.3.1', {
         exclude group: 'com.afollestad.material-dialogs'
         exclude group: 'com.android.support'
     })
     //MultiLevelListView
-    compile 'com.github.hyb1996:android-multi-level-listview:1.1'
+    implementation 'com.github.hyb1996:android-multi-level-listview:1.1'
     //Licenses Dialog
-    compile 'de.psdev.licensesdialog:licensesdialog:1.8.1'
+    implementation 'de.psdev.licensesdialog:licensesdialog:1.8.1'
     //Expandable RecyclerView
-    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
+    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
     //FlexibleDivider
-    compile 'com.yqritc:recyclerview-flexibledivider:1.4.0'
+    implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
     //???
-    compile 'com.wang.avi:library:2.1.3'
+    implementation 'com.wang.avi:library:2.1.3'
     //Commons-lang
-    compile 'org.apache.commons:commons-lang3:3.6'
+    implementation 'org.apache.commons:commons-lang3:3.6'
     //Expandable RecyclerView
-    compile 'com.thoughtbot:expandablerecyclerview:1.3'
-    compile('com.github.hyb1996:FloatingCircularActionMenu:0.0.4')
-    compile 'com.github.hyb1996:Auto.js-ApkBuilder:1.0.1'
+    implementation 'com.thoughtbot:expandablerecyclerview:1.3'
+    implementation 'com.github.hyb1996:Auto.js-ApkBuilder:1.0.1'
     // RxJava
-    compile "io.reactivex.rxjava2:rxjava:2.1.2"
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation "io.reactivex.rxjava2:rxjava:2.1.2"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Retrofit
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.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'
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     //Glide
-    compile('com.github.bumptech.glide:glide:4.2.0', {
+    implementation('com.github.bumptech.glide:glide:4.8.0', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.2.0'
-    //dbflow
-    annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:4.1.2"
-    compile "com.github.Raizlabs.DBFlow:dbflow-core:4.1.2"
-    compile "com.github.Raizlabs.DBFlow:dbflow:4.1.2"
-    compile "com.github.Raizlabs.DBFlow:dbflow-rx2:4.1.2"
+    kapt 'com.github.bumptech.glide:compiler:4.8.0'
     //joda time
-    compile 'joda-time:joda-time:2.9.9'
+    implementation 'joda-time:joda-time:2.9.9'
     // Tasker Plugin
-    compile 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3'
+    implementation 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3'
     // Flurry
-    compile 'com.flurry.android:analytics:7.0.0@aar'
+    implementation 'com.flurry.android:analytics:7.0.0@aar'
+    // Bugly
+    implementation 'com.tencent.bugly:crashreport:2.6.6'
     // MaterialDialogCommon
-    compile('com.afollestad.material-dialogs:commons:0.9.2.3', {
+    implementation('com.afollestad.material-dialogs:commons:0.9.2.3', {
         exclude group: 'com.android.support'
     })
-    compile project(':automator')
-    compile project(':common')
-    compile project(':autojs')
-    implementation 'com.google.android.gms:play-services-ads:11.8.0'
+    // Android job
+    implementation 'com.evernote:android-job:1.2.6'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
+    // Optional, if you use support library fragments:
+    debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.1'
+    implementation project(':automator')
+    implementation project(':common')
+    implementation project(':autojs')
 }
diff --git a/app/libs/opencv-3.4.3.aar b/app/libs/opencv-3.4.3.aar
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -133,4 +133,9 @@
 # AVLoadingView
 
 -keep class com.wang.avi.** { *; }
--keep class com.wang.avi.indicators.** { *; }
+-keep class com.wang.avi.indicators.** { *; }
+
+# Bugly
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":203},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armeabi-v7a"}],"versionCode":261,"versionName":"4.1.1 Alpha2","enabled":true,"filterName":"armeabi-v7a","outputFile":"inrt-armeabi-v7a-release.apk","fullName":"armeabi-v7aRelease","baseName":"armeabi-v7a-release"},"path":"inrt-armeabi-v7a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkInfo":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":261,"versionName":"4.1.1 Alpha2","enabled":true,"filterName":"x86","outputFile":"inrt-x86-release.apk","fullName":"x86Release","baseName":"x86-release"},"path":"inrt-x86-release.apk","properties":{}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":203},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armeabi-v7a"}],"versionCode":261,"versionName":"4.1.1 Alpha2","enabled":true,"filterName":"armeabi-v7a","outputFile":"inrt-armeabi-v7a-release.apk","fullName":"armeabi-v7aRelease","baseName":"armeabi-v7a-release"},"path":"inrt-armeabi-v7a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkInfo":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":261,"versionName":"4.1.1 Alpha2","enabled":true,"filterName":"x86","outputFile":"inrt-x86-release.apk","fullName":"x86Release","baseName":"x86-release"},"path":"inrt-x86-release.apk","properties":{}}]