From 9a6fca16a66701aad415bd1d63375afeb58455b8 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 18 Jun 2023 11:54:31 +0200 Subject: [PATCH 1/6] Upgrade Compose BoM `2023.06.00` and Compose compiler `1.4.7` - Bump `androidxComposeMaterial3` to stable `1.1.0` - Bump Kotlin `1.8.21` (to match the expected version used by Compose compiler) - Bump KSP `1.8.21-1.0.11` (to match Kotlin version) This also solves part of #806, where we had this dependency chain: - `androidx.compose:compose-bom:2023.01.00` - `androidx.compose.ui:ui-test-junit4:1.3.3` - `androidx.test.ext:junit:1.1.3` (unlisted from maven) - `junit:junit:4.12` (vulnerability `CVE-2020-15250`) --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd37438cb..a3b28e3d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ androidGradlePlugin = "8.0.2" androidxActivity = "1.7.0" androidxAppCompat = "1.5.1" androidxBrowser = "1.4.0" -androidxComposeBom = "2023.01.00" -androidxComposeCompiler = "1.4.5" -androidxComposeMaterial3 = "1.1.0-alpha06" -androidxComposeRuntimeTracing = "1.0.0-alpha01" +androidxComposeBom = "2023.06.00" +androidxComposeCompiler = "1.4.7" +androidxComposeMaterial3 = "1.1.0" +androidxComposeRuntimeTracing = "1.0.0-alpha03" androidxCore = "1.9.0" androidxCoreSplashscreen = "1.0.0" androidxDataStore = "1.0.0" @@ -39,11 +39,11 @@ hilt = "2.44.2" hiltExt = "1.0.0" jacoco = "0.8.7" junit4 = "4.13.2" -kotlin = "1.8.20" +kotlin = "1.8.21" kotlinxCoroutines = "1.6.4" kotlinxDatetime = "0.4.0" kotlinxSerializationJson = "1.5.1" -ksp = "1.8.20-1.0.11" +ksp = "1.8.21-1.0.11" lint = "30.3.1" okhttp = "4.10.0" protobuf = "3.23.0" From e846cc95bd178a9431017d1d1e06340173aefde4 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 18 Jun 2023 13:42:21 +0200 Subject: [PATCH 2/6] Update `androidx.lifecycle` to stable `2.6.1` And match `androidx.profileinstaller` transitive dependency version `1.3.0`. Fixes the following error: ``` java.lang.RuntimeException: Unable to get provider androidx.startup.InitializationProvider: androidx.startup.StartupException: androidx.startup.StartupException: java.lang.IllegalStateException: ProcessLifecycleInitializer cannot be initialized lazily. ``` --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a3b28e3d2..13cc12c10 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,11 +14,11 @@ androidxCoreSplashscreen = "1.0.0" androidxDataStore = "1.0.0" androidxEspresso = "3.5.0" androidxHiltNavigationCompose = "1.0.0" -androidxLifecycle = "2.6.0-alpha05" +androidxLifecycle = "2.6.1" androidxMacroBenchmark = "1.1.1" androidxMetrics = "1.0.0-alpha03" androidxNavigation = "2.5.3" -androidxProfileinstaller = "1.2.1" +androidxProfileinstaller = "1.3.0" androidxStartup = "1.1.1" androidxTestCore = "1.5.0" androidxTestExt = "1.1.4" From 40b524830245b10b628e7199cb147052be860c28 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 18 Jun 2023 13:54:59 +0200 Subject: [PATCH 3/6] Replace deprecated method `TextFieldDefaults.textFieldColors` ``` TextFieldColors' is deprecated. Renamed to `TextFieldDefaults.colors` with additional parameters to controlcontainer color based on state. ``` --- .../samples/apps/nowinandroid/feature/search/SearchScreen.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt index cb48bffe3..dc5ee45a8 100644 --- a/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt +++ b/feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt @@ -39,7 +39,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.ClickableText import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -450,7 +449,7 @@ private fun SearchToolbar( } } -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalComposeUiApi::class) @Composable private fun SearchTextField( onSearchQueryChanged: (String) -> Unit, @@ -466,7 +465,7 @@ private fun SearchTextField( } TextField( - colors = TextFieldDefaults.textFieldColors( + colors = TextFieldDefaults.colors( focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent, disabledIndicatorColor = Color.Transparent, From 7e3979999e1c5c4304e6b1d20f5a31c2edad6337 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 26 Jun 2023 21:32:59 +0200 Subject: [PATCH 4/6] Update Compose BoM 2023.06.01 --- 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 13cc12c10..29e300992 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidGradlePlugin = "8.0.2" androidxActivity = "1.7.0" androidxAppCompat = "1.5.1" androidxBrowser = "1.4.0" -androidxComposeBom = "2023.06.00" +androidxComposeBom = "2023.06.01" androidxComposeCompiler = "1.4.7" androidxComposeMaterial3 = "1.1.0" androidxComposeRuntimeTracing = "1.0.0-alpha03" From 5efefa6e66bd3839d58613c024fbde4cc327efb3 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Mon, 26 Jun 2023 21:33:59 +0200 Subject: [PATCH 5/6] Remove `androidxComposeMaterial3` versioning as it's already provided through Compose BoM --- gradle/libs.versions.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29e300992..5b192e1b5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,6 @@ androidxAppCompat = "1.5.1" androidxBrowser = "1.4.0" androidxComposeBom = "2023.06.01" androidxComposeCompiler = "1.4.7" -androidxComposeMaterial3 = "1.1.0" androidxComposeRuntimeTracing = "1.0.0-alpha03" androidxCore = "1.9.0" androidxCoreSplashscreen = "1.0.0" @@ -67,8 +66,8 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } -androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "androidxComposeMaterial3" } +androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" } androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" } From 58890bebf3267bba75087d0b8830aae8cf4b0a6e Mon Sep 17 00:00:00 2001 From: Milosz Moczkowski Date: Thu, 29 Jun 2023 16:37:42 +0200 Subject: [PATCH 6/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 8363828b7..c52ae9b36 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ androidxDataStore = "1.0.0" androidxEspresso = "3.5.0" androidxHiltNavigationCompose = "1.0.0" androidxLifecycle = "2.6.1" -androidxMacroBenchmark = "1.1.1" +androidxMacroBenchmark = "1.2.0-alpha16" androidxMetrics = "1.0.0-alpha03" androidxNavigation = "2.5.3" androidxProfileinstaller = "1.3.1"