Update to Android Gradle plugin version 8.5.0 (closes #1172)

chaquo · Jul 8, 2024 · 9728561 · 9728561
1 parent 3b2e3f7
commit 9728561
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 9 deletions.
diff --git a/demo/.gitignore b/demo/.gitignore
@@ -6,6 +6,7 @@
 /.idea/deploymentTargetSelector.xml
 /.idea/libraries
 /.idea/modules.xml
+/.idea/other.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml

diff --git a/demo/build.gradle.kts b/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 "8.4.2" apply false
+    id("com.android.application") version "8.5.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 
     // com.chaquo.python is declared in settings.gradle.kts, because dynamic versions

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/product/.gitignore b/product/.gitignore
@@ -4,6 +4,7 @@
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
+/.idea/other.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml

diff --git a/product/gradle-plugin/src/test/integration/data/base/8.5/gradle.properties b/product/gradle-plugin/src/test/integration/data/base/8.5/gradle.properties
@@ -1,7 +1,7 @@
 # The test script uses this to set JAVA_HOME.
 chaquopy.java.version=17
 
-agpVersion=8.5.0-rc01
+agpVersion=8.5.0
 
 # These variables will be filled in by the test script.
 chaquopyRepository=

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.0.x and 8.4.x. Older versions as far back
+`com.android.library`): it should be between 7.0.x and 8.5.x. Older versions as far back
 as 2.2 are supported by :doc:`older versions of Chaquopy <../versions>`.
 
 Then apply the Chaquopy plugin in the *module-level* `build.gradle` file (usually in the

diff --git a/product/runtime/docs/sphinx/changelog.rst b/product/runtime/docs/sphinx/changelog.rst
@@ -25,11 +25,12 @@ Features
   <https://github.com/chaquo/chaquopy/issues/886>`__)
 - Update CA bundle to certifi 2023.11.17. (`#893
   <https://github.com/chaquo/chaquopy/issues/893>`__)
-- Android Gradle plugin versions 8.1 to 8.4 are now supported. (`#908
+- Android Gradle plugin versions 8.1 to 8.5 are now supported. (`#908
   <https://github.com/chaquo/chaquopy/issues/908>`__, `#1003
   <https://github.com/chaquo/chaquopy/issues/1003>`__, `#1091
   <https://github.com/chaquo/chaquopy/issues/1091>`__, `#1140
-  <https://github.com/chaquo/chaquopy/issues/1140>`__)
+  <https://github.com/chaquo/chaquopy/issues/1140>`__, `#1172
+  <https://github.com/chaquo/chaquopy/issues/1172>`__)
 - Python version 3.12 is now supported. (`#931
   <https://github.com/chaquo/chaquopy/issues/931>`__, `#967
   <https://github.com/chaquo/chaquopy/issues/967>`__)

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           |                   |
 +===================+===================+===================+===================+
-|15.0               |3.8 - 3.12         |7.0 - 8.4          |                   |
+|15.0               |3.8 - 3.12         |7.0 - 8.5          |                   |
 +-------------------+-------------------+-------------------+                   +
 |14.0               |                   |4.1 - 8.0          |                   |
 +-------------------+                   +-------------------+                   +

diff --git a/server/pypi/pkgtest/.gitignore b/server/pypi/pkgtest/.gitignore
@@ -6,6 +6,7 @@
 /.idea/deploymentTargetSelector.xml
 /.idea/libraries
 /.idea/modules.xml
+/.idea/other.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml

diff --git a/server/pypi/pkgtest/build.gradle b/server/pypi/pkgtest/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         classpath "com.chaquo.python:gradle:" + (chaquopyVersion ?: "+")
     }
 }

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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip