Upgrade dependencies

app/build.gradle

@@ -73,7 +73,6 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.core:core:1.0.1'
     implementation project(':net')
-    fullImplementation project(':utils')
     fullImplementation project(':core')
     fullImplementation 'androidx.appcompat:appcompat:1.0.2'
     fullImplementation "androidx.preference:preference:${rootProject.ext.androidXVersion}"
@@ -83,12 +82,10 @@ dependencies {
     fullImplementation 'android.arch.work:work-runtime:1.0.0-beta01'
     fullImplementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     fullImplementation 'androidx.room:room-runtime:2.0.0'
-    fullImplementation 'com.github.topjohnwu:libsu:2.1.2'
-    fullImplementation 'org.kamranzafar:jtar:2.3'
     fullImplementation 'ru.noties:markwon:2.0.1'
     fullImplementation 'com.caverock:androidsvg-aar:1.3'
 
-    def butterKnifeVersion = '9.0.0-rc3'
+    def butterKnifeVersion = '10.0.0'
     if (properties.containsKey('android.injected.invoked.from.ide')) {
         fullImplementation "com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
     } else {

app/src/full/res/xml/keep.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:discard="@raw/busybox_arm,@raw/busybox_x86" />

core/build.gradle

@@ -26,8 +26,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':net')
+    api project(':net')
-    implementation project(':utils')
+    api project(':utils')
-    implementation 'com.github.topjohnwu:libsu:2.1.2'
+    api 'org.kamranzafar:jtar:2.3'
-    implementation 'org.kamranzafar:jtar:2.3'
+
+    def libsuVersion = '2.2.0'
+    api "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    api "com.github.topjohnwu.libsu:io:${libsuVersion}"
 }

core/src/main/java/com/topjohnwu/core/App.java

@@ -29,20 +29,19 @@ public class App extends ContainerApp {
 
     private Resources mResource;
 
-    public App() {
+    static {
-        self = this;
+        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER | Shell.FLAG_USE_MAGISK_BUSYBOX);
+        Shell.Config.verboseLogging(BuildConfig.DEBUG);
+        Shell.Config.addInitializers(RootUtils.class);
+        Shell.Config.setTimeout(2);
     }
 
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
+        self = this;
         mResource = base.getResources();
 
-        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER);
-        Shell.Config.verboseLogging(BuildConfig.DEBUG);
-        Shell.Config.setInitializer(RootUtils.class);
-        Shell.Config.setTimeout(2);
-
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
         mDB = new MagiskDB(this);
         repoDB = new RepoDatabaseHelper(this);

core/src/main/java/com/topjohnwu/core/utils/RootUtils.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import com.topjohnwu.core.Const;
 import com.topjohnwu.core.Data;
 import com.topjohnwu.core.R;
-import com.topjohnwu.superuser.BusyBox;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
 import com.topjohnwu.superuser.io.SuFile;
@@ -17,10 +16,6 @@ import androidx.annotation.NonNull;
 
 public class RootUtils extends Shell.Initializer {
 
-    static {
-        BusyBox.BB_PATH = new File(Const.BUSYBOX_PATH);
-    }
-
     public static void rmAndLaunch(String rm, String launch) {
         Shell.su(Utils.fmt("(rm_launch %d %s %s)&", Const.USER_ID, rm, launch)).exec();
     }