Update to Android Gradle plugin version 8.1.1

chaquo · Aug 24, 2023 · 3ad6b1d · 3ad6b1d
1 parent 95da249
commit 3ad6b1d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
 }
 
 plugins {
-    id("com.android.application") version "8.1.0" apply false
+    id("com.android.application") version "8.1.1" apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
     id("com.chaquo.python") version System.getProperty("chaquopyVersion") apply false
 }
diff --git a/product/gradle-plugin/README.md b/product/gradle-plugin/README.md
@@ -18,7 +18,7 @@ After stable release:
   new project wizard.
 * 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).
-  * Run Android Studio Upgrade Assistant.
+  * 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.
   * Test the app.

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

diff --git a/server/pypi/pkgtest/.idea/vcs.xml b/server/pypi/pkgtest/.idea/vcs.xml
diff --git a/server/pypi/pkgtest/build.gradle b/server/pypi/pkgtest/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "com.chaquo.python:gradle:$version"
     }
 }

diff --git a/server/pypi/pkgtest/gradle.properties b/server/pypi/pkgtest/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # 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
+# 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