aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-17 14:36:37 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-17 14:36:37 +0000
commit8ee6219cf06c03162327fef5a1b5cb044fd18b46 (patch)
treec928100f009f097beffe1e6779da31bc4852159b
parent497e3d8cb03a99657c4f51c6b9f7317f57b5f15a (diff)
parentf2250650bc279a8d4cda27bc4587ba79abb77d79 (diff)
downloadsupport-snap-temp-L96100000959201155.tar.gz
Merge "Move compose libraries activity deps to stable" into snap-temp-L96100000959201155snap-temp-L96100000959201155
-rw-r--r--compose/ui/ui-tooling/build.gradle4
-rw-r--r--compose/ui/ui/build.gradle8
-rw-r--r--navigation/navigation-compose/build.gradle2
3 files changed, 7 insertions, 7 deletions
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index 6403d53a357..60324d1cd8c 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -40,7 +40,7 @@ dependencies {
api(project(":compose:ui:ui-tooling-data"))
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
implementation("androidx.compose.material:material:1.0.0")
- implementation("androidx.activity:activity-compose:1.7.0-rc01")
+ implementation("androidx.activity:activity-compose:1.7.0")
implementation("androidx.lifecycle:lifecycle-common:2.6.0")
// kotlin-reflect and animation-tooling-internal are provided by Studio at runtime
@@ -87,7 +87,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation(project(":compose:animation:animation"))
implementation("androidx.savedstate:savedstate-ktx:1.2.0")
implementation(project(":compose:material:material"))
- implementation("androidx.activity:activity-compose:1.7.0-rc01")
+ implementation("androidx.activity:activity-compose:1.7.0")
implementation("androidx.lifecycle:lifecycle-common:2.6.0")
// kotlin-reflect and tooling-animation-internal are provided by Studio at runtime
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 4820bf0bf4d..113169143e8 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -76,7 +76,7 @@ dependencies {
compileOnly(libs.kotlinReflect)
testImplementation(libs.kotlinReflect)
- implementation("androidx.activity:activity-ktx:1.7.0-rc01")
+ implementation("androidx.activity:activity-ktx:1.7.0")
implementation("androidx.core:core:1.9.0")
implementation('androidx.collection:collection:1.0.0')
implementation("androidx.customview:customview-poolingcontainer:1.0.0")
@@ -124,7 +124,7 @@ dependencies {
androidTestImplementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.0")
androidTestImplementation("androidx.recyclerview:recyclerview:1.3.0-alpha02")
androidTestImplementation("androidx.core:core-ktx:1.9.0")
- androidTestImplementation("androidx.activity:activity-compose:1.7.0-rc01")
+ androidTestImplementation("androidx.activity:activity-compose:1.7.0")
androidTestImplementation("androidx.appcompat:appcompat:1.3.0")
androidTestImplementation("androidx.fragment:fragment:1.3.0")
@@ -173,7 +173,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation("androidx.autofill:autofill:1.0.0")
implementation(libs.kotlinCoroutinesAndroid)
- implementation("androidx.activity:activity-ktx:1.7.0-rc01")
+ implementation("androidx.activity:activity-ktx:1.7.0")
implementation("androidx.core:core:1.9.0")
implementation('androidx.collection:collection:1.0.0')
implementation("androidx.customview:customview-poolingcontainer:1.0.0")
@@ -251,7 +251,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
implementation("androidx.lifecycle:lifecycle-runtime-testing:2.6.0")
implementation("androidx.recyclerview:recyclerview:1.3.0-alpha02")
implementation("androidx.core:core-ktx:1.2.0")
- implementation("androidx.activity:activity-compose:1.7.0-rc01")
+ implementation("androidx.activity:activity-compose:1.7.0")
}
desktopTest.dependencies {
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 32fafbfeaf9..e6984b1b12e 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -28,7 +28,7 @@ dependencies {
implementation(libs.kotlinStdlib)
implementation("androidx.compose.foundation:foundation-layout:1.0.1")
- api("androidx.activity:activity-compose:1.7.0-rc01")
+ api("androidx.activity:activity-compose:1.7.0")
api("androidx.compose.animation:animation:1.0.1")
api("androidx.compose.runtime:runtime:1.0.1")
api("androidx.compose.runtime:runtime-saveable:1.0.1")