From 536555cde660c74dc15ae8825d61eeec9b212db2 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 4 Oct 2024 11:35:02 +0300 Subject: [PATCH] Android: upadate the sha for Gradle script for provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the sha from last update of Gradle and update AGP version to match qtbase. Pick-to: 6.8 Change-Id: Ia235dacfc3206246c4c4330fb185ce1319d45909 Reviewed-by: Simo Fält --- .../linux/android/gradle_project/gradle/libs.versions.toml | 2 +- coin/provisioning/common/linux/android_linux.sh | 2 +- 2 files changed, 2 insertions(+), 2 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 85d2f8de..f45e66b0 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.4.0" +agp = "8.6.0" core = "1.13.1" appcompat = "1.6.1" material = "1.11.0" diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a90b621b..127d2b7a 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -199,7 +199,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="f22e9795d9a32fc4e9f4d6f2a70c2f831028342b" +commit_sha="8436455e2740000a817e0b8154e13f47e6abb68c" 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