diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 374c518040..5128f3562b 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,17 +31,17 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" hilt = "2.51.1" hiltExt = "1.2.0" -horologist = "0.6.20" +horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt index adab7e487b..4a742055e2 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt @@ -27,7 +27,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon -import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement +import androidx.compose.material3.LocalMinimumInteractiveComponentSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ScrollableTabRow import androidx.compose.material3.Surface @@ -39,6 +39,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.example.jetcaster.R import com.example.jetcaster.core.model.CategoryInfo @@ -162,7 +163,7 @@ private fun ChoiceChipContent( // When adding onClick to Surface, it automatically makes this item higher. // On the other hand, adding .clickable modifier, doesn't use the same shape as Surface. // This way we disable the minimum height requirement - CompositionLocalProvider(value = LocalMinimumInteractiveComponentEnforcement provides false) { + CompositionLocalProvider(value = LocalMinimumInteractiveComponentSize provides Dp.Unspecified) { Surface( color = when { selected -> MaterialTheme.colorScheme.secondaryContainer diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt index 46fabe361a..bff7e5e4b4 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt @@ -16,7 +16,6 @@ package com.example.jetcaster.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme @@ -26,12 +25,8 @@ import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable -import androidx.compose.runtime.SideEffect import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat import com.example.jetcaster.designsystem.theme.JetcasterShapes import com.example.jetcaster.designsystem.theme.JetcasterTypography import com.example.jetcaster.designsystem.theme.backgroundDark @@ -501,14 +496,6 @@ fun JetcasterTheme( darkTheme -> darkScheme else -> lightScheme } - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = Color.Transparent.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme - } - } MaterialTheme( colorScheme = colorScheme, diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle index b8803bbdde..4b10f6f8e8 100644 --- a/Jetcaster/wear/build.gradle +++ b/Jetcaster/wear/build.gradle @@ -23,7 +23,7 @@ plugins { } android { - compileSdk 34 + compileSdk 35 namespace "com.example.jetcaster" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index c9043348c6..5128f3562b 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -4,20 +4,20 @@ ##### [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.0" -androidx-activity-compose = "1.9.2" +androidGradlePlugin = "8.7.2" +androidx-activity-compose = "1.9.3" androidx-appcompat = "1.7.0" androidx-benchmark = "1.2.4" androidx-benchmark-junit4 = "1.2.4" -androidx-compose-bom = "2024.09.03" +androidx-compose-bom = "2024.10.01" androidx-constraintlayout = "1.1.0-alpha13" androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.13.1" +androidx-corektx = "1.15.0" androidx-glance = "1.1.0" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.8.6" -androidx-lifecycle-runtime-compose = "2.8.6" -androidx-navigation = "2.8.2" +androidx-lifecycle-compose = "2.8.7" +androidx-lifecycle-runtime-compose = "2.8.7" +androidx-navigation = "2.8.3" androidx-palette = "1.0.0" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" @@ -31,7 +31,7 @@ androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.6.0" # @keep -compileSdk = "34" +compileSdk = "35" coroutines = "1.9.0" google-maps = "18.2.0" gradle-versions = "0.51.0" @@ -41,7 +41,7 @@ horologist = "0.6.19" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.2.2" junit = "4.13.2" -kotlin = "2.0.20" +kotlin = "2.0.21" kotlinx-serialization-json = "1.7.3" kotlinx_immutable = "0.3.8" ksp = "2.0.20-1.0.24" @@ -57,7 +57,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.4" +version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }