Merge pull request #1715 from google/bentrengrove-patch-1

Upgrade Compose to 1.6.0-alpha06
google · Sep 25, 2023 · 31421df · 31421df
2 parents 3fe4ad9 + b9609be
commit 31421df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 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.33.2-SNAPSHOT
+VERSION_NAME=0.33.2-alpha
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

diff --git 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"

diff --git a/...le/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt b/...le/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
@@ -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,