Update Android Gradle plugin to version 9.3.1 (#155012)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d4bd4a346f2e681b34984e7b7b2fc6a45fe8d40..3fdecd468645f52cc0e9e5e79d729d19cba87cb5 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -338,7 +338,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Build and test
-        run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
+        run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
 
   build-ios:
     name: iOS

diff --git a/Platforms/Android/README.md b/Platforms/Android/README.md
index 54b7f1c46a59db0c1d527531f3fff7ad4347092c..0f96a6fd17ec1116a193fd1bcb39cc71b03d941d 100644 (file)
--- a/Platforms/Android/README.md
+++ b/Platforms/Android/README.md
@@ -31,7 +31,7 @@ The script also requires the following commands to be on the `PATH`:
 
 * `curl`
 * `java` (or set the `JAVA_HOME` environment variable).
-  Java versions 17 and 21 are supported.
+  Java versions 17, 21 and 25 are supported.
 
 ## Building
 

diff --git a/Platforms/Android/__main__.py b/Platforms/Android/__main__.py
index 705ca6f26221fdad730ead01fc3b7c32ce6a09c2..7c4bf9f390741cb9eda540dcd6a6a042a808e8ea 100755 (executable)
--- a/Platforms/Android/__main__.py
+++ b/Platforms/Android/__main__.py
@@ -393,10 +393,10 @@ def setup_testbed():
     if all((TESTBED_DIR / path).exists() for path in paths):
         return
 
-    # The wrapper version isn't important, as any version of the wrapper can
-    # download any version of Gradle. The Gradle version actually used for the
-    # build is specified in testbed/gradle/wrapper/gradle-wrapper.properties.
-    version = "8.9.0"
+    # Any version of the wrapper can run any reasonably close version of Gradle, so this
+    # doesn't need to match the Gradle version used for the build, which is specified in
+    # testbed/gradle/wrapper/gradle-wrapper.properties.
+    version = "9.5.0"
 
     for path in paths:
         out_path = TESTBED_DIR / path

diff --git a/Platforms/Android/testbed/app/build.gradle.kts b/Platforms/Android/testbed/app/build.gradle.kts
index a56714406803cbf4b42b2962840986b193b9da42..4d296799c5da68fe3e4e84788057f7b4dade9684 100644 (file)
--- a/Platforms/Android/testbed/app/build.gradle.kts
+++ b/Platforms/Android/testbed/app/build.gradle.kts
@@ -3,7 +3,6 @@ import kotlin.math.max
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
 }
 
 val ANDROID_DIR = file("../..")
@@ -144,18 +143,10 @@ android {
         path("src/main/c/CMakeLists.txt")
     }
 
-    // Set this property to something nonexistent but non-empty. Otherwise it'll use the
-    // default list, which ignores asset directories beginning with an underscore, and
-    // maybe also other files required by tests.
-    aaptOptions.ignoreAssetsPattern = "android-testbed-dont-ignore-anything"
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 
     testOptions {
         managedDevices {
@@ -192,6 +183,12 @@ android {
             }
         }
     }
+    androidResources {
+        // Set this property to something nonexistent but non-empty. Otherwise it'll use
+        // the default list, which ignores asset directories beginning with an
+        // underscore, and maybe also other files required by tests.
+        ignoreAssetsPattern = "android-testbed-dont-ignore-anything"
+    }
 }
 
 dependencies {

diff --git a/Platforms/Android/testbed/build.gradle.kts b/Platforms/Android/testbed/build.gradle.kts
index 451517b3f1aeab6b28137611992c8ee9080011fe..3c48be4bb5851390c28c1df50b0072a25038596b 100644 (file)
--- a/Platforms/Android/testbed/build.gradle.kts
+++ b/Platforms/Android/testbed/build.gradle.kts
@@ -1,5 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.10.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
+    id("com.android.application") version "9.3.1" apply false
 }

diff --git a/Platforms/Android/testbed/gradle.properties b/Platforms/Android/testbed/gradle.properties
index e9f345c8c2625019a04e28b8cf78c7626ce9eed9..22821df511001347154c6de7b571a67d75ef356f 100644 (file)
--- a/Platforms/Android/testbed/gradle.properties
+++ b/Platforms/Android/testbed/gradle.properties
@@ -11,16 +11,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
 
 # By default, the app will be uninstalled after the tests finish (apparently
 # after 10 seconds in case of an unclean shutdown). We disable this, because

diff --git a/Platforms/Android/testbed/gradle/wrapper/gradle-wrapper.properties b/Platforms/Android/testbed/gradle/wrapper/gradle-wrapper.properties
index 5d42fbae084da1f6ba007632c2884a4fa04fde05..6632d9e5c1c4045f28e6e2fea4d02ccceac6f603 100644 (file)
--- a/Platforms/Android/testbed/gradle/wrapper/gradle-wrapper.properties
+++ b/Platforms/Android/testbed/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Feb 19 20:29:06 GMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists