From 8b5e56221d51717787137b7fadc697ca49727a31 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 22 Feb 2024 14:19:41 +0000 Subject: [PATCH 1/6] Update libs.versions.toml --- gradle/libs.versions.toml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12c713722..990816286 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.1.1" -androidx-activity-compose = "1.8.0-beta01" +androidGradlePlugin = "8.1.4" +androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" -androidx-compose-bom = "2023.09.00" +androidx-compose-bom = "2024.02.01" androidx-constraintlayout = "2.1.4" androidx-constraintlayout-compose = "1.0.1" androidx-coordinator-layout = "1.2.0" androidx-corektx = "1.12.0" androidx-emoji2-views = "1.4.0" -androidx-fragment-ktx = "1.6.1" +androidx-fragment-ktx = "1.6.2" androidx-glance-appwidget = "1.0.0" -androidx-lifecycle-compose = "2.6.2" -androidx-lifecycle-runtime-compose = "2.6.2" -androidx-navigation = "2.7.2" +androidx-lifecycle-compose = "2.7.0" +androidx-lifecycle-runtime-compose = "2.7.0" +androidx-navigation = "2.7.7" androidx-paging = "3.2.1" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" @@ -28,13 +28,13 @@ gradle-versions = "0.47.0" hilt = "2.47" junit = "4.13.2" # @pin Update in conjuction with Compose Compiler -kotlin = "1.8.21" +kotlin = "1.8.22" ksp = "1.8.0-1.0.9" maps-compose = "2.13.0" -material = "1.11.0-alpha02" +material = "1.11.0" # @keep minSdk = "21" -recyclerview = "1.3.1" +recyclerview = "1.3.2" # @keep targetSdk = "34" version-catalog-update = "0.8.1" @@ -60,8 +60,7 @@ androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" } -# TODO remove usage of this when `draw` method is in stable. -androidx-compose-ui-graphics = "androidx.compose.ui:ui-graphics:1.6.0-alpha05" +androidx-compose-ui-graphics = {module = "androidx.compose.ui:ui-graphics" } androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" } androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } From cbfc87226428c65fd80923862bcbc5495d222493 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 22 Feb 2024 14:32:28 +0000 Subject: [PATCH 2/6] Update versions --- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 990816286..9c120ed15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.1.4" +androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-compose-bom = "2024.02.01" @@ -21,14 +21,14 @@ androidxHiltNavigationCompose = "1.0.0" coil = "2.4.0" # @keep compileSdk = "34" -compose-compiler = "1.4.7" +compose-compiler = "1.5.10" coroutines = "1.7.3" google-maps = "18.1.0" gradle-versions = "0.47.0" hilt = "2.47" junit = "4.13.2" # @pin Update in conjuction with Compose Compiler -kotlin = "1.8.22" +kotlin = "1.9.22" ksp = "1.8.0-1.0.9" maps-compose = "2.13.0" material = "1.11.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cb5461a8..f36c7fc00 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Nov 30 15:03:58 PST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From f84dbdc64acab62c884c5d4a2ad19210f21c643b Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 22 Feb 2024 14:39:12 +0000 Subject: [PATCH 3/6] update deps --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a407f47f..2d9c11901 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] accompanist = "0.32.0" androidGradlePlugin = "8.2.2" -androidx-activity-compose = "1.9.0-alpha02" +androidx-activity-compose = "1.9.0-alpha03" androidx-appcompat = "1.6.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.01" androidx-constraintlayout = "2.1.4" androidx-constraintlayout-compose = "1.0.1" androidx-coordinator-layout = "1.2.0" -androidx-corektx = "1.9.0" +androidx-corektx = "1.12.0" androidx-emoji2-views = "1.4.0" androidx-fragment-ktx = "1.6.2" androidx-glance-appwidget = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" androidx-paging = "3.2.1" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" -androidxHiltNavigationCompose = "1.1.0" +androidxHiltNavigationCompose = "1.2.0" coil = "2.5.0" # @keep compileSdk = "34" @@ -33,7 +33,7 @@ ksp = "1.8.0-1.0.9" maps-compose = "4.3.2" material = "1.11.0" material3-adaptive = "1.0.0-alpha06" -material3-adaptive-navigation-suite = "1.0.0-alpha03" +material3-adaptive-navigation-suite = "1.0.0-alpha04" media3 = "1.2.1" # @keep minSdk = "21" @@ -81,7 +81,7 @@ androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref = androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment-ktx" } androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance-appwidget" } androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance-appwidget" } -androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.0.0-alpha04" +androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.0.0-alpha05" androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" } From c694115becfe63cb4486f272aa57055361397a50 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 22 Feb 2024 14:57:55 +0000 Subject: [PATCH 4/6] Update libs.versions.toml --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d9c11901..2e831c684 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ kotlin = "1.9.20" ksp = "1.8.0-1.0.9" maps-compose = "4.3.2" material = "1.11.0" -material3-adaptive = "1.0.0-alpha06" +material3-adaptive = "1.0.0-alpha07" material3-adaptive-navigation-suite = "1.0.0-alpha04" media3 = "1.2.1" # @keep From 0c5a1ce163e7e5afc8f62a2b662ea77067aa4228 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 23 Feb 2024 16:57:57 +0000 Subject: [PATCH 5/6] Change material-adaptive artifact to point to new name --- compose/snippets/build.gradle.kts | 3 ++- .../adaptivelayouts/SampleListDetailPaneScaffold.kt | 8 ++++---- gradle/libs.versions.toml | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/compose/snippets/build.gradle.kts b/compose/snippets/build.gradle.kts index 37d55a7b4..acfa8ddc8 100644 --- a/compose/snippets/build.gradle.kts +++ b/compose/snippets/build.gradle.kts @@ -93,7 +93,8 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.compose.material3.adaptive) - implementation(libs.androidx.compose.material3.adaptive.navigation.suite) + implementation(libs.androidx.compose.material3.adaptive.layout) + implementation(libs.androidx.compose.material3.adaptive.navigation) implementation(libs.androidx.compose.material) implementation(libs.androidx.compose.runtime) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt b/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt index d06615fa1..a674512ad 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt @@ -28,11 +28,11 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material3.Card import androidx.compose.material3.ListItem import androidx.compose.material3.Text -import androidx.compose.material3.adaptive.AnimatedPane import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi -import androidx.compose.material3.adaptive.ListDetailPaneScaffold -import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole -import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldNavigator +import androidx.compose.material3.adaptive.layout.AnimatedPane +import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold +import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole +import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2e831c684..ecf8dd9d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidx-compose-bom = "2024.02.01" androidx-constraintlayout = "2.1.4" androidx-constraintlayout-compose = "1.0.1" androidx-coordinator-layout = "1.2.0" -androidx-corektx = "1.12.0" +androidx-corektx = "1.9.0" androidx-emoji2-views = "1.4.0" androidx-fragment-ktx = "1.6.2" androidx-glance-appwidget = "1.0.0" @@ -58,8 +58,9 @@ androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-material-ripple = { module = "androidx.compose.material:material-ripple" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } -androidx-compose-material3-adaptive = { module = "androidx.compose.material3:material3-adaptive", version.ref = "material3-adaptive" } -androidx-compose-material3-adaptive-navigation-suite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite", version.ref = "material3-adaptive-navigation-suite" } +androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "material3-adaptive" } +androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "material3-adaptive" } +androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "material3-adaptive-navigation-suite" } androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } From eb09447e69eaf333aa5cf0fe59714253908dae30 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 23 Feb 2024 17:45:19 +0000 Subject: [PATCH 6/6] Update gradle/libs.versions.toml Co-authored-by: Alex Vanyo --- gradle/libs.versions.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ecf8dd9d6..035b5f151 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,8 @@ androidx-compose-material-ripple = { module = "androidx.compose.material:materia androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "material3-adaptive" } androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "material3-adaptive" } -androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "material3-adaptive-navigation-suite" } +androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "material3-adaptive" } +androidx-compose-material3-adaptive-navigation-suite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite", version.ref = "material3-adaptive-navigation-suite" } androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }