Skip to content

Commit 4d65946

Browse files
authored
Merge pull request #808 from SimonMarquis/compose-bom-2023-06-00
Upgrade Compose BoM `2023.06.00` and Compose compiler `1.4.7`
2 parents adbfd86 + 58890be commit 4d65946

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
3939
import androidx.compose.foundation.text.ClickableText
4040
import androidx.compose.foundation.text.KeyboardActions
4141
import androidx.compose.foundation.text.KeyboardOptions
42-
import androidx.compose.material3.ExperimentalMaterial3Api
4342
import androidx.compose.material3.Icon
4443
import androidx.compose.material3.IconButton
4544
import androidx.compose.material3.MaterialTheme
@@ -450,7 +449,7 @@ private fun SearchToolbar(
450449
}
451450
}
452451

453-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
452+
@OptIn(ExperimentalComposeUiApi::class)
454453
@Composable
455454
private fun SearchTextField(
456455
onSearchQueryChanged: (String) -> Unit,
@@ -466,7 +465,7 @@ private fun SearchTextField(
466465
}
467466

468467
TextField(
469-
colors = TextFieldDefaults.textFieldColors(
468+
colors = TextFieldDefaults.colors(
470469
focusedIndicatorColor = Color.Transparent,
471470
unfocusedIndicatorColor = Color.Transparent,
472471
disabledIndicatorColor = Color.Transparent,

gradle/libs.versions.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ androidGradlePlugin = "8.0.2"
55
androidxActivity = "1.7.0"
66
androidxAppCompat = "1.5.1"
77
androidxBrowser = "1.4.0"
8-
androidxComposeBom = "2023.01.00"
9-
androidxComposeCompiler = "1.4.5"
10-
androidxComposeMaterial3 = "1.1.0-alpha06"
11-
androidxComposeRuntimeTracing = "1.0.0-alpha01"
8+
androidxComposeBom = "2023.06.01"
9+
androidxComposeCompiler = "1.4.7"
10+
androidxComposeRuntimeTracing = "1.0.0-alpha03"
1211
androidxCore = "1.9.0"
1312
androidxCoreSplashscreen = "1.0.0"
1413
androidxDataStore = "1.0.0"
1514
androidxEspresso = "3.5.0"
1615
androidxHiltNavigationCompose = "1.0.0"
17-
androidxLifecycle = "2.6.0-alpha05"
16+
androidxLifecycle = "2.6.1"
1817
androidxMacroBenchmark = "1.2.0-alpha16"
1918
androidxMetrics = "1.0.0-alpha03"
2019
androidxNavigation = "2.5.3"
@@ -39,11 +38,11 @@ hilt = "2.44.2"
3938
hiltExt = "1.0.0"
4039
jacoco = "0.8.7"
4140
junit4 = "4.13.2"
42-
kotlin = "1.8.20"
41+
kotlin = "1.8.21"
4342
kotlinxCoroutines = "1.6.4"
4443
kotlinxDatetime = "0.4.0"
4544
kotlinxSerializationJson = "1.5.1"
46-
ksp = "1.8.20-1.0.11"
45+
ksp = "1.8.21-1.0.11"
4746
lint = "30.3.1"
4847
okhttp = "4.10.0"
4948
protobuf = "3.23.0"
@@ -67,8 +66,8 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
6766
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
6867
androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
6968
androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
70-
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
71-
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "androidxComposeMaterial3" }
69+
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
70+
androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
7271
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
7372
androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }
7473
androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }

0 commit comments

Comments
 (0)