From 34c3731a53251f9bf9807208f9094c47fcb9157f Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 26 Mar 2026 07:42:08 +0100 Subject: [PATCH] android: Update Android Gradle Plugin to 9.3.1 ... and gradle to 9.1.0, as suggested by Android Studio. Update done via the update assistant in Android Studio, which also automatically sets some compatibility settings. Whether all of these are necessary or some can be removed might be worth investigating later, but leave all of them in place initially. Update is possible now that the issue previously blocking the update as mentioned in commit 061027555cb9367ec7e329753a1c0e8db52a18dd Author: Michael Weghorn Date: Thu Feb 19 12:40:27 2026 +0100 android: Update Android Gradle Plugin to 8.13.2 is taken care of by previous commit Change-Id: I5d6bbe844845f62f09458a6365142ddc374b00f8 Author: Michael Weghorn Date: Thu Mar 26 07:36:50 2026 +0100 android: Use gradle file helper This update also implies that OpenJDK 25 (the current OpenJDK LTS release) is supported now, see [1]. [1] https://docs.gradle.org/current/userguide/compatibility.html Change-Id: I86345b625777d81a666a1f2abb3bfb44030bed35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202699 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- android/gradle.properties | 10 ++++++++++ android/gradle/libs.versions.toml | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 996ab0b6dbdb..10cde8cdba5d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,15 @@ +android.builtInKotlin=false +android.defaults.buildfeatures.resvalues=true +android.dependency.useConstraints=true +android.enableAppCompileTimeRClass=false +android.newDsl=false android.nonFinalResIds=false android.nonTransitiveRClass=false +android.r8.optimizedResourceShrinking=false +android.r8.strictFullModeForKeepRules=false +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.uniquePackageNames=false android.useAndroidX=true +android.usesSdkInManifest.disallowed=false org.gradle.jvmargs=-Xmx3072m org.gradle.warning.mode=all diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 82dee032ee2a..c0afc269c4cb 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] constraintlayout_version = "2.2.1" -gradle_version = "8.13.2" +gradle_version = "9.1.0" material_version = "1.13.0" preference_version = "1.2.1" diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 34560f08aab0..63aceb22d9e1 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionSha256Sum=17f277867f6914d61b1aa02efab1ba7bb439ad652ca485cd8ca6842fccec6e43 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists