Merge pull request #1691 from google/1.6

Upgrade to Compose 1.6
google · Aug 7, 2023 · 4729763 · 4729763
2 parents 511ee9c + de1249b
commit 4729763
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 GROUP=com.google.accompanist
 # !! No longer need to update this manually when using a Compose SNAPSHOT
-VERSION_NAME=0.31.7-SNAPSHOT
+VERSION_NAME=0.33.0-alpha
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-compose = "1.5.0-rc01"
+compose = "1.6.0-alpha02"
 composeCompiler = "1.5.1"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot

diff --git a/navigation-material/api/current.api b/navigation-material/api/current.api
@@ -25,16 +25,10 @@ package com.google.accompanist.navigation.material {
   @androidx.compose.runtime.Stable @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public final class BottomSheetNavigatorSheetState {
     ctor public BottomSheetNavigatorSheetState(androidx.compose.material.ModalBottomSheetState sheetState);
     method public androidx.compose.material.ModalBottomSheetValue getCurrentValue();
-    method @Deprecated public float getDirection();
-    method @Deprecated public androidx.compose.runtime.State<java.lang.Float> getOffset();
-    method @Deprecated public androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> getProgress();
     method public androidx.compose.material.ModalBottomSheetValue getTargetValue();
     method public boolean isVisible();
     property public final androidx.compose.material.ModalBottomSheetValue currentValue;
-    property @Deprecated public final float direction;
     property public final boolean isVisible;
-    property @Deprecated public final androidx.compose.runtime.State<java.lang.Float> offset;
-    property @Deprecated public final androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> progress;
     property public final androidx.compose.material.ModalBottomSheetValue targetValue;
   }
 

diff --git a/...material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt b/...material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt
@@ -18,17 +18,15 @@ package com.google.accompanist.navigation.material
 
 import android.annotation.SuppressLint
 import androidx.compose.animation.core.AnimationSpec
+import androidx.compose.animation.core.SpringSpec
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetState
 import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.SwipeProgress
-import androidx.compose.material.SwipeableDefaults
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -74,36 +72,6 @@ public class BottomSheetNavigatorSheetState(internal val sheetState: ModalBottom
      */
     public val targetValue: ModalBottomSheetValue
         get() = sheetState.targetValue
-
-    /**
-     * @see ModalBottomSheetState.offset
-     */
-    @Deprecated(
-        message = "BottomSheetNavigatorSheetState#offset has been removed",
-        level = DeprecationLevel.ERROR
-    )
-    public val offset: State<Float>
-        get() = error("BottomSheetNavigatorSheetState#offset has been removed")
-
-    /**
-     * @see ModalBottomSheetState.direction
-     */
-    @Deprecated(
-        message = "BottomSheetNavigatorSheetState#direction has been removed",
-        level = DeprecationLevel.ERROR
-    )
-    public val direction: Float
-        get() = error("BottomSheetNavigatorSheetState#direction has been removed.")
-
-    /**
-     * @see ModalBottomSheetState.progress
-     */
-    @Deprecated(
-        message = "BottomSheetNavigatorSheetState#progress has been removed",
-        level = DeprecationLevel.ERROR
-    )
-    public val progress: SwipeProgress<ModalBottomSheetValue>
-        get() = error("BottomSheetNavigatorSheetState#progress has been removed")
 }
 
 /**
@@ -113,7 +81,7 @@ public class BottomSheetNavigatorSheetState(internal val sheetState: ModalBottom
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 public fun rememberBottomSheetNavigator(
-    animationSpec: AnimationSpec<Float> = SwipeableDefaults.AnimationSpec
+    animationSpec: AnimationSpec<Float> = SpringSpec<Float>()
 ): BottomSheetNavigator {
     val sheetState = rememberModalBottomSheetState(
         ModalBottomSheetValue.Hidden,