From d395aa2e0e7744f1d1f3d38637d25adddfd5a343 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 25 Sep 2023 09:22:33 +1000 Subject: [PATCH 1/3] Update libs.versions.toml --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8f9f00b20..2e6194266 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -compose = "1.6.0-alpha02" -composeCompiler = "1.5.1" +compose = "1.6.0-alpha06" +composeCompiler = "1.5.3" composeMaterial3 = "1.0.1" composesnapshot = "-" # a single character = no snapshot @@ -12,7 +12,7 @@ gradlePlugin = "8.1.0" lintMinCompose = "30.0.0" ktlint = "0.45.2" -kotlin = "1.9.0" +kotlin = "1.9.10" coroutines = "1.6.4" okhttp = "3.12.13" coil = "1.3.2" From 0f115965032f0b7dbf91c4cdf52afd1a13eda783 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 25 Sep 2023 09:23:36 +1000 Subject: [PATCH 2/3] v0.33.2-alpha --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 05f7571f2..f17bffac3 100644 --- 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.33.2-SNAPSHOT +VERSION_NAME=0.33.2-alpha POM_DESCRIPTION=Utilities for Jetpack Compose From b9609bebdba1d0240e609d8df7524710127b28de Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 25 Sep 2023 09:53:51 +1000 Subject: [PATCH 3/3] Fix deprecation in sample --- .../sample/adaptive/NavDrawerFoldAwareColumnSample.kt | 2 -- .../accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt index 4b250952c..d89bf98e9 100644 --- a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt @@ -32,7 +32,6 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done import androidx.compose.material.icons.filled.Face -import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.Lock import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Star @@ -68,7 +67,6 @@ class NavDrawerFoldAwareColumnSample : ComponentActivity() { @Composable fun NavDrawerExample(activity: Activity) { val icons = listOf( - Icons.Default.List, Icons.Default.Done, Icons.Default.Face, Icons.Default.Lock, diff --git a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt index e25693f5a..8d296e126 100644 --- a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt @@ -33,7 +33,6 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done import androidx.compose.material.icons.filled.Face -import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.Lock import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Star @@ -67,7 +66,6 @@ class NavRailFoldAwareColumnSample : ComponentActivity() { @Composable fun NavRail(activity: Activity) { val icons = listOf( - Icons.Default.List, Icons.Default.Done, Icons.Default.Face, Icons.Default.Lock,