Upgrade AGP

ZWUTA · Apr 15, 2023 · b277416 · b277416
1 parent cf7bf65
commit b277416
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -65,7 +65,7 @@ jobs:
           echo 'org.gradle.vfs.watch=true' >> gradle.properties
           echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
           echo 'android.native.buildOutput=verbose' >> gradle.properties
-          sed -i 's/org.gradle.unsafe.configuration-cache=true//g' gradle.properties
+          sed -i 's/org.gradle.configuration-cache=true//g' gradle.properties
           ./gradlew zipAll
 
       - name: Prepare artifact

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         buildConfigField("long", "BUILD_TIME", Instant.now().epochSecond.toString())
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes += "META-INF/**"
             excludes += "okhttp3/**"

diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java
@@ -126,7 +126,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if (module == null) {
-            if (!safeNavigate(AppListFragmentDirections.actionAppListFragmentToModulesFragment())) {
+            if (!safeNavigate(R.id.action_app_list_fragment_to_modules_fragment)) {
                 safeNavigate(R.id.modules_nav);
             }
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,6 +26,7 @@ plugins {
     alias(libs.plugins.lsplugin.jgit)
     alias(libs.plugins.agp.lib) apply false
     alias(libs.plugins.agp.app) apply false
+    alias(libs.plugins.nav.safeargs) apply false
 }
 
 cmaker {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -29,6 +29,7 @@ android {
 
     buildFeatures {
         androidResources = false
+        buildConfig = true
     }
 
     defaultConfig {

diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
@@ -39,6 +39,7 @@ val defaultManagerPackageName: String by rootProject.extra
 android {
     buildFeatures {
         prefab = true
+        buildConfig = true
     }
 
     defaultConfig {

diff --git a/gradle.properties b/gradle.properties
@@ -14,6 +14,4 @@
 android.experimental.enableNewResourceShrinker=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
 android.enableAppCompileTimeRClass=true
-android.nonTransitiveRClass=true
-android.enableR8.fullMode=true
 android.useAndroidX=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "7.4.2"
+agp = "8.0.0"
 kotlin = "1.8.20"
 nav = "2.5.3"
 appcenter = "5.0.1"
@@ -16,7 +16,7 @@ autoresconfig = { id = "dev.rikka.tools.autoresconfig", version = "1.2.2" }
 materialthemebuilder = { id = "dev.rikka.tools.materialthemebuilder", version = "1.3.3" }
 lsplugin-resopt = { id = "org.lsposed.lsplugin.resopt", version = "1.5" }
 lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.1" }
-lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.0" }
+lsplugin-cmaker = { id = "org.lsposed.lsplugin.cmaker", version = "1.1" }
 lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.0" }
 
 [libraries]

diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
@@ -59,6 +59,7 @@ android {
 
     buildFeatures {
         prefab = true
+        buildConfig = true
     }
 
     defaultConfig {

diff --git a/services/daemon-service/build.gradle.kts b/services/daemon-service/build.gradle.kts
@@ -22,6 +22,10 @@ plugins {
 }
 
 android {
+    buildFeatures {
+        aidl = true
+    }
+
     defaultConfig {
         consumerProguardFiles("proguard-rules.pro")
     }

diff --git a/services/daemon-service/src/main/java/org/lsposed/lspd/util/Utils.java b/services/daemon-service/src/main/java/org/lsposed/lspd/util/Utils.java
@@ -24,8 +24,6 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import org.lsposed.lspd.daemonservice.BuildConfig;
-
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.zone.ZoneRulesException;
@@ -37,13 +35,11 @@ public class Utils {
     public static final boolean isLENOVO = !TextUtils.isEmpty(SystemProperties.get("ro.lenovo.region"));
 
     public static void logD(Object msg) {
-        if (BuildConfig.DEBUG)
-            Log.d(LOG_TAG, msg.toString());
+        Log.d(LOG_TAG, msg.toString());
     }
 
     public static void logD(String msg, Throwable throwable) {
-        if (BuildConfig.DEBUG)
-            Log.d(LOG_TAG, msg, throwable);
+        Log.d(LOG_TAG, msg, throwable);
     }
 
     public static void logW(String msg) {

diff --git a/services/manager-service/build.gradle.kts b/services/manager-service/build.gradle.kts
@@ -22,6 +22,10 @@ plugins {
 }
 
 android {
+    buildFeatures {
+        aidl = true
+    }
+
     defaultConfig {
         consumerProguardFiles("proguard-rules.pro")
     }