Update to Android Gradle plugin version 9.2.0

Author: mhsmith

demo/build.gradle.kts

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
 plugins {
-    id("com.android.application") version "9.1.1" apply false
+    id("com.android.application") version "9.2.0" apply false
 
     // com.chaquo.python is declared in settings.gradle.kts, because dynamic versions
     // are not possible here. See

demo/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip

product/gradle-plugin/src/test/integration/data/base/9.2/build.gradle.kts

@@ -0,0 +1,7 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "{{ agpVersion }}" apply false
+    id("com.android.library") version "{{ agpVersion }}" apply false
+    id("com.android.dynamic-feature") version "{{ agpVersion }}" apply false
+    id("com.chaquo.python") version "{{ chaquopyVersion }}" apply false
+}

product/gradle-plugin/src/test/integration/data/base/9.2/gradle.properties

@@ -0,0 +1,22 @@
+chaquopy.javaVersion=21
+chaquopy.agpVersion=9.2.0
+
+# Avoid including the Kotlin standard library in the app.
+android.builtInKotlin=false
+
+# Gradle Daemon will terminate itself after specified number of idle milliseconds.
+# Default is 10800000 (3 hours), but that can overload the machine when running
+# integration tests on many versions. Reduce to 30 minutes.
+org.gradle.daemon.idletimeout=1800000
+
+# Default settings generated by the new project wizard:
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official

product/gradle-plugin/src/test/integration/data/base/9.2/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,8 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

product/gradle-plugin/src/test/integration/data/base/9.2/settings.gradle.kts

@@ -0,0 +1,35 @@
+pluginManagement {
+    repositories {
+        maven { url = uri("""{{ chaquopyRepository }}""") }
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "My Application"
+
+for (f in rootDir.listFiles()!!) {
+    for (ext in listOf("gradle", "gradle.kts")) {
+        if (File(f, "build.$ext").exists()) {
+            include(f.name)
+            break
+        }
+    }
+}

product/gradle-plugin/src/test/integration/test_gradle_plugin.py

@@ -2070,22 +2070,28 @@ def dex_classes(apk_dir):
     dexdump_cmd = f"{build_tools_dir}/{newest_ver}/dexdump"
 
     classes = {}
-    file_num = 1
+    file_num = 0
     while True:
         # Multidex is used by default in debug builds when minSdkVersion is 21 or higher
         # (https://developer.android.com/studio/build/multidex).
+        file_num += 1
         dex_filename = f"{apk_dir}/classes{file_num if (file_num > 1) else ''}.dex"
-        if exists(dex_filename):
-            for line in run([dexdump_cmd, dex_filename], check=True, capture_output=True,
-                            text=True).stdout.splitlines():
-                match = re.search(r"Class descriptor *: *'L(.*);'", line)
-                if match:
-                    package, _, name = match[1].replace("/", ".").rpartition(".")
-                    if not exclude_class(name):
-                        classes.setdefault(package, []).append(name)
-        else:
+        if not exists(dex_filename):
             break
-        file_num += 1
+
+        pending_class = None
+        for line in run([dexdump_cmd, dex_filename], check=True, capture_output=True,
+                        text=True).stdout.splitlines():
+            if match := re.search(r"Class descriptor *: *'L(.*);'", line):
+                package, _, name = match[1].replace("/", ".").rpartition(".")
+                if not exclude_class(name):
+                    pending_class = (package, name)
+            elif pending_class:
+                # AGP 9.2 generates hundreds of synthetic classes for Android APIs.
+                if "SYNTHETIC" not in line:
+                    package, name = pending_class
+                    classes.setdefault(package, []).append(name)
+                pending_class = None
 
     return classes
 

product/runtime/docs/sphinx/android.rst

@@ -38,7 +38,7 @@ In your *top-level* `build.gradle` file, set the Chaquopy version:
     }
 
 Also check the Android Gradle plugin version (`com.android.application` or
-`com.android.library`): it should be between 7.3.x and 9.1.x. Older versions are
+`com.android.library`): it should be between 7.3.x and 9.2.x. Older versions are
 supported by :doc:`older versions of Chaquopy <../versions>`. Newer versions may work,
 but have not been tested.
 

product/runtime/docs/sphinx/changelog.rst

@@ -19,7 +19,7 @@ Features
   <https://github.com/chaquo/chaquopy/issues/981>`__)
 - Improved detection of changes to :ref:`buildPython`. (`#991
   <https://github.com/chaquo/chaquopy/issues/991>`__)
-- Android Gradle plugin versions 9.0 to 9.1 are now supported. (`#1096
+- Android Gradle plugin versions 9.0 to 9.2 are now supported. (`#1096
   <https://github.com/chaquo/chaquopy/issues/1096>`__)
 - Devices with 16 KB pages are now supported by Chaquopy itself. However, many
   existing Android wheels will still fail to load on 16 KB devices. For best

product/runtime/docs/sphinx/versions.rst

@@ -9,7 +9,7 @@ Version summary
 |                   |                   |Gradle plugin      |level              |
 |                   |                   |versions           |                   |
 +===================+===================+===================+===================+
-|17.0               |3.10 - 3.14        |7.3 - 9.1          |                   |
+|17.0               |3.10 - 3.14        |7.3 - 9.2          |                   |
 +-------------------+-------------------+-------------------+                   |
 |16.1               |                   |7.0 - 8.13         |                   |
 +-------------------+                   +-------------------+                   |