diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-19 23:56:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-07-19 23:56:27 +0000 |
| commit | 6f0801f5b7f49d541dba98c0802739b8e8d0c27b (patch) | |
| tree | 951679908d1d65e857df7a637837be5f17c39b86 | |
| parent | 2cf00f75c108557c96496a1b644c1f1c03765085 (diff) | |
| parent | bc2b80a82a1d0657853275622811fbdc48d43b41 (diff) | |
| download | support-snap-temp-L01600000955556868.tar.gz | |
Merge "Bump Navigation libraries to lifecycle 2.5.1 prebuilt" into snap-temp-L01600000955556868snap-temp-L01600000955556868
| -rw-r--r-- | navigation/navigation-common/build.gradle | 6 | ||||
| -rw-r--r-- | navigation/navigation-compose/build.gradle | 4 | ||||
| -rw-r--r-- | navigation/navigation-runtime/build.gradle | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle index a14eeb23225..76a34eac204 100644 --- a/navigation/navigation-common/build.gradle +++ b/navigation/navigation-common/build.gradle @@ -32,10 +32,10 @@ android { dependencies { api("androidx.annotation:annotation:1.1.0") - api("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0") - api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0") + api("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") api("androidx.savedstate:savedstate-ktx:1.2.0") - api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0") + api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1") implementation("androidx.core:core-ktx:1.1.0") implementation("androidx.collection:collection-ktx:1.1.0") diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle index 1abfe0cbc8c..fdb90f3b68e 100644 --- a/navigation/navigation-compose/build.gradle +++ b/navigation/navigation-compose/build.gradle @@ -34,13 +34,13 @@ dependencies { api("androidx.compose.runtime:runtime:1.0.1") api("androidx.compose.runtime:runtime-saveable:1.0.1") api("androidx.compose.ui:ui:1.0.1") - api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0") + api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1") // old version of common-java8 conflicts with newer version, because both have // DefaultLifecycleEventObserver. // Outside of androidx this is resolved via constraint added to lifecycle-common, // but it doesn't work in androidx. // See aosp/1804059 - implementation "androidx.lifecycle:lifecycle-common-java8:2.5.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.5.1" api(projectOrArtifact(":navigation:navigation-runtime-ktx")) androidTestImplementation(projectOrArtifact(":compose:material:material")) diff --git a/navigation/navigation-runtime/build.gradle b/navigation/navigation-runtime/build.gradle index 6478105eb4f..70c20464683 100644 --- a/navigation/navigation-runtime/build.gradle +++ b/navigation/navigation-runtime/build.gradle @@ -26,8 +26,8 @@ plugins { dependencies { api(project(":navigation:navigation-common")) api("androidx.activity:activity-ktx:1.5.0") - api("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0") - api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0") + api("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") api("androidx.annotation:annotation-experimental:1.1.0") implementation('androidx.collection:collection:1.0.0') |