From ffe19784496b95addf91dc122b09ba9f980c7275 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 5 Feb 2026 14:35:21 +0200 Subject: [PATCH] Android: bump to Gradle 9.3.1 and AGP 9.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Following Qt 6.11 release 3rd party components update. Task-number: QTBUG-143129 Pick-to: 6.11 Change-Id: Idfd310197d5345871637a3e4e1858dbd731eeae8 Reviewed-by: Simo Fält Reviewed-by: Elias Toivola --- .../common/linux/android/gradle_project/.gitignore | 7 +------ .../common/linux/android/gradle_project/app/build.gradle | 4 ++-- .../gradle_project/app/src/main/AndroidManifest.xml | 2 +- .../linux/android/gradle_project/gradle/libs.versions.toml | 6 +++--- coin/provisioning/common/linux/android_linux.sh | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/coin/provisioning/common/linux/android/gradle_project/.gitignore b/coin/provisioning/common/linux/android/gradle_project/.gitignore index aa724b77..8cacfbdf 100644 --- a/coin/provisioning/common/linux/android/gradle_project/.gitignore +++ b/coin/provisioning/common/linux/android/gradle_project/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle +.idea /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml .DS_Store /build /captures diff --git a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle index 2c353ebd..8d8a2b12 100644 --- a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle +++ b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle @@ -15,8 +15,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml b/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml index 7e9c80ca..425989f1 100644 --- a/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml +++ b/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ android:allowBackup="true" android:label="gradle_project" android:supportsRtl="true" - tools:targetApi="35"> + tools:targetApi="36"> diff --git a/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml b/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml index e6394c46..b38aa98a 100644 --- a/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml +++ b/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -agp = "8.10.1" -core = "1.16.0" +agp = "9.0.0" +core = "1.17.0" appcompat = "1.7.1" -material = "1.12.0" +material = "1.13.0" constraintlayout = "2.2.1" [libraries] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 64c6fccc..d38ad8cb 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -241,7 +241,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project cd /tmp/gradle_project # Get Gradle files from qtbase qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle" -commit_sha="bb12c984b2c838bdb06169ef7d659384c02c8b82" +commit_sha="b775c756f019d067c491bad7816f3a0cc8ea8b31" curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat