From 19ea25a9d06b402a79202b410c263c04807482aa Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 9 Mar 2024 09:12:46 +0800
Subject: [PATCH] Upgrade AGP

---
 buildSrc/build.gradle.kts       | 2 +-
 buildSrc/src/main/java/Setup.kt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 67ca5efc2..a740ca64a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -17,7 +17,7 @@ gradlePlugin {
 
 dependencies {
     implementation(embeddedKotlin("gradle-plugin"))
-    implementation("com.android.tools.build:gradle:8.2.2")
+    implementation("com.android.tools.build:gradle:8.3.0")
     implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7")
     implementation("org.lsposed.lsparanoid:gradle-plugin:0.5.2")
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r")
diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
index 80c66f452..73c62312c 100644
--- a/buildSrc/src/main/java/Setup.kt
+++ b/buildSrc/src/main/java/Setup.kt
@@ -341,7 +341,7 @@ fun Project.setupStub() {
         val outResDir = layout.buildDirectory.dir("generated/source/res/${variantLowered}").get().asFile
         val aapt = File(android.sdkDirectory, "build-tools/${android.buildToolsVersion}/aapt2")
         val apk = layout.buildDirectory.file("intermediates/processed_res/" +
-            "${variantLowered}/out/resources-${variantLowered}.ap_").get().asFile
+            "${variantLowered}/process${variantCapped}Resources/out/resources-${variantLowered}.ap_").get().asFile
 
         val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedClass") {
             inputs.property("seed", RAND_SEED)
@@ -383,9 +383,9 @@ fun Project.setupStub() {
     }
     // Override optimizeReleaseResources task
     val apk = layout.buildDirectory.file("intermediates/processed_res/" +
-        "release/out/resources-release.ap_").get().asFile
+        "release/processReleaseResources/out/resources-release.ap_").get().asFile
     val optRes = layout.buildDirectory.file("intermediates/optimized_processed_res/" +
-        "release/resources-release-optimize.ap_").get().asFile
+        "release/processReleaseResources/resources-release-optimize.ap_").get().asFile
     afterEvaluate {
         tasks.named("optimizeReleaseResources") {
             doLast { apk.copyTo(optRes, true) }