aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-07 05:34:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-09-07 05:34:49 +0000
commite89db6a759c704cc7bbe65711a0bba02725198ae (patch)
tree68c90417214460119f3d92692edecce452a94347
parent2c0af6147e386e0c9192d4167de864771fce0efc (diff)
parentaaa0fff631d5638d78e2e70513dcdaf47910e163 (diff)
downloadsupport-snap-temp-L48300000951043352.tar.gz
Merge "Merge cherrypicks of [1819685, 1819686] into androidx-wear-wear-phone-interactions-release" into androidx-wear-wear-phone-interactions-releasesnap-temp-L48300000951043352
-rw-r--r--buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt2
-rw-r--r--wear/wear-phone-interactions/build.gradle2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
index b7a65bab5b2..6e7d5f195f8 100644
--- a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -139,7 +139,7 @@ object LibraryVersions {
val WEAR_INPUT = Version("1.2.0-alpha01")
val WEAR_INPUT_TESTING = WEAR_INPUT
val WEAR_ONGOING = Version("1.1.0-alpha01")
- val WEAR_PHONE_INTERACTIONS = Version("1.0.0-rc01")
+ val WEAR_PHONE_INTERACTIONS = Version("1.0.0")
val WEAR_REMOTE_INTERACTIONS = Version("1.0.0-rc01")
val WEAR_TILES = Version("1.0.0-beta01")
val WEAR_WATCHFACE = Version("1.0.0-alpha21")
diff --git a/wear/wear-phone-interactions/build.gradle b/wear/wear-phone-interactions/build.gradle
index 2973bfee58d..eab043cc9a4 100644
--- a/wear/wear-phone-interactions/build.gradle
+++ b/wear/wear-phone-interactions/build.gradle
@@ -28,7 +28,7 @@ dependencies {
api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.6.0")
api(libs.kotlinStdlib)
- api("androidx.wear:wear:1.2.0-rc01")
+ api("androidx.wear:wear:1.2.0")
// Needed for Assert.assertThrows
testImplementation("junit:junit:4.13")