Update to Android Gradle plugin version 8.2.0 (closes #1003)

chaquo · Dec 11, 2023 · 3a9af39 · 3a9af39
1 parent 2e5c235
commit 3a9af39
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 15 deletions.
diff --git a/.github/ISSUE_TEMPLATE/10-build.md b/.github/ISSUE_TEMPLATE/10-build.md
@@ -17,7 +17,7 @@ Before creating a new issue, please check if your question has already been answ
 <!-- The version of com.chaquo.python:gradle in your app's top-level build.gradle file. -->
 
 #### Relevant parts of your build.gradle file
-<!-- Please at least include the "python" and "ndk" sections. -->
+<!-- Please include at least the "chaquopy", "python" and "ndk" sections. -->
 
 #### Describe your issue
 <!-- If reporting a build failure, please include the complete build log:

diff --git a/demo/.idea/gradle.xml b/demo/.idea/gradle.xml
diff --git a/demo/.idea/kotlinc.xml b/demo/.idea/kotlinc.xml
diff --git a/demo/.idea/migrations.xml b/demo/.idea/migrations.xml
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.4" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+    id("com.android.application") version "8.2.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
     // 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.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
diff --git a/product/gradle-plugin/README.md b/product/gradle-plugin/README.md
@@ -58,7 +58,7 @@ After stable release:
   will be dealt with during the next release (see release/README.md).
   * In Android Studio, run Tools > AGP Upgrade Assistant.
   * Update all items from the "base" directory above.
-  * Update .gitignore file, and git rm any newly-ignored files.
+  * Update .gitignore from the new project wizard, and git rm any newly-ignored files.
   * Test the app.
 * Sync the "product" project in the new Android Studio version in case of any .idea file
   updates, but see the note in product/gradle/wrapper/gradle-wrapper.properties before

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

diff --git a/server/pypi/pkgtest/.idea/gradle.xml b/server/pypi/pkgtest/.idea/gradle.xml
diff --git a/server/pypi/pkgtest/.idea/migrations.xml b/server/pypi/pkgtest/.idea/migrations.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.1.4'
+        classpath 'com.android.tools.build:gradle:8.2.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.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip