Skip to content

Commit a6234d5

Browse files
authored
Merge pull request #1467 from google/ben/1.4
Upgrade to Compose 1.4
2 parents 270ea81 + 9b647c7 commit a6234d5

File tree

9 files changed

+538
-270
lines changed

9 files changed

+538
-270
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ Each [release](https://github.com/google/accompanist/releases) outlines what ver
2020
<tr>
2121
<td>Compose UI 1.2 (1.2.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions?versionPrefix=0.25"></td>
2222
</tr>
23-
<tr>
24-
<td>Compose UI 1.3 & 1.4 (1.3.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions"></td>
23+
<tr>
24+
<td>Compose UI 1.3 (1.3.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions?versionPrefix=0.28"></td>
25+
</tr>
26+
<tr>
27+
<td>Compose UI 1.4 (1.4.x)</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-permissions"></td>
2528
</tr>
2629
</table>
2730

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
3333

3434
GROUP=com.google.accompanist
3535
# !! No longer need to update this manually when using a Compose SNAPSHOT
36-
VERSION_NAME=0.28.1-SNAPSHOT
36+
VERSION_NAME=0.29.0-alpha
3737

3838
POM_DESCRIPTION=Utilities for Jetpack Compose
3939

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22

3-
compose = "1.3.1"
4-
composeCompiler = "1.3.2"
3+
compose = "1.4.0-alpha04"
4+
composeCompiler = "1.4.0-alpha02"
55
composeMaterial3 = "1.0.1"
66
composesnapshot = "-" # a single character = no snapshot
77

@@ -10,7 +10,7 @@ gradlePlugin = "7.3.1"
1010
lintMinCompose = "30.0.0"
1111

1212
ktlint = "0.45.2"
13-
kotlin = "1.7.20"
13+
kotlin = "1.7.21"
1414
coroutines = "1.6.4"
1515
okhttp = "3.12.13"
1616
coil = "1.3.2"

navigation-material/api/current.api

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,19 @@ package com.google.accompanist.navigation.material {
2222
method @androidx.compose.runtime.Composable @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public static com.google.accompanist.navigation.material.BottomSheetNavigator rememberBottomSheetNavigator(optional androidx.compose.animation.core.AnimationSpec<java.lang.Float> animationSpec);
2323
}
2424

25-
@com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public final class BottomSheetNavigatorSheetState {
25+
@androidx.compose.runtime.Stable @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public final class BottomSheetNavigatorSheetState {
2626
ctor public BottomSheetNavigatorSheetState(androidx.compose.material.ModalBottomSheetState sheetState);
2727
method public androidx.compose.material.ModalBottomSheetValue getCurrentValue();
28-
method public float getDirection();
29-
method public androidx.compose.runtime.State<java.lang.Float> getOffset();
30-
method public androidx.compose.runtime.State<java.lang.Float> getOverflow();
31-
method public androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> getProgress();
28+
method @Deprecated public float getDirection();
29+
method @Deprecated public androidx.compose.runtime.State<java.lang.Float> getOffset();
30+
method @Deprecated public androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> getProgress();
3231
method public androidx.compose.material.ModalBottomSheetValue getTargetValue();
3332
method public boolean isVisible();
3433
property public final androidx.compose.material.ModalBottomSheetValue currentValue;
35-
property public final float direction;
34+
property @Deprecated public final float direction;
3635
property public final boolean isVisible;
37-
property public final androidx.compose.runtime.State<java.lang.Float> offset;
38-
property public final androidx.compose.runtime.State<java.lang.Float> overflow;
39-
property public final androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> progress;
36+
property @Deprecated public final androidx.compose.runtime.State<java.lang.Float> offset;
37+
property @Deprecated public final androidx.compose.material.SwipeProgress<androidx.compose.material.ModalBottomSheetValue> progress;
4038
property public final androidx.compose.material.ModalBottomSheetValue targetValue;
4139
}
4240

0 commit comments

Comments
 (0)