lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: bump to Gradle 9.3.1 and AGP 9.0.0

Browse Source 
Following Qt 6.11 release 3rd party components update.

Task-number: QTBUG-143129
Change-Id: Idfd310197d5345871637a3e4e1858dbd731eeae8
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
This commit is contained in:
Assam Boudjelthia
2026-02-05 14:35:21 +02:00
parent 18956e23c4
commit 5d247c1e58
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coin/provisioning/common/linux/android/gradle_project/.gitignore vendored
View File

@@ -1,12 +1,7 @@
*.iml *.iml
.gradle .gradle
.idea
/local.properties /local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store .DS_Store
/build /build
/captures /captures

4
coin/provisioning/common/linux/android/gradle_project/app/build.gradle
View File

@@ -15,8 +15,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
} }

2
coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml
View File

@@ -6,7 +6,7 @@
android:allowBackup="true" android:allowBackup="true"
android:label="gradle_project" android:label="gradle_project"
android:supportsRtl="true" android:supportsRtl="true"
tools:targetApi="35"> tools:targetApi="36">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"> android:exported="true">

6
coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml
View File

@@ -1,8 +1,8 @@
[versions] [versions]
agp = "8.10.1" agp = "9.0.0"
core = "1.16.0" core = "1.17.0"
appcompat = "1.7.1" appcompat = "1.7.1"
material = "1.12.0" material = "1.13.0"
constraintlayout = "2.2.1" constraintlayout = "2.2.1"
[libraries] [libraries]

2
coin/provisioning/common/linux/android_linux.sh
View File

@@ -241,7 +241,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
cd /tmp/gradle_project cd /tmp/gradle_project
# Get Gradle files from qtbase # Get Gradle files from qtbase
qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle" qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
commit_sha="bb12c984b2c838bdb06169ef7d659384c02c8b82" commit_sha="269a75dbd1262a714eb238c42e5159a0a8979818"
curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat