From f315c4416bca3e10a70cd0045828a5ab1dcfbce8 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 19 Apr 2019 01:07:39 -0400 Subject: [PATCH 1/3] Upgrade libsu --- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cfda68a6e..a5b62dff3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ dependencies { implementation 'androidx.work:work-runtime:2.0.1' implementation 'androidx.transition:transition:1.1.0-beta01' - def libsuVersion = '2.4.0' + def libsuVersion = '2.5.0' implementation "com.github.topjohnwu.libsu:core:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" diff --git a/build.gradle b/build.gradle index b2fd9b603..8e9cd2bbc 100644 --- a/build.gradle +++ b/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.21" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 98c2c24b0..12c47ff2a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 26 00:03:20 EDT 2019 +#Mon Apr 15 22:35:08 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-rc-2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip From 71ce0de606c0c7b04b67fc3447909c8d24b38122 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 19 Apr 2019 02:11:22 -0400 Subject: [PATCH 2/3] Make debug buildable --- app/build.gradle | 40 ++++++++----------- app/src/main/java/com/topjohnwu/magisk/App.kt | 2 + 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6e42409a9..dbc98c4fa 100644 --- a/app/build.gradle +++ b/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,25 +42,19 @@ 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" - 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.5.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-android:${koin}") - implementation("org.koin:koin-androidx-viewmodel:${koin}") + implementation "org.koin:koin-core:${koin}" + implementation "org.koin:koin-android:${koin}" + implementation "org.koin:koin-androidx-viewmodel:${koin}" - def timber = "4.7.1" - implementation "com.jakewharton.timber:timber:${timber}" - - implementation("com.github.skoumalcz:teanity:0.3.3") { - exclude group: 'androidx.work', module: 'work-runtime-ktx' - exclude group: 'androidx.room', module: 'room-runtime' - } - - def navigation = "3.2.0" - implementation "com.ncapdevi:frag-nav:${navigation}" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.preference:preference:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04' + implementation 'androidx.cardview:cardview:1.0.0' + 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' + implementation 'androidx.multidex:multidex:2.0.1' } diff --git a/app/src/main/java/com/topjohnwu/magisk/App.kt b/app/src/main/java/com/topjohnwu/magisk/App.kt index 164f8e219..b55510d86 100644 --- a/app/src/main/java/com/topjohnwu/magisk/App.kt +++ b/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) From 93fb0e3d74ac34b73ba738aea3e0e307aba3ad7e Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 19 Apr 2019 03:26:33 -0400 Subject: [PATCH 3/3] Fix release builds --- app/proguard-rules.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 00ff344e1..33f347808 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -29,6 +29,11 @@ void onResponse(int); } +# Keep all fragment constructors +-keepclassmembers class * extends androidx.fragment.app.Fragment { + public (...); +} + # DelegateWorker -keep,allowobfuscation class * extends com.topjohnwu.magisk.model.worker.DelegateWorker