From d4653a1b3d004af029ab99238c9e3cdda69bdc97 Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Thu, 25 Sep 2025 09:28:38 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96=20Update=20Dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JetLagged/gradle/libs.versions.toml | 16 ++++++++-------- JetNews/gradle/libs.versions.toml | 16 ++++++++-------- Jetchat/gradle/libs.versions.toml | 16 ++++++++-------- Jetsnack/gradle/libs.versions.toml | 16 ++++++++-------- Reply/gradle/libs.versions.toml | 16 ++++++++-------- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 48f001f11..7ef8f8e16 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -4,7 +4,7 @@ android-material3 = "1.14.0-alpha04" androidGradlePlugin = "8.13.0" androidx-activity-compose = "1.11.0" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2025.09.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.17.0" @@ -12,7 +12,7 @@ androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.9.4" androidx-lifecycle-runtime-compose = "2.9.4" -androidx-navigation = "2.9.4" +androidx-navigation = "2.9.5" androidx-palette = "1.0.0" androidx-test = "1.7.0" androidx-test-espresso = "3.7.0" @@ -20,8 +20,8 @@ androidx-test-ext-junit = "1.3.0" androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.1" -androidx-wear-compose = "1.5.1" -androidx-window = "1.4.0" +androidx-wear-compose = "1.5.2" +androidx-window = "1.5.0" androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -29,7 +29,7 @@ coil = "2.7.0" compileSdk = "36" coroutines = "1.10.2" google-maps = "19.2.0" -gradle-versions = "0.52.0" +gradle-versions = "0.53.0" hilt = "2.57.1" hiltExt = "1.3.0" horologist = "0.7.15" @@ -39,7 +39,7 @@ kotlin = "2.2.20" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" -maps-compose = "6.10.0" +maps-compose = "6.11.0" # @keep minSdk = "21" okhttp = "5.1.0" @@ -47,9 +47,9 @@ play-services-wearable = "19.0.0" robolectric = "4.16" roborazzi = "1.50.0" rome = "2.1.0" -room = "2.8.0" +room = "2.8.1" secrets = "2.0.1" -spotless = "7.2.1" +spotless = "8.0.0" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index fb9309673..0a1157ec6 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -8,7 +8,7 @@ android-material3 = "1.14.0-alpha04" androidGradlePlugin = "8.13.0" androidx-activity-compose = "1.11.0" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2025.09.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.17.0" @@ -16,7 +16,7 @@ androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.9.4" androidx-lifecycle-runtime-compose = "2.9.4" -androidx-navigation = "2.9.4" +androidx-navigation = "2.9.5" androidx-palette = "1.0.0" androidx-test = "1.7.0" androidx-test-espresso = "3.7.0" @@ -24,8 +24,8 @@ androidx-test-ext-junit = "1.3.0" androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.1" -androidx-wear-compose = "1.5.1" -androidx-window = "1.4.0" +androidx-wear-compose = "1.5.2" +androidx-window = "1.5.0" androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -33,7 +33,7 @@ coil = "2.7.0" compileSdk = "36" coroutines = "1.10.2" google-maps = "19.2.0" -gradle-versions = "0.52.0" +gradle-versions = "0.53.0" hilt = "2.57.1" hiltExt = "1.3.0" horologist = "0.7.15" @@ -43,7 +43,7 @@ kotlin = "2.2.20" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" -maps-compose = "6.10.0" +maps-compose = "6.11.0" # @keep minSdk = "21" okhttp = "5.1.0" @@ -51,9 +51,9 @@ play-services-wearable = "19.0.0" robolectric = "4.16" roborazzi = "1.50.0" rome = "2.1.0" -room = "2.8.0" +room = "2.8.1" secrets = "2.0.1" -spotless = "7.2.1" +spotless = "8.0.0" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index fb9309673..0a1157ec6 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -8,7 +8,7 @@ android-material3 = "1.14.0-alpha04" androidGradlePlugin = "8.13.0" androidx-activity-compose = "1.11.0" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2025.09.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.17.0" @@ -16,7 +16,7 @@ androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.9.4" androidx-lifecycle-runtime-compose = "2.9.4" -androidx-navigation = "2.9.4" +androidx-navigation = "2.9.5" androidx-palette = "1.0.0" androidx-test = "1.7.0" androidx-test-espresso = "3.7.0" @@ -24,8 +24,8 @@ androidx-test-ext-junit = "1.3.0" androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.1" -androidx-wear-compose = "1.5.1" -androidx-window = "1.4.0" +androidx-wear-compose = "1.5.2" +androidx-window = "1.5.0" androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -33,7 +33,7 @@ coil = "2.7.0" compileSdk = "36" coroutines = "1.10.2" google-maps = "19.2.0" -gradle-versions = "0.52.0" +gradle-versions = "0.53.0" hilt = "2.57.1" hiltExt = "1.3.0" horologist = "0.7.15" @@ -43,7 +43,7 @@ kotlin = "2.2.20" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" -maps-compose = "6.10.0" +maps-compose = "6.11.0" # @keep minSdk = "21" okhttp = "5.1.0" @@ -51,9 +51,9 @@ play-services-wearable = "19.0.0" robolectric = "4.16" roborazzi = "1.50.0" rome = "2.1.0" -room = "2.8.0" +room = "2.8.1" secrets = "2.0.1" -spotless = "7.2.1" +spotless = "8.0.0" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 2b37a63d6..f08a2674a 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -8,7 +8,7 @@ android-material3 = "1.14.0-alpha04" androidGradlePlugin = "8.13.0" androidx-activity-compose = "1.11.0" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2025.09.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.17.0" @@ -16,7 +16,7 @@ androidx-glance = "1.2.0-beta01" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.9.4" androidx-lifecycle-runtime-compose = "2.9.4" -androidx-navigation = "2.9.4" +androidx-navigation = "2.9.5" androidx-palette = "1.0.0" androidx-test = "1.7.0" androidx-test-espresso = "3.7.0" @@ -24,8 +24,8 @@ androidx-test-ext-junit = "1.3.0" androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.1" -androidx-wear-compose = "1.5.1" -androidx-window = "1.4.0" +androidx-wear-compose = "1.5.2" +androidx-window = "1.5.0" androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -34,7 +34,7 @@ compileSdk = "36" coroutines = "1.10.2" glancePreview = "1.1.1" google-maps = "19.2.0" -gradle-versions = "0.52.0" +gradle-versions = "0.53.0" hilt = "2.57.1" hiltExt = "1.3.0" horologist = "0.7.15" @@ -44,7 +44,7 @@ kotlin = "2.2.20" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" -maps-compose = "6.10.0" +maps-compose = "6.11.0" # @keep minSdk = "23" okhttp = "5.1.0" @@ -52,9 +52,9 @@ play-services-wearable = "19.0.0" robolectric = "4.16" roborazzi = "1.50.0" rome = "2.1.0" -room = "2.8.0" +room = "2.8.1" secrets = "2.0.1" -spotless = "7.2.1" +spotless = "8.0.0" # @keep targetSdk = "33" version-catalog-update = "1.0.0" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index fb9309673..0a1157ec6 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -8,7 +8,7 @@ android-material3 = "1.14.0-alpha04" androidGradlePlugin = "8.13.0" androidx-activity-compose = "1.11.0" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2025.09.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.0.1" androidx-corektx = "1.17.0" @@ -16,7 +16,7 @@ androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" androidx-lifecycle-compose = "2.9.4" androidx-lifecycle-runtime-compose = "2.9.4" -androidx-navigation = "2.9.4" +androidx-navigation = "2.9.5" androidx-palette = "1.0.0" androidx-test = "1.7.0" androidx-test-espresso = "3.7.0" @@ -24,8 +24,8 @@ androidx-test-ext-junit = "1.3.0" androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" androidx-tv-material = "1.0.1" -androidx-wear-compose = "1.5.1" -androidx-window = "1.4.0" +androidx-wear-compose = "1.5.2" +androidx-window = "1.5.0" androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" @@ -33,7 +33,7 @@ coil = "2.7.0" compileSdk = "36" coroutines = "1.10.2" google-maps = "19.2.0" -gradle-versions = "0.52.0" +gradle-versions = "0.53.0" hilt = "2.57.1" hiltExt = "1.3.0" horologist = "0.7.15" @@ -43,7 +43,7 @@ kotlin = "2.2.20" kotlinx-serialization-json = "1.9.0" kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" -maps-compose = "6.10.0" +maps-compose = "6.11.0" # @keep minSdk = "21" okhttp = "5.1.0" @@ -51,9 +51,9 @@ play-services-wearable = "19.0.0" robolectric = "4.16" roborazzi = "1.50.0" rome = "2.1.0" -room = "2.8.0" +room = "2.8.1" secrets = "2.0.1" -spotless = "7.2.1" +spotless = "8.0.0" # @keep targetSdk = "33" version-catalog-update = "1.0.0" From 38afa97f236e6af84478c4ed6be84b8d592a52f5 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 25 Sep 2025 12:53:38 +0100 Subject: [PATCH 2/3] Bump minSdk to 23 from 21 --- JetLagged/gradle/libs.versions.toml | 2 +- JetNews/gradle/libs.versions.toml | 2 +- Jetchat/gradle/libs.versions.toml | 2 +- Reply/gradle/libs.versions.toml | 2 +- scripts/libs.versions.toml | 0 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 scripts/libs.versions.toml diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 7ef8f8e16..7ffcb0ef9 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -41,7 +41,7 @@ kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" maps-compose = "6.11.0" # @keep -minSdk = "21" +minSdk = "23" okhttp = "5.1.0" play-services-wearable = "19.0.0" robolectric = "4.16" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 0a1157ec6..098890a89 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -45,7 +45,7 @@ kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" maps-compose = "6.11.0" # @keep -minSdk = "21" +minSdk = "23" okhttp = "5.1.0" play-services-wearable = "19.0.0" robolectric = "4.16" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 0a1157ec6..098890a89 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -45,7 +45,7 @@ kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" maps-compose = "6.11.0" # @keep -minSdk = "21" +minSdk = "23" okhttp = "5.1.0" play-services-wearable = "19.0.0" robolectric = "4.16" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 0a1157ec6..098890a89 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -45,7 +45,7 @@ kotlinx_immutable = "0.4.0" ksp = "2.2.20-2.0.3" maps-compose = "6.11.0" # @keep -minSdk = "21" +minSdk = "23" okhttp = "5.1.0" play-services-wearable = "19.0.0" robolectric = "4.16" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml deleted file mode 100644 index e69de29bb..000000000 From 08fc6a919812add1cb3c7bae31993559f6729c8d Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 26 Sep 2025 17:46:35 +0100 Subject: [PATCH 3/3] Remove icon usage from Jetsnack, replace with hardcoded icons. --- .../java/com/example/jetsnack/ui/components/Snacks.kt | 4 +--- .../com/example/jetsnack/ui/home/search/Results.kt | 4 +--- .../java/com/example/jetsnack/ui/home/search/Search.kt | 8 +++----- .../com/example/jetsnack/ui/snackdetail/SnackDetail.kt | 5 ++--- Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml | 10 ++++++++++ Jetsnack/gradle/libs.versions.toml | 9 +-------- 6 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt index 05250e349..b3326687d 100644 --- a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt +++ b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt @@ -49,8 +49,6 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -121,7 +119,7 @@ fun SnackCollection( modifier = Modifier.align(Alignment.CenterVertically), ) { Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowBack, + painter = painterResource(id = R.drawable.ic_arrow_back), tint = JetsnackTheme.colors.brand, contentDescription = null, ) diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt index 09cd2097b..828c8328a 100644 --- a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt +++ b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt @@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Add import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -167,7 +165,7 @@ private fun SearchResult(snack: Snack, onSnackClick: (Long, String) -> Unit, sho }, ) { Icon( - imageVector = Icons.Outlined.Add, + painter = painterResource(id = R.drawable.ic_add), contentDescription = stringResource(R.string.label_add), ) } diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt index a532ac4ff..4f7f4426b 100644 --- a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt +++ b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt @@ -31,9 +31,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.text.BasicTextField -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.outlined.Search import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -49,6 +46,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.tooling.preview.Preview @@ -192,7 +190,7 @@ private fun SearchBar( if (searchFocused) { IconButton(onClick = onClearQuery) { Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowBack, + painter = painterResource(id = R.drawable.ic_arrow_back), tint = JetsnackTheme.colors.iconPrimary, contentDescription = stringResource(R.string.label_back), ) @@ -233,7 +231,7 @@ private fun SearchHint() { .wrapContentSize(), ) { Icon( - imageVector = Icons.Outlined.Search, + painter = painterResource(id = R.drawable.ic_search), tint = JetsnackTheme.colors.textHelp, contentDescription = stringResource(R.string.label_search), ) diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt index 078456742..09c0a90ea 100644 --- a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt +++ b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt @@ -62,8 +62,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -85,6 +83,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.TileMode import androidx.compose.ui.layout.Layout import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextAlign @@ -271,7 +270,7 @@ private fun SharedTransitionScope.Up(upPress: () -> Unit) { ), ) { Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowBack, + painter = painterResource(id = R.drawable.ic_arrow_back), tint = JetsnackTheme.colors.iconInteractive, contentDescription = stringResource(R.string.label_back), ) diff --git a/Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml b/Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..87ebdabe3 --- /dev/null +++ b/Jetsnack/app/src/main/res/drawable/ic_arrow_back.xml @@ -0,0 +1,10 @@ + + + diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index f08a2674a..2c179e150 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -1,7 +1,3 @@ -##### -# This file is duplicated to individual samples from the global scripts/libs.versions.toml -# Do not add a dependency to an individual sample, edit the global version instead. -##### [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha04" @@ -56,7 +52,7 @@ room = "2.8.1" secrets = "2.0.1" spotless = "8.0.0" # @keep -targetSdk = "33" +targetSdk = "36" version-catalog-update = "1.0.0" [libraries] @@ -70,7 +66,6 @@ androidx-compose-animation = { module = "androidx.compose.animation:animation" } androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } -androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" } androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout" } @@ -98,13 +93,11 @@ androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", versi androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-glance-preview = { module = "androidx.glance:glance-preview", version.ref = "glancePreview" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } -androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } 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" } androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle-compose" } -androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" } androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" } androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }