From a1e154912bd9eb4ba78a56f6fbf73d7eaa85eab1 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sun, 17 Aug 2025 04:36:27 +0300 Subject: [PATCH] Android: update provisioning to Gradle 8.14.2 and AGP 8.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-137782 Change-Id: I522a7179e1a0be7c7bb876d935fd02ef7e049475 Reviewed-by: Simo Fält Reviewed-by: Elias Toivola --- .../gradle_project/app/src/main/AndroidManifest.xml | 2 +- .../android/gradle_project/gradle/libs.versions.toml | 10 +++++----- coin/provisioning/common/linux/android_linux.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 492c2115..7e9c80ca 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="34"> + tools:targetApi="35"> 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 5e65aa4e..e6394c46 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,9 +1,9 @@ [versions] -agp = "8.8.0" -core = "1.13.1" -appcompat = "1.6.1" -material = "1.11.0" -constraintlayout = "2.1.4" +agp = "8.10.1" +core = "1.16.0" +appcompat = "1.7.1" +material = "1.12.0" +constraintlayout = "2.2.1" [libraries] core = { group = 'androidx.core', name = "core", version.ref = "core" } diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 178133d5..f666bc00 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -240,7 +240,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="e5f79573fe2f21cf7bea8f63386f39bb18b351f0" +commit_sha="bb12c984b2c838bdb06169ef7d659384c02c8b82" 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