diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-01-27 23:56:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-27 23:56:19 +0000 |
| commit | f0013cc5bf58e46074fa43d512da3461e482f3c2 (patch) | |
| tree | ab1b0d1d0af15b9802d34f99cfcacb2571b2851f | |
| parent | c0a1f40bb1c4a97f626b883927da4978154d4574 (diff) | |
| parent | 7d5e430d776b216f41d57ac61f5388693230c7d4 (diff) | |
| download | support-snap-temp-L78400000803519082.tar.gz | |
Merge "Merge cherrypicks of [1562600] into androidx-activity-release" into androidx-activity-releasesnap-temp-L78400000803519082snap-temp-L06300000803333141
| -rw-r--r-- | activity/activity-ktx/build.gradle | 6 | ||||
| -rw-r--r-- | activity/activity/build.gradle | 8 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle index 4175155c400..e754ba64d91 100644 --- a/activity/activity-ktx/build.gradle +++ b/activity/activity-ktx/build.gradle @@ -30,11 +30,11 @@ dependencies { api("androidx.core:core-ktx:1.1.0") { because 'Mirror activity dependency graph for -ktx artifacts' } - api(projectOrArtifact(":lifecycle:lifecycle-runtime-ktx")) { + api("androidx.lifecycle:lifecycle-runtime-ktx:2.3.0") { because 'Mirror activity dependency graph for -ktx artifacts' } - api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-ktx")) - api(projectOrArtifact(":savedstate:savedstate-ktx")) { + api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0") + api("androidx.savedstate:savedstate-ktx:1.1.0") { because 'Mirror activity dependency graph for -ktx artifacts' } api(KOTLIN_STDLIB) diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle index 1159550085b..864eb0faa33 100644 --- a/activity/activity/build.gradle +++ b/activity/activity/build.gradle @@ -23,10 +23,10 @@ dependencies { api("androidx.annotation:annotation:1.1.0") implementation("androidx.collection:collection:1.0.0") api("androidx.core:core:1.1.0") - api(projectOrArtifact(":lifecycle:lifecycle-runtime")) - api(projectOrArtifact(":lifecycle:lifecycle-viewmodel")) - api(projectOrArtifact(":savedstate:savedstate")) - api(projectOrArtifact(":lifecycle:lifecycle-viewmodel-savedstate")) + api("androidx.lifecycle:lifecycle-runtime:2.3.0") + api("androidx.lifecycle:lifecycle-viewmodel:2.3.0") + api("androidx.savedstate:savedstate:1.1.0") + api("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0") implementation("androidx.tracing:tracing:1.0.0") androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-runtime-testing")) diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt index 2a134dfac5d..753839d410f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt +++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt @@ -20,7 +20,7 @@ package androidx.build * The list of versions codes of all the libraries in this project. */ object LibraryVersions { - val ACTIVITY = Version("1.2.0-rc01") + val ACTIVITY = Version("1.2.0") val ADS_IDENTIFIER = Version("1.0.0-alpha04") val ANNOTATION = Version("1.2.0-alpha02") val ANNOTATION_EXPERIMENTAL = Version("1.1.0-alpha02") |