Skip to content

Commit

Permalink
Update to Android Gradle plugin version 8.3.0 (closes #1091)
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Mar 9, 2024
1 parent 4fd0ae2 commit aeb50b8
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 18 deletions.
1 change: 1 addition & 0 deletions demo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
/captures
.externalNativeBuild
.cxx
local.properties
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.2.2" apply false
id("com.android.application") version "8.3.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
8 changes: 4 additions & 4 deletions demo/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# This option should only be used with decoupled projects. For more details, visit
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# Android operating system, and which are packaged with your app's APK
# 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
# 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
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
8 changes: 7 additions & 1 deletion demo/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
pluginManagement {
repositories {
maven { url = uri("../maven") }
google()
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
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=17

agpVersion=8.3.0-rc01
agpVersion=8.3.0

# These variables will be filled in by the test script.
chaquopyRepository=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pluginManagement {
val agpVersion: String by settings

repositories {
maven { url = uri(chaquopyRepository) }
google {
content {
includeGroupByRegex("com\\.android.*")
Expand All @@ -14,7 +15,6 @@ pluginManagement {
}
mavenCentral()
gradlePluginPortal()
maven { url = uri(chaquopyRepository) }
}

plugins {
Expand Down
1 change: 1 addition & 0 deletions server/pypi/pkgtest/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
/captures
.externalNativeBuild
.cxx
local.properties
6 changes: 6 additions & 0 deletions server/pypi/pkgtest/.idea/kotlinc.xml

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

7 changes: 5 additions & 2 deletions server/pypi/pkgtest/.idea/misc.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.2.2'
classpath 'com.android.tools.build:gradle:8.3.0'
classpath "com.chaquo.python:gradle:" + (chaquopyVersion ?: "+")
}
}
Expand Down
10 changes: 5 additions & 5 deletions server/pypi/pkgtest/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# This option should only be used with decoupled projects. For more details, visit
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# Android operating system, and which are packaged with your app's APK
# 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
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

0 comments on commit aeb50b8

Please sign in to comment.