Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused accompanist deps #1848

Merged
merged 4 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circuit-shared-elements/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ android { namespace = "com.slack.circuit.sharedelements" }
baselineProfile {
mergeIntoMain = true
saveInSrc = true
from(projects.samples.star.benchmark.dependencyProject)
@Suppress("DEPRECATION") from(projects.samples.star.benchmark.dependencyProject)
filter { include("com.slack.circuit.sharedelements.**") }
}
7 changes: 1 addition & 6 deletions circuitx/overlays/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@ kotlin {
}
}

androidMain {
dependencies {
api(libs.androidx.compose.material.material3)
implementation(libs.androidx.compose.accompanist.systemUi)
}
}
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") }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[versions]
accompanist = "0.36.0"
androidx-activity = "1.9.3"
androidx-annotation = "1.9.1"
androidx-appcompat = "1.7.0"
Expand Down Expand Up @@ -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.)
Expand Down
1 change: 0 additions & 1 deletion samples/counter/apps/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
5 changes: 0 additions & 5 deletions samples/interop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions samples/star/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -63,9 +62,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,
Expand Down
1 change: 0 additions & 1 deletion samples/tacos/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading