Merge remote-tracking branch 'john/WIP' into development

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

app/build.gradle

@@ -16,6 +16,7 @@ android {
     defaultConfig {
         applicationId 'com.topjohnwu.magisk'
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
         versionName configProps['appVersion']
         versionCode configProps['appVersionCode'] as Integer
         javaCompileOptions {
@@ -41,26 +42,20 @@ dependencies {
     implementation project(':net')
     implementation project(':shared')
     implementation project(':signing')
+
     implementation 'com.github.topjohnwu:jtar:1.0.0'
     implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
     implementation 'com.github.sevar83:indeterminate-checkbox:1.0.5'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.github.skoumalcz:teanity:0.3.3'
+    implementation 'com.ncapdevi:frag-nav:3.2.0'
 
     def markwonVersion = '3.0.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
     implementation "ru.noties.markwon:html:${markwonVersion}"
     implementation "ru.noties.markwon:image-svg:${markwonVersion}"
 
-    def androidXVersion = "1.0.0"
+    def libsuVersion = '2.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation "androidx.preference:preference:${androidXVersion}"
-    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
-    implementation "androidx.cardview:cardview:${androidXVersion}"
-    implementation "com.google.android.material:material:1.1.0-alpha05"
-    implementation 'androidx.work:work-runtime:2.0.1'
-    implementation 'androidx.transition:transition:1.1.0-beta01'
-
-    def libsuVersion = '2.4.0'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
 
@@ -69,18 +64,17 @@ dependencies {
     kapt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
 
     def koin = "2.0.0-rc-2"
-    implementation("org.koin:koin-core:${koin}")
+    implementation "org.koin:koin-core:${koin}"
-    implementation("org.koin:koin-android:${koin}")
+    implementation "org.koin:koin-android:${koin}"
-    implementation("org.koin:koin-androidx-viewmodel:${koin}")
+    implementation "org.koin:koin-androidx-viewmodel:${koin}"
 
-    def timber = "4.7.1"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "com.jakewharton.timber:timber:${timber}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
-
+    implementation 'androidx.preference:preference:1.0.0'
-    implementation("com.github.skoumalcz:teanity:0.3.3") {
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
-        exclude group: 'androidx.work', module: 'work-runtime-ktx'
+    implementation 'androidx.cardview:cardview:1.0.0'
-        exclude group: 'androidx.room', module: 'room-runtime'
+    implementation 'com.google.android.material:material:1.1.0-alpha05'
-    }
+    implementation 'androidx.work:work-runtime:2.0.1'
-
+    implementation 'androidx.transition:transition:1.1.0-beta01'
-    def navigation = "3.2.0"
+    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "com.ncapdevi:frag-nav:${navigation}"
 }

app/proguard-rules.pro

@@ -29,6 +29,11 @@
   void onResponse(int);
 }
 
+# Keep all fragment constructors
+-keepclassmembers class * extends androidx.fragment.app.Fragment {
+  public <init>(...);
+}
+
 # DelegateWorker
 -keep,allowobfuscation class * extends com.topjohnwu.magisk.model.worker.DelegateWorker
 

app/src/main/java/com/topjohnwu/magisk/App.kt

@@ -10,6 +10,7 @@ import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDex
 import androidx.preference.PreferenceManager
 import com.topjohnwu.magisk.data.database.MagiskDB
 import com.topjohnwu.magisk.data.database.RepoDatabaseHelper
@@ -46,6 +47,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
+        MultiDex.install(base)
         self = this
         deContext = base
         registerActivityLifecycleCallbacks(this)

build.gradle

@@ -15,7 +15,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools:r8:1.4.79'
-        classpath 'com.android.tools.build:gradle:3.5.0-alpha10'
+        classpath 'com.android.tools.build:gradle:3.5.0-alpha12'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30"
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Fri Apr 19 09:51:32 CEST 2019
+#Mon Apr 15 22:35:08 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME