Skip to content

Commit fd9eccb

Browse files
committed
Android: bump androidx.core to 1.17.0
This patch bumps androidx.core from version 1.16.0 to version 1.17.0. Task-number: QTBUG-138551 Task-number: QTBUG-138549 Pick-to: 6.11 Change-Id: I5c6c90478e34919cdff27410ceac284a2641830c Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
1 parent ad54c51 commit fd9eccb

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/android/templates/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: qtGradlePluginType
2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
2323
//noinspection GradleDependency
24-
implementation 'androidx.core:core:1.16.0'
24+
implementation 'androidx.core:core:1.17.0'
2525
}
2626

2727
android {

src/corelib/Qt6AndroidDynamicFeatureHelpers.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ function(_qt_internal_set_android_dynamic_feature_gradle_defaults target)
4646
_qt_internal_android_java_dir(android_java_dir)
4747

4848
# TODO: make androidx.core:core versionc configurable.
49-
# Currently, it is hardcoded to 1.16.0.
50-
set(implementation_dependencies "project(':app')" "'androidx.core:core:1.16.0'")
49+
# Currently, it is hardcoded to 1.17.0.
50+
set(implementation_dependencies "project(':app')" "'androidx.core:core:1.17.0'")
5151

5252
set_target_properties(${target} PROPERTIES
5353
_qt_android_gradle_java_source_dirs "src;java"

src/corelib/Qt6AndroidGradleHelpers.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ function(_qt_internal_set_android_application_gradle_defaults target)
136136
"$<$<BOOL:${target_dynamic_features}>:'com.google.android.play:feature-delivery:2.1.0'>"
137137
)
138138
# TODO: make androidx.core:core version configurable.
139-
# Currently, it is hardcoded to 1.16.0.
140-
list(APPEND implementation_dependencies "'androidx.core:core:1.16.0'")
139+
# Currently, it is hardcoded to 1.17.0.
140+
list(APPEND implementation_dependencies "'androidx.core:core:1.17.0'")
141141

142142
set_target_properties(${target} PROPERTIES
143143
_qt_android_gradle_java_source_dirs "${android_java_dir}/src;src;java"

tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ apply plugin: qtGradlePluginType
1818

1919
dependencies {
2020
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
21-
implementation 'androidx.core:core:1.16.0'
21+
implementation 'androidx.core:core:1.17.0'
2222
}
2323

2424
android {

0 commit comments

Comments
 (0)