From 56602cb9a33a3d943f970da8459e3ab7dec748cd Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 17 Jun 2020 02:33:33 -0700
Subject: [PATCH] Update gradle files

---
 app/build.gradle | 14 ++++++++------
 build.gradle     |  8 ++++----
 build.py         |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ecb32a00c..b219f445c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,13 +109,15 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
 
     def vOkHttp = '3.12.12'
-    implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") {
-        force = true
+    implementation("com.squareup.okhttp3:okhttp") {
+        version {
+            strictly "$vOkHttp"
+        }
     }
     implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
 
-    def vMoshi = '1.10.0-SNAPSHOT'
+    def vMoshi = '1.9.3'
     implementation "com.squareup.moshi:moshi:${vMoshi}"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
 
@@ -128,15 +130,15 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
 
     implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.4'
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
     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.3.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha05'
+    implementation 'com.google.android.material:material:1.2.0-beta01'
 }
diff --git a/build.gradle b/build.gradle
index 82e68114a..ee0599571 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-beta01'
+    ext.vNav = '2.3.0-rc01'
 
     repositories {
         google()
@@ -19,7 +19,7 @@ buildscript {
     dependencies {
         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"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -44,8 +44,8 @@ subprojects {
         if (getPlugins().hasPlugin('com.android.library') ||
             getPlugins().hasPlugin('com.android.application')) {
             android {
-                compileSdkVersion 29
-                buildToolsVersion '29.0.3'
+                compileSdkVersion 30
+                buildToolsVersion '30.0.0'
 
                 defaultConfig {
                     if (minSdkVersion == null)
diff --git a/build.py b/build.py
index dd9e1c431..8d52d9125 100755
--- a/build.py
+++ b/build.py
@@ -57,7 +57,7 @@ default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
 
 ndk_ver = '21c'
 ndk_ver_full = '21.2.6472646'
-build_tools_ver = '29.0.3'
+build_tools_ver = '30.0.0'
 
 ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk')
 ndk_path = op.join(ndk_root, 'magisk')