android/source/build.gradle | 2 +- android/source/gradle.properties | 3 +++ android/source/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 443e72497e5ae55facad8ad24ae10c82d6c25f4d Author: Michael Weghorn <[email protected]> AuthorDate: Fri Aug 4 22:29:00 2023 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Sep 1 20:39:35 2023 +0200 android: Update Android Gradle Plugin to 8.1.0 ... and gradle to 8.0, as suggested by Android Studio. Also, as suggested, let the upgrade assistant set the following properties to keep the previous behavior for these for now instead of applying the new default behavior: android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false android.nonTransitiveRClass=false Those may be revisited in a follow-up step. See the Android Gradle Plugin release notes [1] for more details on the properties. [1] https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes Change-Id: Iec2f5766c0888e0f38438290b8fd814494afd837 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155376 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/build.gradle b/android/source/build.gradle index 99365f08f2d4..f4f74338284c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -21,7 +21,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.0' } } diff --git a/android/source/gradle.properties b/android/source/gradle.properties index fe72551bf894..76578d6146a5 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx3072m diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties index ef80eb5051f2..b22661d9bfd2 100644 --- a/android/source/gradle/wrapper/gradle-wrapper.properties +++ b/android/source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
