mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
COIN:Android: update sha and versions for Gradle caching
Update AGP, minSDK and androidx.core versions and qtbase sha. This is needed after Gradle, AGP and minimum Android version bumps done in: * f22e9795d9a32fc4e9f4d6f2a70c2f831028342b (Gradle and AGP) * 841bbbe8ec5eb9c822af4359278f73ae9a6599bb (Android 9 bump) Pick-to: 6.8 Change-Id: I88d598ab1041847a995c37fc665467a2e9d12ab5 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
@@ -8,7 +8,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.gradle_project"
|
||||
minSdk 23
|
||||
minSdk 28
|
||||
targetSdk 34
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
@@ -21,6 +21,7 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation libs.core
|
||||
implementation libs.appcompat
|
||||
implementation libs.material
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
[versions]
|
||||
agp = "7.4.1"
|
||||
agp = "8.4.0"
|
||||
core = "1.13.1"
|
||||
appcompat = "1.6.1"
|
||||
material = "1.11.0"
|
||||
constraintlayout = "2.1.4"
|
||||
|
||||
[libraries]
|
||||
core = { group = 'androidx.core', name = "core", version.ref = "core" }
|
||||
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
|
||||
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
|
||||
constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
|
||||
|
||||
@@ -193,7 +193,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="0d91cc866f2799d56911bcdadabebb137eafcea8"
|
||||
commit_sha="f22e9795d9a32fc4e9f4d6f2a70c2f831028342b"
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user