diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-22 21:41:36 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-22 21:41:36 +0000 |
| commit | 920283ec08e4d4176dcb2fedd0d78dc7e782dec9 (patch) | |
| tree | e526924cde63785e44f64ee85c28c0c820cdf7d6 | |
| parent | 1de1c45176c051893a5046f45a06c7ea75eb7d6b (diff) | |
| parent | 5a0ff2791d6e000893c398a01021bc950518a44c (diff) | |
| download | support-920283ec08e4d4176dcb2fedd0d78dc7e782dec9.tar.gz | |
Merge cherrypicks of [1172498, 1173113, 1173114] into androidx-activity-release
Change-Id: Ib9a075e2a9bc1f929bb719b36a65909db03d56a4
| -rw-r--r-- | activity/activity-ktx/build.gradle | 4 | ||||
| -rw-r--r-- | activity/activity/build.gradle | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle index 0897e126103..99b56c84d3c 100644 --- a/activity/activity-ktx/build.gradle +++ b/activity/activity-ktx/build.gradle @@ -38,10 +38,10 @@ dependencies { api("androidx.core:core-ktx:1.1.0") { because 'Mirror activity dependency graph for -ktx artifacts' } - api("androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc02") { + api("androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-rc03") { because 'Mirror activity dependency graph for -ktx artifacts' } - api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc02") + api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-rc03") api(KOTLIN_STDLIB) androidTestImplementation(JUNIT) androidTestImplementation(TRUTH) diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle index 02070522863..e63becc76d9 100644 --- a/activity/activity/build.gradle +++ b/activity/activity/build.gradle @@ -19,10 +19,10 @@ android { dependencies { api("androidx.annotation:annotation:1.1.0") api("androidx.core:core:1.1.0") - api("androidx.lifecycle:lifecycle-runtime:2.2.0-rc02") - api("androidx.lifecycle:lifecycle-viewmodel:2.2.0-rc02") + api("androidx.lifecycle:lifecycle-runtime:2.2.0-rc03") + api("androidx.lifecycle:lifecycle-viewmodel:2.2.0-rc03") api("androidx.savedstate:savedstate:1.0.0") - api("androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-rc02") + api("androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-rc03") androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) |