From 12bdb270e467b10d79966ea2554cc3339f353367 Mon Sep 17 00:00:00 2001 From: OSS-Bot Date: Wed, 25 Dec 2024 08:10:24 +0000 Subject: [PATCH 1/4] Update dependency com.google.accompanist:accompanist-permissions to v0.37.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dea6b23bc..017837023 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -accompanist = "0.36.0" +accompanist = "0.37.0" androidx-activity = "1.9.3" androidx-annotation = "1.9.1" androidx-appcompat = "1.7.0" From d1aeac6023ecd73a52406b40b297a3b29be77929 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 25 Dec 2024 16:38:33 -0500 Subject: [PATCH 2/4] Suppress deprecation --- circuit-shared-elements/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/circuit-shared-elements/build.gradle.kts b/circuit-shared-elements/build.gradle.kts index dc060dae8..4545d180b 100644 --- a/circuit-shared-elements/build.gradle.kts +++ b/circuit-shared-elements/build.gradle.kts @@ -51,6 +51,7 @@ android { namespace = "com.slack.circuit.sharedelements" } baselineProfile { mergeIntoMain = true saveInSrc = true + @Suppress("DEPRECATION") from(projects.samples.star.benchmark.dependencyProject) filter { include("com.slack.circuit.sharedelements.**") } } From a2ffa6be1c92bc337357e58fd2a8c886ac23f95c Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 25 Dec 2024 16:40:43 -0500 Subject: [PATCH 3/4] Remove accompanist --- circuitx/overlays/build.gradle.kts | 1 - .../dependencies/androidReleaseRuntimeClasspath.txt | 1 - gradle/libs.versions.toml | 10 ---------- samples/counter/apps/build.gradle.kts | 1 - samples/interop/build.gradle.kts | 5 ----- samples/star/build.gradle.kts | 4 ---- .../slack/circuit/star/ui/HorizontalPagerIndicator.kt | 2 -- samples/tacos/build.gradle.kts | 1 - 8 files changed, 25 deletions(-) diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts index 2472762a0..57c8c6b6c 100644 --- a/circuitx/overlays/build.gradle.kts +++ b/circuitx/overlays/build.gradle.kts @@ -45,7 +45,6 @@ kotlin { androidMain { dependencies { api(libs.androidx.compose.material.material3) - implementation(libs.androidx.compose.accompanist.systemUi) } } // We use a common folder instead of a common source set because there is no commonizer diff --git a/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt b/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt index 8880a08e6..9150dcc39 100644 --- a/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt +++ b/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt @@ -70,7 +70,6 @@ androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing androidx.versionedparcelable:versionedparcelable -com.google.accompanist:accompanist-systemuicontroller com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 017837023..e8c21f03f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,4 @@ [versions] -accompanist = "0.37.0" androidx-activity = "1.9.3" androidx-annotation = "1.9.1" androidx-appcompat = "1.7.0" @@ -95,15 +94,6 @@ androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "a androidx-benchmark-macro-junit = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" } androidx-browser = { module = "androidx.browser:browser", version.ref = "androidx-browser" } ####### Compose -# You must enable the SlackProperties.enableCompose property to use these. -androidx-compose-accompanist-appCompatThemeAdapter = { module = "com.google.accompanist:accompanist-appcompat-theme", version.ref = "accompanist" } -androidx-compose-accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -androidx-compose-accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } -androidx-compose-accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" } -androidx-compose-accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -androidx-compose-accompanist-placeholder = { module = "com.google.accompanist:accompanist-placeholder", version.ref = "accompanist" } -androidx-compose-accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -androidx-compose-accompanist-systemUi = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose-animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" } # Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.) diff --git a/samples/counter/apps/build.gradle.kts b/samples/counter/apps/build.gradle.kts index 4c0f80d3b..4bf0219d9 100644 --- a/samples/counter/apps/build.gradle.kts +++ b/samples/counter/apps/build.gradle.kts @@ -56,7 +56,6 @@ kotlin { implementation(libs.bundles.compose.ui) implementation(libs.androidx.compose.integration.materialThemeAdapter) implementation(libs.androidx.compose.material.icons) - implementation(libs.androidx.compose.accompanist.systemUi) implementation(libs.androidx.compose.ui.tooling) } } diff --git a/samples/interop/build.gradle.kts b/samples/interop/build.gradle.kts index 9245c4518..b1c2d96dd 100644 --- a/samples/interop/build.gradle.kts +++ b/samples/interop/build.gradle.kts @@ -31,11 +31,6 @@ dependencies { implementation(libs.androidx.compose.ui.util) implementation(libs.androidx.compose.integration.materialThemeAdapter) implementation(libs.androidx.compose.material.icons) - implementation(libs.androidx.compose.accompanist.pager) - implementation(libs.androidx.compose.accompanist.pager.indicators) - implementation(libs.androidx.compose.accompanist.flowlayout) - implementation(libs.androidx.compose.accompanist.swiperefresh) - implementation(libs.androidx.compose.accompanist.systemUi) debugImplementation(libs.androidx.compose.ui.tooling) implementation(libs.windowSizeClass) implementation(libs.bundles.androidx.activity) diff --git a/samples/star/build.gradle.kts b/samples/star/build.gradle.kts index 1bca88912..eadde0ff8 100644 --- a/samples/star/build.gradle.kts +++ b/samples/star/build.gradle.kts @@ -140,10 +140,6 @@ kotlin { implementation(libs.androidx.appCompat) implementation(libs.androidx.activity.compose) implementation(libs.androidx.browser) - implementation(libs.androidx.compose.accompanist.flowlayout) - implementation(libs.androidx.compose.accompanist.pager) - implementation(libs.androidx.compose.accompanist.pager.indicators) - implementation(libs.androidx.compose.accompanist.systemUi) implementation(libs.androidx.compose.googleFonts) implementation(libs.androidx.compose.ui.tooling) implementation(libs.coroutines.android) diff --git a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt index b680f32f6..b720552c8 100644 --- a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt +++ b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt @@ -63,9 +63,7 @@ import kotlin.math.sign * @param indicatorHeight the height of each indicator in [Dp]. Defaults to [indicatorWidth]. * @param spacing the spacing between each indicator in [Dp]. * @param indicatorShape the shape representing each indicator. This defaults to [CircleShape]. - * @sample com.google.accompanist.sample.pager.HorizontalPagerIndicatorSample */ -@OptIn(ExperimentalFoundationApi::class) @Composable fun HorizontalPagerIndicator( pagerState: androidx.compose.foundation.pager.PagerState, diff --git a/samples/tacos/build.gradle.kts b/samples/tacos/build.gradle.kts index b66f3ecf7..076e74288 100644 --- a/samples/tacos/build.gradle.kts +++ b/samples/tacos/build.gradle.kts @@ -40,7 +40,6 @@ dependencies { implementation(libs.androidx.activity.ktx) implementation(libs.androidx.activity.compose) implementation(libs.androidx.appCompat) - implementation(libs.androidx.compose.accompanist.systemUi) implementation(libs.androidx.compose.integration.materialThemeAdapter) implementation(libs.androidx.compose.material.material3) debugImplementation(libs.androidx.compose.ui.tooling) From 3202e205055aadff2c5bc5003f9b20b06d20dd38 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Wed, 25 Dec 2024 16:57:30 -0500 Subject: [PATCH 4/4] Spotless --- circuit-shared-elements/build.gradle.kts | 3 +-- circuitx/overlays/build.gradle.kts | 6 +----- .../com/slack/circuit/star/ui/HorizontalPagerIndicator.kt | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/circuit-shared-elements/build.gradle.kts b/circuit-shared-elements/build.gradle.kts index 4545d180b..236eb970a 100644 --- a/circuit-shared-elements/build.gradle.kts +++ b/circuit-shared-elements/build.gradle.kts @@ -51,7 +51,6 @@ android { namespace = "com.slack.circuit.sharedelements" } baselineProfile { mergeIntoMain = true saveInSrc = true - @Suppress("DEPRECATION") - from(projects.samples.star.benchmark.dependencyProject) + @Suppress("DEPRECATION") from(projects.samples.star.benchmark.dependencyProject) filter { include("com.slack.circuit.sharedelements.**") } } diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts index 57c8c6b6c..7a8ad7ae1 100644 --- a/circuitx/overlays/build.gradle.kts +++ b/circuitx/overlays/build.gradle.kts @@ -42,11 +42,7 @@ kotlin { } } - androidMain { - dependencies { - api(libs.androidx.compose.material.material3) - } - } + androidMain { dependencies { api(libs.androidx.compose.material.material3) } } // We use a common folder instead of a common source set because there is no commonizer // which exposes the browser APIs across these two targets. jsMain { kotlin.srcDir("src/browserMain/kotlin") } diff --git a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt index b720552c8..208e48718 100644 --- a/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt +++ b/samples/star/src/commonMain/kotlin/com/slack/circuit/star/ui/HorizontalPagerIndicator.kt @@ -15,7 +15,6 @@ */ package com.slack.circuit.star.ui -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box