From 53f67848f647124e667cf7c0c2cda5cba7e85024 Mon Sep 17 00:00:00 2001
From: caikelun <caikelun@gmail.com>
Date: Thu, 8 Aug 2024 13:47:02 +0800
Subject: [PATCH] Upgrade AGP.

---
 build.gradle                             | 14 +++++++-------
 gradle.properties                        |  3 ++-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 xdl/build.gradle                         |  4 ++--
 xdl_sample/build.gradle                  |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index f35729c..826fb21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,17 @@
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.5.1' apply false
+    id 'com.android.library' version '8.5.1' apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.getLayout.getBuildDirectory
 }
 
 ext {
     minSdkVersion = 16
-    compileSdkVersion = 34
-    targetSdkVersion = 34
-    buildToolsVersion = "34.0.0"
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    buildToolsVersion = "35.0.0"
     javaVersion = JavaVersion.VERSION_1_8
     ndkVersion = "23.2.8568313"
     cmakeVersion = "3.22.1"
diff --git a/gradle.properties b/gradle.properties
index 2778227..ac1c36f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.disableAutomaticComponentCreation=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 74c3517..8a747ff 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
diff --git a/xdl/build.gradle b/xdl/build.gradle
index 5517736..8f9cf2a 100644
--- a/xdl/build.gradle
+++ b/xdl/build.gradle
@@ -4,8 +4,8 @@ plugins {
 
 android {
     namespace 'io.github.hexhacking.xdl'
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
+    buildToolsVersion = rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
diff --git a/xdl_sample/build.gradle b/xdl_sample/build.gradle
index b98b866..2fd544a 100644
--- a/xdl_sample/build.gradle
+++ b/xdl_sample/build.gradle
@@ -4,8 +4,8 @@ plugins {
 
 android {
     namespace 'io.github.hexhacking.xdl.sample'
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
+    buildToolsVersion = rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
     defaultConfig {
         applicationId "io.github.hexhacking.xdl.sample"