Skip to content

Commit

Permalink
Update to Android Gradle plugin version 8.6.1 (closes #1224)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Sep 26, 2024
1 parent 1b2fed5 commit a6567bb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
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.5.2" apply false
id("com.android.application") version "8.6.1" 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
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# The test script uses this to set JAVA_HOME.
chaquopy.java.version=17

agpVersion=8.6.0-rc01
agpVersion=8.6.1
kotlinVersion=1.9.0

# These variables will be filled in by the test script.
chaquopyRepository=
chaquopyVersion=

# 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.
# 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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pluginManagement {
val chaquopyRepository: String by settings
val chaquopyVersion: String by settings
val agpVersion: String by settings
val kotlinVersion: String by settings

repositories {
maven { url = uri(chaquopyRepository) }
Expand All @@ -21,7 +22,7 @@ pluginManagement {
id("com.android.application") version agpVersion
id("com.android.library") version agpVersion
id("com.android.dynamic-feature") version agpVersion
id("org.jetbrains.kotlin.android") version "1.9.0"
id("org.jetbrains.kotlin.android") version kotlinVersion
id("com.chaquo.python") version chaquopyVersion
}
}
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.5.x. Older versions as far back
`com.android.library`): it should be between 7.0.x and 8.6.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
Expand Down
2 changes: 2 additions & 0 deletions product/runtime/docs/sphinx/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Version summary
| | |Gradle plugin |level |
| | |versions | |
+===================+===================+===================+===================+
|16.0 |3.8 - 3.13 |7.0 - 8.6 |24 |
+-------------------+-------------------+-------------------+-------------------+
|15.0 |3.8 - 3.12 |7.0 - 8.5 | |
+-------------------+-------------------+-------------------+ +
|14.0 | |4.1 - 8.0 | |
Expand Down
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.5.2'
classpath 'com.android.tools.build:gradle:8.6.1'
classpath "com.chaquo.python:gradle:" + (chaquopyVersion ?: "+")
}
}
Expand Down

0 comments on commit a6567bb

Please sign in to comment.