From fde78be2b4519b2edf4941a7f7e1eb5a882f19d0 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 30 May 2020 12:50:08 -0700
Subject: [PATCH] Update Android Studio

---
 app/build.gradle                         | 8 ++++----
 build.gradle                             | 4 ++--
 build.py                                 | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 native/build.gradle                      | 2 +-
 signing/build.gradle                     | 5 ++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0e11b21d4..06fa903d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,7 +82,7 @@ dependencies {
     implementation "${bindingAdapter}:${vBAdapt}"
     implementation "${bindingAdapter}-recyclerview:${vBAdapt}"
 
-    def vMarkwon = '4.3.1'
+    def vMarkwon = '4.4.0'
     implementation "io.noties.markwon:core:${vMarkwon}"
     implementation "io.noties.markwon:html:${vMarkwon}"
     implementation "io.noties.markwon:image:${vMarkwon}"
@@ -97,7 +97,7 @@ dependencies {
     implementation "org.koin:koin-android:${vKoin}"
     implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
 
-    def vRetrofit = '2.8.1'
+    def vRetrofit = '2.9.0'
     implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
     implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
@@ -122,7 +122,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
 
     implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
@@ -131,6 +131,6 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.3.4'
     implementation 'androidx.transition:transition:1.3.1'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'com.google.android.material:material:1.2.0-alpha05'
 }
diff --git a/build.gradle b/build.gradle
index 24d0174da..82e68114a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ if (configPath.exists())
 
 buildscript {
     ext.vKotlin = '1.3.72'
-    ext.vNav = '2.3.0-alpha05'
+    ext.vNav = '2.3.0-beta01'
 
     repositories {
         google()
@@ -17,7 +17,7 @@ buildscript {
         maven { url 'https://kotlin.bintray.com/kotlinx' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${vKotlin}"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$vNav"
 
diff --git a/build.py b/build.py
index d66b9a964..115bead2b 100755
--- a/build.py
+++ b/build.py
@@ -55,8 +55,8 @@ arch64 = ['arm64-v8a', 'x86_64']
 support_targets = ['magisk', 'magiskinit', 'magiskboot', 'magiskpolicy', 'resetprop', 'busybox', 'test']
 default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
 
-ndk_ver = '21b'
-ndk_ver_full = '21.1.6352462'
+ndk_ver = '21c'
+ndk_ver_full = '21.2.6472646'
 build_tools_ver = '29.0.3'
 
 ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk')
@@ -574,7 +574,7 @@ def setup_ndk(args):
     src_prop = op.join(ndk_path, 'source.properties')
     props = parse_props(src_prop)
     props['Pkg.Revision.orig'] = props['Pkg.Revision']
-    props['Pkg.Revision'] = '0.0.0'
+    props['Pkg.Revision'] = '99.99.99'
     with open(src_prop, 'w') as p:
         for key, val in props.items():
             print(f'{key} = {val}', file=p)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e867a4ae8..70703f0fd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 12 04:46:30 CST 2020
+#Fri May 29 10:45:31 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/native/build.gradle b/native/build.gradle
index d3cd0fd31..467efa834 100644
--- a/native/build.gradle
+++ b/native/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
 
-    ndkVersion '0.0.0'
+    ndkVersion '99.99.99'
 
     externalNativeBuild {
         ndkBuild {
diff --git a/signing/build.gradle b/signing/build.gradle
index f01c7c8ec..ece4ba61b 100644
--- a/signing/build.gradle
+++ b/signing/build.gradle
@@ -34,7 +34,6 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    def bcVer = '1.64'
-    api "org.bouncycastle:bcprov-jdk15on:${bcVer}"
-    api "org.bouncycastle:bcpkix-jdk15on:${bcVer}"
+    api "org.bouncycastle:bcprov-jdk15on:1.65.01"
+    api "org.bouncycastle:bcpkix-jdk15on:1.65"
 }