From 9b1e17337373f0e6364e30a9fcae84a5c62275d9 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 20 Feb 2023 01:03:35 -0800
Subject: [PATCH] Update AGP

---
 app/build.gradle.kts                    |  7 ++-----
 app/shared/src/main/AndroidManifest.xml |  4 ----
 buildSrc/build.gradle.kts               |  4 +---
 buildSrc/src/main/java/Setup.kt         | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 49523c99f..784aec129 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,9 +39,10 @@ android {
 
     buildFeatures {
         dataBinding = true
+        aidl = true
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/*"
             excludes += "/META-INF/versions/**"
@@ -57,10 +58,6 @@ android {
             keepDebugSymbols += "**/*.so"
         }
     }
-
-    kotlin {
-        jvmToolchain(17)
-    }
 }
 
 setupApp()
diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index 188b4e220..0edea0fff 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -9,10 +9,6 @@
     <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage"
-        tools:node="remove" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b65cc6b7f..a2e41c138 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     `kotlin-dsl`
 }
@@ -19,7 +17,7 @@ gradlePlugin {
 
 dependencies {
     implementation(kotlin("gradle-plugin", "1.8.0"))
-    implementation("com.android.tools.build:gradle:7.4.1")
+    implementation("com.android.tools.build:gradle:8.0.0-beta03")
     implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
     implementation("org.lsposed.lsparanoid:gradle-plugin:0.5.0")
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r")
diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index 5d117c5fb..29216d7c1 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -11,11 +11,11 @@ import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
-import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.Sync
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -38,6 +38,11 @@ private fun BaseExtension.kotlinOptions(configure: Action<KotlinJvmOptions>) =
         configure.execute(it as KotlinJvmOptions)
     }
 
+private fun BaseExtension.kotlin(configure: Action<KotlinAndroidProjectExtension>) =
+    (this as ExtensionAware).extensions.findByName("kotlin")?.let {
+        configure.execute(it as KotlinAndroidProjectExtension)
+    }
+
 private val Project.android: BaseAppModuleExtension
     get() = extensions["android"] as BaseAppModuleExtension
 
@@ -60,6 +65,10 @@ fun Project.setupCommon() {
         kotlinOptions {
             jvmTarget = "17"
         }
+
+        kotlin {
+            jvmToolchain(17)
+        }
     }
 }
 
@@ -130,6 +139,10 @@ private fun Project.setupAppCommon() {
         dependenciesInfo {
             includeInApk = false
         }
+
+        buildFeatures {
+            buildConfig = true
+        }
     }
 
     android.applicationVariants.all {