From 556ffce88bd998c45dd1eb5a9880b436a211bf9c Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Tue, 20 Sep 2022 15:56:56 -0700 Subject: [PATCH 1/2] Remove Preview TODOs for Dolphin Change-Id: I35219c7dd6a902c43cd310dcaf8d0e2c2dbdec45 --- .../src/main/kotlin/AndroidFeatureConventionPlugin.kt | 7 ------- core/designsystem/build.gradle.kts | 6 ------ core/ui/build.gradle.kts | 7 ------- gradle/libs.versions.toml | 4 ---- 4 files changed, 24 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt index 934a38af1..7a81b065b 100644 --- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt @@ -61,13 +61,6 @@ class AndroidFeatureConventionPlugin : Plugin { add("implementation", libs.findLibrary("hilt.android").get()) add("kapt", libs.findLibrary("hilt.compiler").get()) - - // TODO : Remove this dependency once we upgrade to Android Studio Dolphin b/228889042 - // These dependencies are currently necessary to render Compose previews - add( - "debugImplementation", - libs.findLibrary("androidx.customview.poolingcontainer").get() - ) } } } diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 23a1914c8..e73a92c3a 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -41,10 +41,4 @@ dependencies { api(libs.androidx.compose.runtime) lintPublish(project(":lint")) androidTestImplementation(project(":core:testing")) - - // TODO : Remove these dependency once we upgrade to Android Studio Dolphin b/228889042 - // These dependencies are currently necessary to render Compose previews - debugImplementation(libs.androidx.customview.poolingcontainer) - debugImplementation(libs.androidx.lifecycle.viewModelCompose) - debugImplementation(libs.androidx.savedstate.ktx) } \ No newline at end of file diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 47dd778ca..74865d9c9 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -29,13 +29,6 @@ dependencies { implementation(libs.coil.kt.compose) implementation(libs.kotlinx.datetime) - // TODO : Remove these dependency once we upgrade to Android Studio Dolphin b/228889042 - // These dependencies are currently necessary to render Compose previews - debugImplementation(libs.androidx.customview.poolingcontainer) - debugImplementation(libs.androidx.lifecycle.runtimeCompose) - debugImplementation(libs.androidx.lifecycle.viewModelCompose) - debugImplementation(libs.androidx.savedstate.ktx) - api(libs.androidx.compose.foundation) api(libs.androidx.compose.foundation.layout) api(libs.androidx.compose.material.iconsExtended) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e61b222fd..7fc51499c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,6 @@ androidxComposeCompiler = "1.3.1" androidxComposeMaterial3 = "1.0.0-alpha13" androidxCore = "1.9.0" androidxCoreSplashscreen = "1.0.0" -androidxCustomView = "1.0.0" androidxDataStore = "1.0.0" androidxEspresso = "3.4.0" androidxHiltNavigationCompose = "1.0.0" @@ -19,7 +18,6 @@ androidxMacroBenchmark = "1.1.0" androidxNavigation = "2.5.2" androidxMetrics = "1.0.0-alpha03" androidxProfileinstaller = "1.2.0" -androidxSavedState = "1.2.0" androidxStartup = "1.1.1" androidxWindowManager = "1.0.0" androidxTestCore = "1.5.0-alpha02" @@ -72,7 +70,6 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "androidxCompose" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" } -androidx-customview-poolingcontainer = { group = "androidx.customview", name = "customview-poolingcontainer", version.ref = "androidxCustomView"} androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" } androidx-dataStore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDataStore" } androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } @@ -82,7 +79,6 @@ androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", v androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" } androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" } -androidx-savedstate-ktx = { group = "androidx.savedstate", name = "savedstate-ktx", version.ref= "androidxSavedState"} androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidxStartup" } androidx-window-manager = {module = "androidx.window:window", version.ref = "androidxWindowManager"} androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" } From dfe3fb481231f69b2e446b060146a90defc6fbf6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 21:23:35 +0000 Subject: [PATCH 2/2] Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.11.0 --- gradle/init.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts index 8b60df308..b02961dac 100644 --- a/gradle/init.gradle.kts +++ b/gradle/init.gradle.kts @@ -17,7 +17,7 @@ val ktlintVersion = "0.43.0" initscript { - val spotlessVersion = "6.7.2" + val spotlessVersion = "6.11.0" repositories { mavenCentral()