Fix some deprecated methods not available in gradle 9.0

halx99 · halx99 · commit 55f7508b3ee1 · 2025-03-17T23:28:03.000+08:00
diff --git a/core/platform/android/libaxmol/build.gradle b/core/platform/android/libaxmol/build.gradle
@@ -4,14 +4,14 @@ apply from: 'axmol.gradle'
 def buildProfiles = AxmolUtils.resolveBasicBuildProfiles(project)
 
 android {
-    namespace "dev.axmol.lib"
+    namespace = 'dev.axmol.lib'
     def targetSdk = buildProfiles['targetSdk']
     def minSdk = buildProfiles['minSdk']
-    compileSdk targetSdk.toInteger()
+    compileSdk = targetSdk.toInteger()
 
     defaultConfig {
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -29,7 +29,7 @@ android {
         }
     }
     buildFeatures {
-        aidl true
+        aidl = true
     }
 }
 
diff --git a/templates/common/proj.android/app/build.gradle b/templates/common/proj.android/app/build.gradle
@@ -12,17 +12,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version = cmakeVer
             path "../../CMakeLists.txt"
         }
     }
@@ -70,7 +70,7 @@ android {
             jniDebuggable false
             renderscriptDebuggable false
             minifyEnabled true
-            shrinkResources true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             proguardFile file(project(':libaxmol').projectDir.toString() + '/proguard-rules.pro')
             if (project.hasProperty("KEY_STORE_FILE")) {
@@ -90,7 +90,7 @@ android {
     }
 
     buildFeatures {
-        aidl true
+        aidl = true
     }
 }
 
diff --git a/tests/cpp-tests/proj.android/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle
@@ -11,17 +11,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version = cmakeVer
             path "../../CMakeLists.txt"
         }
     }
@@ -70,7 +70,7 @@ android {
             jniDebuggable false
             renderscriptDebuggable false
             minifyEnabled true
-            shrinkResources true
+            shrinkResources = true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (project.hasProperty("KEY_STORE_FILE")) {
                 signingConfig signingConfigs.release
diff --git a/tests/fairygui-tests/proj.android/app/build.gradle b/tests/fairygui-tests/proj.android/app/build.gradle
@@ -11,17 +11,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version = cmakeVer
             path "../../CMakeLists.txt"
         }
     }
diff --git a/tests/live2d-tests/proj.android/app/build.gradle b/tests/live2d-tests/proj.android/app/build.gradle
@@ -11,17 +11,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version cmakeVer
             path "../../CMakeLists.txt"
         }
     }
diff --git a/tests/lua-tests/proj.android/app/build.gradle b/tests/lua-tests/proj.android/app/build.gradle
@@ -11,17 +11,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version cmakeVer
             path "../../CMakeLists.txt"
         }
     }
diff --git a/tests/unit-tests/proj.android/app/build.gradle b/tests/unit-tests/proj.android/app/build.gradle
@@ -11,17 +11,17 @@ android {
     def targetSdk = buildProfiles['targetSdk']
 
     // Apply build profiles
-    namespace packageName
-    compileSdk targetSdk.toInteger()
+    namespace = packageName
+    compileSdk = targetSdk.toInteger()
     ndkVersion = buildProfiles['ndkVer']
     if(buildProfiles.containsKey('ndkPath')) {
         ndkPath = buildProfiles['ndkPath']
     }
 
     defaultConfig {
-        applicationId packageName
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        applicationId = packageName
+        minSdkVersion = minSdk
+        targetSdkVersion = targetSdk
         versionCode 1
         versionName "1.0"
 
@@ -48,7 +48,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version "$cmakeVer"
+            version cmakeVer
             path "../../CMakeLists.txt"
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ apply from: 'axmol.gradle'`
`4`	`4`	`def buildProfiles = AxmolUtils.resolveBasicBuildProfiles(project)`
`5`	`5`
`6`	`6`	`android {`
`7`		`- namespace "dev.axmol.lib"`
	`7`	`+ namespace = 'dev.axmol.lib'`
`8`	`8`	`def targetSdk = buildProfiles['targetSdk']`
`9`	`9`	`def minSdk = buildProfiles['minSdk']`
`10`		`- compileSdk targetSdk.toInteger()`
	`10`	`+ compileSdk = targetSdk.toInteger()`
`11`	`11`
`12`	`12`	`defaultConfig {`
`13`		`- minSdkVersion minSdk`
`14`		`- targetSdkVersion targetSdk`
	`13`	`+ minSdkVersion = minSdk`
	`14`	`+ targetSdkVersion = targetSdk`
`15`	`15`	`versionCode 1`
`16`	`16`	`versionName "1.0"`
`17`	`17`	`}`
`@@ -29,7 +29,7 @@ android {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`buildFeatures {`
`32`		`- aidl true`
	`32`	`+ aidl = true`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`