Skip to content

Commit

Permalink
Update to Android Gradle plugin version 8.7.0 (closes #1245)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Oct 2, 2024
1 parent 5d38dba commit 7f58485
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 13 deletions.
1 change: 1 addition & 0 deletions demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/.idea/caches
/.idea/deploymentTargetDropdown.xml
/.idea/deploymentTargetSelector.xml
/.idea/deviceManager.xml
/.idea/libraries
/.idea/modules.xml
/.idea/other.xml
Expand Down
1 change: 1 addition & 0 deletions demo/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions demo/.idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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.6.1" apply false
id("com.android.application") version "8.7.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
Expand Down
2 changes: 1 addition & 1 deletion demo/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
1 change: 1 addition & 0 deletions product/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion product/.idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions product/.idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions product/gradle-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ After stable release:

* As above, update the integration/data/base/X.Y directory with the settings from the
new project wizard.
* 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, then run the `publish` task.
* Close the project to make sure .idea files are written.
* 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.
* Update all items from the "base" directory above.
* Update .gitignore from the new project wizard, and git rm any newly-ignored files.
* Test the app.
* Close the project to make sure .idea files are written.
* 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, then run the `publish` task.
* Close the project to make sure .idea files are written.
* Temporarily edit `test_gradle_plugin.RunGradle.rerun` to test the current stable
Chaquopy version with the new AGP version, on all platforms.
* If it passes, update android.rst, versions.rst and changelog.rst for the existing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The test script uses this to set JAVA_HOME.
chaquopy.java.version=21

agpVersion=8.7.0-rc01
agpVersion=8.7.0
kotlinVersion=2.0.0

# These variables will be filled in by the test script.
Expand Down
2 changes: 1 addition & 1 deletion product/runtime/docs/sphinx/android.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.x. Older versions are
`com.android.library`): it should be between 7.0.x and 8.7.x. Older versions are
supported by :doc:`older versions of Chaquopy <../versions>`. Newer versions may work,
but have not been tested.

Expand Down
2 changes: 1 addition & 1 deletion product/runtime/docs/sphinx/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Version summary
| | |Gradle plugin |level |
| | |versions | |
+===================+===================+===================+===================+
|16.0 |3.8 - 3.13 |7.0 - 8.6 |24 |
|16.0 |3.8 - 3.13 |7.0 - 8.7 |24 |
+-------------------+-------------------+-------------------+-------------------+
|15.0 |3.8 - 3.12 |7.0 - 8.5 | |
+-------------------+-------------------+-------------------+ +
Expand Down
1 change: 1 addition & 0 deletions server/pypi/pkgtest/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/.idea/caches
/.idea/deploymentTargetDropdown.xml
/.idea/deploymentTargetSelector.xml
/.idea/deviceManager.xml
/.idea/libraries
/.idea/modules.xml
/.idea/other.xml
Expand Down
1 change: 1 addition & 0 deletions server/pypi/pkgtest/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions server/pypi/pkgtest/.idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/pypi/pkgtest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.6.1'
classpath 'com.android.tools.build:gradle:8.7.0'
classpath "com.chaquo.python:gradle:" + (chaquopyVersion ?: "+")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

0 comments on commit 7f58485

Please sign in to comment.