diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-20 12:00:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-06-20 12:00:39 +0000 |
| commit | b2deb3afcac3ee64c6bb781d758be7e50332478a (patch) | |
| tree | fd363f1caa4c6e8ade5c2fb6052fea2afe8e295c | |
| parent | 98542cd9fec0c0c49ec1114cbaaaf5acbfb96ff3 (diff) | |
| parent | 863098953af624ca5d82a514e0a6595c2fa703b4 (diff) | |
| download | support-sparse-8743742-L40000000955183477.tar.gz | |
Merge "Merge cherrypicks of [2127517] into sparse-8743742-L40000000955183477." into sparse-8743742-L40000000955183477sparse-8743742-L40000000955183477
| -rw-r--r-- | libraryversions.toml | 2 | ||||
| -rw-r--r-- | wear/compose/compose-foundation/build.gradle | 10 | ||||
| -rw-r--r-- | wear/compose/compose-material/build.gradle | 16 | ||||
| -rw-r--r-- | wear/compose/compose-navigation/build.gradle | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/libraryversions.toml b/libraryversions.toml index 78e57dae807..664554d849a 100644 --- a/libraryversions.toml +++ b/libraryversions.toml @@ -118,7 +118,7 @@ VERSIONED_PARCELABLE = "1.2.0-alpha01" VIEWPAGER = "1.1.0-alpha02" VIEWPAGER2 = "1.2.0-alpha01" WEAR = "1.3.0-alpha03" -WEAR_COMPOSE = "1.0.0-rc01" +WEAR_COMPOSE = "1.0.0-rc02" WEAR_INPUT = "1.2.0-alpha03" WEAR_INPUT_TESTING = "1.2.0-alpha03" WEAR_ONGOING = "1.1.0-alpha01" diff --git a/wear/compose/compose-foundation/build.gradle b/wear/compose/compose-foundation/build.gradle index ee14b1a125a..8592faa183f 100644 --- a/wear/compose/compose-foundation/build.gradle +++ b/wear/compose/compose-foundation/build.gradle @@ -29,13 +29,13 @@ dependencies { kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { - api("androidx.compose.foundation:foundation:1.2.0-rc01") - api("androidx.compose.ui:ui:1.2.0-rc01") - api("androidx.compose.ui:ui-text:1.2.0-rc01") - api("androidx.compose.runtime:runtime:1.2.0-rc01") + api("androidx.compose.foundation:foundation:1.2.0-rc02") + api("androidx.compose.ui:ui:1.2.0-rc02") + api("androidx.compose.ui:ui-text:1.2.0-rc02") + api("androidx.compose.runtime:runtime:1.2.0-rc02") implementation(libs.kotlinStdlib) - implementation("androidx.compose.foundation:foundation-layout:1.2.0-rc01") + implementation("androidx.compose.foundation:foundation-layout:1.2.0-rc02") implementation("androidx.profileinstaller:profileinstaller:1.2.0-rc01") testImplementation(libs.testRules) diff --git a/wear/compose/compose-material/build.gradle b/wear/compose/compose-material/build.gradle index b5af3bce3d0..b21103e333d 100644 --- a/wear/compose/compose-material/build.gradle +++ b/wear/compose/compose-material/build.gradle @@ -30,16 +30,16 @@ dependencies { kotlinPlugin(project(":compose:compiler:compiler")) if(!AndroidXComposePlugin.isMultiplatformEnabled(project)) { - api("androidx.compose.foundation:foundation:1.2.0-rc01") - api("androidx.compose.ui:ui:1.2.0-rc01") - api("androidx.compose.ui:ui-text:1.2.0-rc01") - api("androidx.compose.runtime:runtime:1.2.0-rc01") + api("androidx.compose.foundation:foundation:1.2.0-rc02") + api("androidx.compose.ui:ui:1.2.0-rc02") + api("androidx.compose.ui:ui-text:1.2.0-rc02") + api("androidx.compose.runtime:runtime:1.2.0-rc02") implementation(libs.kotlinStdlib) - implementation("androidx.compose.animation:animation:1.2.0-rc01") - implementation("androidx.compose.material:material:1.2.0-rc01") - implementation("androidx.compose.material:material-ripple:1.2.0-rc01") - implementation("androidx.compose.ui:ui-util:1.2.0-rc01") + implementation("androidx.compose.animation:animation:1.2.0-rc02") + implementation("androidx.compose.material:material:1.2.0-rc02") + implementation("androidx.compose.material:material-ripple:1.2.0-rc02") + implementation("androidx.compose.ui:ui-util:1.2.0-rc02") implementation(project(":wear:compose:compose-foundation")) implementation("androidx.profileinstaller:profileinstaller:1.2.0-rc01") diff --git a/wear/compose/compose-navigation/build.gradle b/wear/compose/compose-navigation/build.gradle index 0f31ae4b498..6a213e4f113 100644 --- a/wear/compose/compose-navigation/build.gradle +++ b/wear/compose/compose-navigation/build.gradle @@ -26,8 +26,8 @@ plugins { dependencies { kotlinPlugin(project(":compose:compiler:compiler")) - api("androidx.compose.ui:ui:1.2.0-rc01") - api("androidx.compose.runtime:runtime:1.2.0-rc01") + api("androidx.compose.ui:ui:1.2.0-rc02") + api("androidx.compose.runtime:runtime:1.2.0-rc02") api("androidx.navigation:navigation-runtime:2.4.0") api(project(":wear:compose:compose-material")) |