Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Compose to 1.6.0-alpha06 #1715

Merged
merged 3 commits into from
Sep 25, 2023
Merged

Upgrade Compose to 1.6.0-alpha06 #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d395aa2
Update libs.versions.toml
bentrengrove Sep 24, 2023
0f11596
v0.33.2-alpha
bentrengrove Sep 24, 2023
b9609be
Fix deprecation in sample
bentrengrove Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -12,7 +12,7 @@ gradlePlugin = "8.1.0"
lintMinCompose = "30.0.0"

ktlint = "0.45.2"
kotlin = "1.9.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking - is bumping Kotlin and the compiler require from accompanist? Just wondering if the transitive Kotlin bump here is worth it (or if that bump would be transitive anyway from base Compose)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We always just release with the latest compiler to make sure we stay up to date with fixes there. I haven't heard an issue yet with an incompatible change

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking - is bumping Kotlin and the compiler require from accompanist? Just wondering if the transitive Kotlin bump here is worth it (or if that bump would be transitive anyway from base Compose)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uploading Screenshot_٢٠٢٤٠١٠٣_١٣٣٠١٢_Chrome.jpg …

kotlin = "1.9.10"
coroutines = "1.6.4"
okhttp = "3.12.13"
coil = "1.3.2"
Expand Down
2 changes: 0 additions & 2 deletions ...le/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -68,7 +67,6 @@ class NavDrawerFoldAwareColumnSample : ComponentActivity() {
@Composable
fun NavDrawerExample(activity: Activity) {
val icons = listOf(
Icons.Default.List,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Was this removed? Or was this one of the AutoMirrored icons?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was automirrored but the label looks weird in the sample because of splitting at the first .. It seemed easier to just remove it rather than fix that

Icons.Default.Done,
Icons.Default.Face,
Icons.Default.Lock,
Expand Down
2 changes: 0 additions & 2 deletions sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading