Updated dependencies, and made relevant code changes

QaziMashhood · web-flow · commit 4ce255817dde · 2025-02-21T16:41:15.000Z
diff --git a/buildconvention/convention/src/main/kotlin/au/com/alfie/ecomm/buildconvention/AppConfig.kt b/buildconvention/convention/src/main/kotlin/au/com/alfie/ecomm/buildconvention/AppConfig.kt
@@ -2,7 +2,7 @@ package au.com.alfie.ecomm.buildconvention
 
 object AppConfig {
     const val applicationId = "au.com.alfie.ecomm"
-    const val compileSdk = 34
+    const val compileSdk = 35
     const val minSdk = 29
     const val targetSdk = 34
     const val testRunnerPath = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/debug/operational/src/main/java/au/com/alfie/ecomm/debug/operational/view/catalog/screen/DotsIndicatorScreen.kt b/debug/operational/src/main/java/au/com/alfie/ecomm/debug/operational/view/catalog/screen/DotsIndicatorScreen.kt
@@ -95,7 +95,7 @@ private fun DotsIndicatorSection(
     val pagerState = rememberPagerState { PAGER_SIZE }
     HorizontalPager(
         state = pagerState,
-        beyondBoundsPageCount = 2
+        beyondViewportPageCount = 2
     ) {
         Box(
             modifier = Modifier
diff --git a/debug/operational/src/main/java/au/com/alfie/ecomm/debug/operational/view/catalog/screen/SliderIndicatorScreen.kt b/debug/operational/src/main/java/au/com/alfie/ecomm/debug/operational/view/catalog/screen/SliderIndicatorScreen.kt
@@ -155,7 +155,7 @@ private fun PagedSliderIndicator() {
         val pagerState = rememberPagerState { PAGER_SIZE }
         HorizontalPager(
             state = pagerState,
-            beyondBoundsPageCount = 2
+            beyondViewportPageCount = 2
         ) {
             Box(
                 modifier = Modifier
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/bottombar/BottomBar.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/bottombar/BottomBar.kt
@@ -22,10 +22,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -161,7 +161,7 @@ private fun BottomBarItem(
                 onDoubleClick = onClick,
                 role = Role.Tab,
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(bounded = false)
+                indication = ripple(bounded = false)
             )
             .defaultMinSize(minHeight = BOTTOM_BAR_HEIGHT)
             .widthIn(min = 86.dp)
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/gallery/EndlessGallery.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/gallery/EndlessGallery.kt
@@ -173,7 +173,7 @@ private fun NonZoomablePager(
     Box(contentAlignment = Alignment.TopEnd) {
         HorizontalPager(
             state = pagerState,
-            beyondBoundsPageCount = 1,
+            beyondViewportPageCount = 1,
             pageSpacing = Theme.spacing.spacing8,
             contentPadding = PaddingValues(horizontal = horizontalPadding)
         ) { index ->
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/gallery/Gallery.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/gallery/Gallery.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.offset
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -95,7 +95,7 @@ fun Gallery(
             Box(
                 modifier = Modifier
                     .clickable(
-                        indication = rememberRipple(bounded = true),
+                        indication = ripple(bounded = false),
                         interactionSource = remember { MutableInteractionSource() },
                         onClick = {
                             selectedIndex = index
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/input/TextField.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/input/TextField.kt
@@ -17,10 +17,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -259,7 +259,7 @@ private fun TextField(
                     .padding(horizontal = Theme.spacing.spacing20)
                     .indication(
                         interactionSource = interactionSource,
-                        indication = rememberRipple(bounded = false)
+                        indication = ripple(bounded = false)
                     ),
                 verticalAlignment = Alignment.CenterVertically
             ) {
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/modal/BottomSheet.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/modal/BottomSheet.kt
@@ -107,7 +107,7 @@ fun BottomSheet(
             bottomEnd = CornerSize(0.dp),
             bottomStart = CornerSize(0.dp)
         ),
-        windowInsets = WindowInsets(0.dp),
+        contentWindowInsets = { WindowInsets(0.dp) },
         onDismissRequest = { onDismiss() },
         dragHandle = { }
     ) {
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/searchbar/SearchTextField.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/searchbar/SearchTextField.kt
@@ -17,11 +17,11 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -158,7 +158,7 @@ private fun DecorationBox(
             )
             .indication(
                 interactionSource = interactionSource,
-                indication = rememberRipple(bounded = false)
+                indication = ripple(bounded = false)
             ),
         verticalAlignment = Alignment.CenterVertically
     ) {
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/swipe/SwipeAnchored.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/swipe/SwipeAnchored.kt
@@ -1,6 +1,7 @@
 package au.com.alfie.ecomm.designsystem.component.swipe
 
 import androidx.compose.animation.core.AnimationSpec
+import androidx.compose.animation.splineBasedDecay
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.AnchoredDraggableState
@@ -37,24 +38,29 @@ fun SwipeAnchored(
     startOffset: (size: IntSize) -> Float = { 0f },
     partialOffset: (size: IntSize) -> Float = { it.height * FIFTY_PERCENT },
     positionalThreshold: (Float) -> Float = { it * FIFTY_PERCENT },
-    animationSpec: () -> AnimationSpec<Float> = { standardAccelerate() },
+    snapAnimationSpec: () -> AnimationSpec<Float> = { standardAccelerate() },
     allowNestedScroll: Boolean = true,
     onAnchorChange: suspend SwipeAnchoredScope.(SwipeAnchor) -> Unit = {},
     onOffset: (isInBetween: Boolean) -> Unit = { },
     content: @Composable SwipeAnchoredScope.() -> Unit
 ) {
+    val density = LocalDensity.current
+    val decayAnimationSpec = remember(density) { splineBasedDecay<Float>(density) }
+
     val anchoredDraggableState = rememberSaveable(
         saver = AnchoredDraggableState.Saver(
-            animationSpec = animationSpec(),
+            snapAnimationSpec = snapAnimationSpec(),
+            decayAnimationSpec = decayAnimationSpec,
             positionalThreshold = positionalThreshold,
             velocityThreshold = velocityThreshold
         )
     ) {
         AnchoredDraggableState(
             initialValue = initialAnchor,
+            snapAnimationSpec = snapAnimationSpec(),
+            decayAnimationSpec = decayAnimationSpec,
             positionalThreshold = positionalThreshold,
-            velocityThreshold = velocityThreshold,
-            animationSpec = animationSpec()
+            velocityThreshold = velocityThreshold
         )
     }
     val scope = remember {
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/switch/Switch.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/switch/Switch.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.selection.toggleable
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -93,7 +93,7 @@ fun Switch(
                 )
                 .indication(
                     interactionSource = interactionSource,
-                    indication = rememberRipple(bounded = false)
+                    indication = ripple(bounded = false)
                 )
         )
     }
diff --git a/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/tab/TabPager.kt b/designsystem/src/main/java/au/com/alfie/ecomm/designsystem/component/tab/TabPager.kt
@@ -296,7 +296,7 @@ private fun PagerContent(
     HorizontalPager(
         modifier = Modifier.fillMaxSize(),
         state = pagerState,
-        beyondBoundsPageCount = beyondBoundsPageCount,
+        beyondViewportPageCount = beyondBoundsPageCount,
         userScrollEnabled = isUserScrollEnabled
     ) { page ->
         content(page)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,31 +1,32 @@
 [versions]
 accompanist = "0.32.0"
-androidGradlePlugin = "8.3.0"
+androidGradlePlugin = "8.3.2"
 androidJunit5 = "1.9.3.0"
 androidx-splash = "1.0.1"
-androidx-test-ext-junit = "1.1.5"
+androidx-test-ext-junit = "1.2.1"
 apollo = "4.0.0-beta.4"
-appcompat = "1.6.1"
-browser = "1.7.0"
+appcompat = "1.7.0"
+browser = "1.8.0"
 chucker = "4.0.0"
-compose = "2024.02.01"
-composeActivity = "1.8.2"
-composeAnimation = "1.6.2"
-composeTracing = "1.0.0-beta01"
-core-ktx = "1.12.0"
+compose = "2025.01.01"
+composeActivity = "1.10.0"
+composeAnimation = "1.7.7"
+composeTracing = "1.7.7"
+composeFoundation = "1.7.7"
+core-ktx = "1.15.0"
 coroutines = "1.7.3"
-datastore = "1.0.0"
+datastore = "1.1.2"
 destinations = "1.10.0"
 detekt = "1.23.7"
 detektCompose = "1.3.0"
-espresso-core = "3.5.1"
+espresso-core = "3.6.1"
 firebase = "32.7.3"
-firebaseAppDistribution = "16.0.0-beta12"
-firebaseCommonKtx = "20.4.2"
-firebaseCrashlytics = "3.0.1"
+firebaseAppDistribution = "16.0.0-beta14"
+firebaseCommonKtx = "21.0.0"
+firebaseCrashlytics = "3.0.2"
 fixture = "1.2.0"
 glide = "1.0.0-beta01"
-google = "4.4.1"
+google = "4.4.2"
 hilt = "2.51"
 hiltAndroidx = "1.2.0"
 hiltDagger = "2.51"
@@ -39,22 +40,22 @@ kotlin-compiler-extension = "1.5.10"
 kotlin-serialization = "1.6.2"
 kover = "0.7.6"
 ksp = "1.9.22-1.0.17"
-lifecycle = "2.7.0"
-material = "1.6.2"
-material3 = "1.2.1"
+lifecycle = "2.8.7"
+material = "1.7.7"
+material3 = "1.3.1"
 mockk = "1.13.8"
 moshi = "1.15.0"
-paging = "3.2.1"
+paging = "3.3.5"
 protobufLite = "3.24.3"
 protobufPlugin = "0.9.4"
 protobufProtoc = "21.0-rc-1"
 room = "2.6.1"
 timber = "5.0.1"
 turbine = "1.0.0"
-test-core-ktx  = "1.5.0"
-test-runner = "1.5.2"
-window = "1.2.0"
-work = "2.9.0"
+test-core-ktx  = "1.6.1"
+test-runner = "1.6.2"
+window = "1.3.0"
+work = "2.10.0"
 zoomable = "1.6.0"
 
 [libraries]
@@ -71,6 +72,7 @@ chucker-noOp = { group = "com.github.chuckerteam.chucker", name = "library-no-op
 compose = { group = "androidx.compose", name = "compose-bom", version.ref = "compose" }
 compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "composeActivity" }
 compose-animation = { group = "androidx.compose.animation", name = "animation-graphics", version.ref = "composeAnimation" }
+compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 compose-toolingPreview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
