Update to Android Gradle plugin version 9.0.0 (closes #1096)

mhsmith · mhsmith · commit 3ba676879eef · 2026-01-23T22:01:07.000Z
diff --git a/demo/app/build.gradle.kts b/demo/app/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("com.chaquo.python")
 }
 
@@ -66,17 +65,14 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 
     // For testing with minifyEnabled (see release/README.md).
     buildTypes {
         create("releaseMinify") {
             initWith(getByName("release"))
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
@@ -136,8 +132,9 @@ for (path in listOf(
     "src/utils"                         // Files shared with pkgtest app
 )) {
     android.sourceSets.getByName("main") {
-        java { srcDir("$path/java") }
-        res { srcDir("$path/res") }
+        java { directories.add("$path/java") }
+        kotlin { directories.add("$path/java") }
+        res { directories.add("$path/res") }
     }
     chaquopy.sourceSets.getByName("main") {
         srcDir("$path/python")
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -1,8 +1,7 @@
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+    id("com.android.application") version "9.0.0" apply false
 
     // com.chaquo.python is declared in settings.gradle.kts, because dynamic versions
     // are not possible here. See
diff --git a/demo/gradle/wrapper/gradle-wrapper.properties b/demo/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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
diff --git a/product/gradle-plugin/README.md b/product/gradle-plugin/README.md
@@ -57,13 +57,13 @@ also be given here.
   the Chaquopy development version and the new AGP version.
 
 * Open the "product" project in the new Android Studio version, then:
-  * Consider updating the Gradle version, but first see the note in
-    product/gradle/wrapper/gradle-wrapper.properties.
   * Sync the project.
   * Test it by running the `publish` task.
 * Update the demo and pkgtest apps as follows. Leave the public apps alone for now: they
   will be dealt with during the next release (see release/README.md).
-  * In Android Studio, run Tools > AGP Upgrade Assistant.
+  * In Android Studio, run Tools > AGP Upgrade Assistant. If this applies any
+    compatibility settings which are no longer the default, try to use the recommended
+    settings instead.
   * Apply any other updates from the "base" directory above.
   * Test the app.
 * Close all projects to make sure .idea files are written.
diff --git a/product/gradle-plugin/src/test/integration/data/ChaquopyPlugin/apply_buildscript/app/build.gradle b/product/gradle-plugin/src/test/integration/data/ChaquopyPlugin/apply_buildscript/app/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url $/{{ chaquopyRepository }}/$ }
     }
     dependencies {
diff --git a/product/gradle-plugin/src/test/integration/data/ChaquopyPlugin/apply_buildscript/build.gradle b/product/gradle-plugin/src/test/integration/data/ChaquopyPlugin/apply_buildscript/build.gradle
@@ -1,6 +1,6 @@
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/product/gradle-plugin/src/test/integration/data/JavaLib/dynamic_feature/app/build.gradle b/product/gradle-plugin/src/test/integration/data/JavaLib/dynamic_feature/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.chaquo.python'
 
 android {
     namespace "com.chaquo.python.test"
-    compileSdk 28
+    compileSdk 35
     defaultConfig {
         applicationId "com.chaquo.python.test"
         minSdk 24
-        targetSdk 28
+        targetSdk 35
         versionCode 1
         versionName "0.0.1"
         ndk {
diff --git a/product/gradle-plugin/src/test/integration/data/JavaLib/dynamic_feature/dynamicfeature/build.gradle b/product/gradle-plugin/src/test/integration/data/JavaLib/dynamic_feature/dynamicfeature/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.dynamic-feature'
 
 android {
     namespace "com.chaquo.python.dynamicfeature"
-    compileSdk 28
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.dynamicfeature"
         minSdk 24
-        targetSdk 28
+        targetSdk 35
         versionCode 1
         versionName "1.0"
     }
diff --git a/product/gradle-plugin/src/test/integration/data/base/9.0/build.gradle.kts b/product/gradle-plugin/src/test/integration/data/base/9.0/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
+}
diff --git a/product/gradle-plugin/src/test/integration/data/base/9.0/gradle.properties b/product/gradle-plugin/src/test/integration/data/base/9.0/gradle.properties
@@ -0,0 +1,30 @@
+chaquopy.javaVersion=21
+chaquopy.agpVersion=9.0.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
+# 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
diff --git a/product/gradle-plugin/src/test/integration/data/base/9.0/gradle/wrapper/gradle-wrapper.properties b/product/gradle-plugin/src/test/integration/data/base/9.0/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,8 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/product/gradle-plugin/src/test/integration/data/base/9.0/settings.gradle.kts b/product/gradle-plugin/src/test/integration/data/base/9.0/settings.gradle.kts
@@ -0,0 +1,33 @@
+pluginManagement {
+    repositories {
+        maven { url = uri("""{{ chaquopyRepository }}""") }
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+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
+        }
+    }
+}
diff --git a/product/gradle-plugin/src/test/integration/test_gradle_plugin.py b/product/gradle-plugin/src/test/integration/test_gradle_plugin.py
@@ -363,8 +363,9 @@ def test_missing(self):
                           run.stderr)
 
     # This test uses the oldest Gradle and AGP versions on which the Chaquopy plugin is
-    # still capable of loading and giving a useful error message. This should be the same
-    # Gradle version as in product/gradle/wrapper/gradle-wrapper.properties.
+    # still capable of loading and giving a useful error. Keep these versions as low as
+    # reasonably possible, and build the Gradle plugin against the same Gradle version
+    # (see product/gradle/wrapper/gradle-wrapper.properties).
     #
     # Also tests making a change.
     def test_old(self):
diff --git a/product/gradle/wrapper/gradle-wrapper.properties b/product/gradle/wrapper/gradle-wrapper.properties
@@ -5,5 +5,5 @@ zipStorePath=wrapper/dists
 
 # The Chaquopy Gradle plugin will be built against this version of the gradleApi()
 # dependency (https://github.com/gradle/gradle/issues/1835). This should be the same
-# Gradle version as in AndroidPlugin.test_old.
+# Gradle version as in AndroidPlugin.test_old: see its comment in test_gradle_plugin.
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
diff --git a/product/runtime/docs/sphinx/android.rst b/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 8.13.x. Older versions are
+`com.android.library`): it should be between 7.3.x and 9.0.x. Older versions are
 supported by :doc:`older versions of Chaquopy <../versions>`. Newer versions may work,
 but have not been tested.
 
diff --git a/product/runtime/docs/sphinx/changelog.rst b/product/runtime/docs/sphinx/changelog.rst
@@ -19,6 +19,8 @@ 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 version 9.0 is 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
   compatibility with these devices, use Python 3.13 or later. (`#1171
diff --git a/product/runtime/docs/sphinx/versions.rst b/product/runtime/docs/sphinx/versions.rst
@@ -9,7 +9,7 @@ Version summary
 |                   |                   |Gradle plugin      |level              |
 |                   |                   |versions           |                   |
 +===================+===================+===================+===================+
-|17.0               |3.10 - 3.14        |7.3 - 8.13         |                   |
+|17.0               |3.10 - 3.14        |7.3 - 9.0          |                   |
 +-------------------+-------------------+-------------------+                   |
 |16.1               |                   |7.0 - 8.13         |                   |
 +-------------------+                   +-------------------+                   |
diff --git a/product/runtime/src/test/java/com/chaquo/python/TestReflect.java b/product/runtime/src/test/java/com/chaquo/python/TestReflect.java
@@ -2,6 +2,8 @@
 
 import static org.junit.Assert.*;
 
+import java.util.function.*;
+
 
 @SuppressWarnings("unused")
 public class TestReflect {
@@ -121,15 +123,6 @@ public static class Access {
     }
 
     public static class Call {
-        
-        // java.util.function is not available until API level 24.
-        public interface Function<T,R> {
-            R apply(T t);
-        }
-        public interface Supplier<T> {
-            T get();
-        }
-
         public static Function<String,String> anon = new Function<String,String>() {
             @Override public String apply(String s) { return "anon " + s; }
         };
diff --git a/product/runtime/src/test/java/com/chaquo/python/TestReflect.kt b/product/runtime/src/test/java/com/chaquo/python/TestReflect.kt
@@ -9,7 +9,7 @@ class TestReflectKt {
         @JvmField val boundInstanceRef = ::getS
 
         companion object {
-            @JvmField val anon = object : TestReflect.Call.Function<String, String> {
+            @JvmField val anon = object : java.util.function.Function<String, String> {
                 override fun apply(s: String): String = "kt anon $s"
             }
 
diff --git a/product/runtime/src/test/python/chaquopy/test/test_exception.py b/product/runtime/src/test/python/chaquopy/test/test_exception.py
@@ -13,7 +13,7 @@ def setUp(self):
     def test_constructor(self):
         from java.lang import RuntimeException
         with self.assertRaisesRegex(RuntimeException,
-                                    r"^hello constructor" + trace_line("<init>")):
+                                    r"^hello constructor\s*\n" + trace_line("<init>")):
             self.TE(True)
 
     def test_simple(self):
@@ -63,6 +63,10 @@ def test_catch(self):
 
 
 def trace_line(method):
-    # In AGP 8.2, ProGuard renames all Java source files to "SourceFile".
-    return (r"\s*at com.chaquo.python.TestException." + method +
+    # With AGP 8.2, ProGuard obfuscates Java source filenames even when the class name
+    # itself is visible, so we can't check them.
+    #
+    # With AGP 9.0, ProGuard causes an "androidx.core.app.c.p" frame to appear at the
+    # top of the stack trace. So we allow one additional line before the expected line.
+    return (r"(.*\n)?\s*at com.chaquo.python.TestException." + method +
             r"\(.+:[0-9]+\)\s*")
diff --git a/product/runtime/src/test/python/chaquopy/test/test_reflect.py b/product/runtime/src/test/python/chaquopy/test/test_reflect.py
@@ -440,7 +440,12 @@ def test_access(self):
         self.assertEqual("public", a.publ)
 
         self.assertFalse(hasattr(a, "getPriv"))
-        self.assertFalse(hasattr(a, "getPack"))
+
+        # With AGP 9.0, ProGuard causes this method to become visible for some reason.
+        # See also TestAndroidReflect.assertMembers.
+        if hasattr(a, "getPack"):
+            self.assertEqual("package", a.getPack())
+
         self.assertEqual("protected", a.getProt())
         self.assertEqual("public", a.getPubl())
 
@@ -578,6 +583,11 @@ def assertMembers(self, cls, names):
 
         for name in self.MEMBERS:
             if name not in names:
+                # With AGP 9.0, ProGuard causes this method to become visible for some
+                # reason. See also TestReflect.test_access.
+                if name == "iMethodProtected":
+                    continue
+
                 with self.subTest(name=name):
                     self.assertFalse(self.declares_member(cls, name))
 
diff --git a/server/pypi/pkgtest/app/build.gradle b/server/pypi/pkgtest/app/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
     id 'com.chaquo.python'
 }
 
@@ -84,14 +83,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles(
+                getDefaultProguardFile('proguard-android-optimize.txt'),
+                'proguard-rules.pro'
+            )
         }
     }
 
diff --git a/server/pypi/pkgtest/build.gradle b/server/pypi/pkgtest/build.gradle
@@ -15,13 +15,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.2'
+        classpath 'com.android.tools.build:gradle:9.0.0'
         classpath "com.chaquo.python:gradle:" + (chaquopyVersion ?: "+")
-
-        // This app doesn't use Kotlin directly, but some of the androidx dependencies
-        // do, which causes "Duplicate class" errors when the plugin isn't present
-        // (https://youtrack.jetbrains.com/issue/KT-55297).
-        classpath 'org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.9.0'
     }
 }
 
diff --git a/server/pypi/pkgtest/gradle/wrapper/gradle-wrapper.properties b/server/pypi/pkgtest/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-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`	`3`	`google()`
`4`		`- jcenter()`
	`4`	`+ mavenCentral()`
`5`	`5`	`maven { url $/{{ chaquopyRepository }}/$ }`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`allprojects {`
`2`	`2`	`repositories {`
`3`	`3`	`google()`
`4`		`- jcenter()`
	`4`	`+ mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`}`