From 7d17c5a0a145a563bc782a1ce841b48eb5acb40a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 19 Feb 2025 13:03:30 +0200 Subject: [PATCH] Android: update the sha for Gradle script for provisioning Use the sha from last update of Gradle and update AGP version to match qtbase's 0e4f9ffa55c2b77fbe79e96362bc68a968982b48 commit. Task-number: QTBUG-132852 Change-Id: Iab851b08bc11290ee51a22f3bdd64369928dff22 Reviewed-by: Tero Heikkinen (cherry picked from commit 1c20066c693df356f4b5fb923a65817df66e9818) Reviewed-by: Qt Cherry-pick Bot --- .../linux/android/gradle_project/gradle/libs.versions.toml | 3 +-- coin/provisioning/common/linux/android_linux.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 f45e66b0..5e65aa4e 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,5 +1,5 @@ [versions] -agp = "8.6.0" +agp = "8.8.0" core = "1.13.1" appcompat = "1.6.1" material = "1.11.0" @@ -15,4 +15,3 @@ constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayo androidApplication = { id = "com.android.application", version.ref = "agp" } [bundles] - diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 6d38220f..90156b1e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -210,7 +210,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="8436455e2740000a817e0b8154e13f47e6abb68c" +commit_sha="e5f79573fe2f21cf7bea8f63386f39bb18b351f0" 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