Skip to content

Commit 398c399

Browse files
authored
Merge pull request #297 from android/av/remove-dolphin-preview-todos
Remove Preview TODOs for Dolphin
2 parents da3f479 + 7ca17f6 commit 398c399

File tree

4 files changed

+0
-24
lines changed

4 files changed

+0
-24
lines changed

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
5757
add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
5858

5959
add("implementation", libs.findLibrary("kotlinx.coroutines.android").get())
60-
61-
// TODO : Remove this dependency once we upgrade to Android Studio Dolphin b/228889042
62-
// These dependencies are currently necessary to render Compose previews
63-
add(
64-
"debugImplementation",
65-
libs.findLibrary("androidx.customview.poolingcontainer").get()
66-
)
6760
}
6861
}
6962
}

core/designsystem/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,4 @@ dependencies {
4141
api(libs.androidx.compose.runtime)
4242
lintPublish(project(":lint"))
4343
androidTestImplementation(project(":core:testing"))
44-
45-
// TODO : Remove these dependency once we upgrade to Android Studio Dolphin b/228889042
46-
// These dependencies are currently necessary to render Compose previews
47-
debugImplementation(libs.androidx.customview.poolingcontainer)
48-
debugImplementation(libs.androidx.lifecycle.viewModelCompose)
49-
debugImplementation(libs.androidx.savedstate.ktx)
5044
}

core/ui/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ dependencies {
3333
implementation(libs.coil.kt.compose)
3434
implementation(libs.kotlinx.datetime)
3535

36-
// TODO : Remove these dependency once we upgrade to Android Studio Dolphin b/228889042
37-
// These dependencies are currently necessary to render Compose previews
38-
debugImplementation(libs.androidx.customview.poolingcontainer)
39-
debugImplementation(libs.androidx.lifecycle.runtimeCompose)
40-
debugImplementation(libs.androidx.lifecycle.viewModelCompose)
41-
debugImplementation(libs.androidx.savedstate.ktx)
42-
4336
api(libs.androidx.compose.foundation)
4437
api(libs.androidx.compose.foundation.layout)
4538
api(libs.androidx.compose.material.iconsExtended)

gradle/libs.versions.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ androidxComposeCompiler = "1.3.2"
99
androidxComposeRuntimeTracing = "1.0.0-alpha01"
1010
androidxCore = "1.9.0"
1111
androidxCoreSplashscreen = "1.0.0"
12-
androidxCustomView = "1.0.0"
1312
androidxDataStore = "1.0.0"
1413
androidxEspresso = "3.4.0"
1514
androidxHiltNavigationCompose = "1.0.0"
@@ -19,7 +18,6 @@ androidxMacroBenchmark = "1.1.0"
1918
androidxNavigation = "2.5.2"
2019
androidxMetrics = "1.0.0-alpha03"
2120
androidxProfileinstaller = "1.2.0"
22-
androidxSavedState = "1.2.0"
2321
androidxStartup = "1.1.1"
2422
androidxWindowManager = "1.0.0"
2523
androidxTestCore = "1.5.0-alpha02"
@@ -72,7 +70,6 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
7270
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" }
7371
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
7472
androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
75-
androidx-customview-poolingcontainer = { group = "androidx.customview", name = "customview-poolingcontainer", version.ref = "androidxCustomView"}
7673
androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" }
7774
androidx-dataStore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDataStore" }
7875
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
@@ -83,7 +80,6 @@ androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", v
8380
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }
8481
androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" }
8582
androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" }
86-
androidx-savedstate-ktx = { group = "androidx.savedstate", name = "savedstate-ktx", version.ref= "androidxSavedState"}
8783
androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidxStartup" }
8884
androidx-window-manager = {module = "androidx.window:window", version.ref = "androidxWindowManager"}
8985
androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }

0 commit comments

Comments
 (0)