From 24603b3cef6cdf5f0486a2e9eb6d6573e5373e4a Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 9 May 2022 20:53:47 -0700
Subject: [PATCH] Update Android Studio

---
 app/build.gradle.kts                | 4 +++-
 app/shared/build.gradle.kts         | 1 +
 app/src/main/AndroidManifest.xml    | 3 +--
 buildSrc/build.gradle.kts           | 2 +-
 buildSrc/src/main/java/Setup.kt     | 6 +++---
 native/build.gradle.kts             | 2 ++
 native/src/main/AndroidManifest.xml | 2 +-
 stub/build.gradle.kts               | 2 ++
 stub/src/main/AndroidManifest.xml   | 3 +--
 stub/template/AndroidManifest.xml   | 3 +--
 10 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 45f8baa8c..b12553bba 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,6 +19,8 @@ kapt {
 }
 
 android {
+    namespace = "com.topjohnwu.magisk"
+
     defaultConfig {
         applicationId = "com.topjohnwu.magisk"
         vectorDrawables.useSupportLibrary = true
@@ -123,5 +125,5 @@ dependencies {
     implementation("androidx.transition:transition:1.4.1")
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.core:core-splashscreen:1.0.0-beta02")
-    implementation("com.google.android.material:material:1.5.0")
+    implementation("com.google.android.material:material:1.6.0")
 }
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
index 576bd3ad4..2e15e8d58 100644
--- a/app/shared/build.gradle.kts
+++ b/app/shared/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 setupCommon()
 
 android {
+    namespace = "com.topjohnwu.shared"
     defaultConfig {
         consumerProguardFiles("proguard-rules.pro")
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0899e6ccd..3168aa40b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.magisk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c376fb8ab..797b4ab1e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -25,7 +25,7 @@ tasks.withType<KotlinCompile> {
 
 dependencies {
     implementation(kotlin("gradle-plugin", "1.6.21"))
-    implementation("com.android.tools.build:gradle:7.1.3")
+    implementation("com.android.tools.build:gradle:7.2.0")
     implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0-beta01")
     implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.7")
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")
diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index 160ebb947..ad6cda03c 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -27,13 +27,13 @@ private val Project.android: BaseAppModuleExtension
 
 fun Project.setupCommon() {
     androidBase {
-        compileSdkVersion(31)
-        buildToolsVersion = "31.0.0"
+        compileSdkVersion(32)
+        buildToolsVersion = "32.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
 
         defaultConfig {
             minSdk = 21
-            targetSdk = 31
+            targetSdk = 32
         }
 
         compileOptions {
diff --git a/native/build.gradle.kts b/native/build.gradle.kts
index da5aabf50..50ac4a1fe 100644
--- a/native/build.gradle.kts
+++ b/native/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 setupCommon()
 
 android {
+    namespace = "com.topjohnwu.magisk.native"
+
     externalNativeBuild {
         ndkBuild {
             path("jni/Android.mk")
diff --git a/native/src/main/AndroidManifest.xml b/native/src/main/AndroidManifest.xml
index 313dd37a6..9b65eb06c 100644
--- a/native/src/main/AndroidManifest.xml
+++ b/native/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.topjohnwu.magisk.binary" />
+<manifest/>
diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts
index 93723bf46..88ece58ae 100644
--- a/stub/build.gradle.kts
+++ b/stub/build.gradle.kts
@@ -9,6 +9,8 @@ paranoid {
 }
 
 android {
+    namespace = "com.topjohnwu.magisk"
+
     val canary = !Config.version.contains(".")
 
     val url = if (canary) null
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 7d5e790bd..9b65eb06c 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.topjohnwu.magisk" />
+<manifest/>
diff --git a/stub/template/AndroidManifest.xml b/stub/template/AndroidManifest.xml
index 952c391a8..a9fc41040 100644
--- a/stub/template/AndroidManifest.xml
+++ b/stub/template/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.topjohnwu.magisk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />