diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt index 6328a0eba6..8c4db45bec 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -31,14 +31,12 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.lazy.LazyColumn @@ -386,10 +384,7 @@ private fun HomeScreen( val coroutineScope = rememberCoroutineScope() val snackbarHostState = remember { SnackbarHostState() } HomeScreenBackground( - modifier = modifier - .windowInsetsPadding( - WindowInsets.systemBars.only(WindowInsetsSides.Horizontal) - ) + modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars) ) { Scaffold( topBar = { diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index 3346af23e4..9008507cfa 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -41,6 +41,7 @@ import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack @@ -55,6 +56,7 @@ import androidx.compose.material.icons.rounded.PlayCircleFilled import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider import androidx.compose.material3.Surface @@ -73,11 +75,13 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.role import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Devices import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.core.text.HtmlCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.window.core.layout.WindowSizeClass import androidx.window.core.layout.WindowWidthSizeClass @@ -486,19 +490,16 @@ private fun PlayerContentBookStart( .fillMaxSize() .verticalScroll(rememberScrollState()) .padding( - vertical = 8.dp, + vertical = 40.dp, horizontal = 16.dp ), horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.SpaceAround ) { - Spacer(modifier = Modifier.height(32.dp)) PodcastInformation( - episode.title, - episode.podcastName, - episode.summary + title = episode.title, + name = episode.podcastName, + summary = episode.summary, ) - Spacer(modifier = Modifier.height(32.dp)) } } @@ -618,12 +619,14 @@ private fun PodcastInformation( title: String, name: String, summary: String, + modifier: Modifier = Modifier, titleTextStyle: TextStyle = MaterialTheme.typography.headlineSmall, nameTextStyle: TextStyle = MaterialTheme.typography.displaySmall, ) { Column( + modifier = modifier.padding(horizontal = 8.dp), + verticalArrangement = Arrangement.spacedBy(32.dp), horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.padding(horizontal = 8.dp) ) { Text( text = name, @@ -631,19 +634,17 @@ private fun PodcastInformation( maxLines = 1, overflow = TextOverflow.Ellipsis ) - Spacer(modifier = Modifier.height(32.dp)) Text( text = title, style = titleTextStyle, maxLines = 1, overflow = TextOverflow.Ellipsis ) - Spacer(modifier = Modifier.height(32.dp)) - Text( + HtmlText( text = summary, style = MaterialTheme.typography.bodyMedium, + color = LocalContentColor.current ) - Spacer(modifier = Modifier.weight(1f)) } } @@ -776,6 +777,25 @@ private fun FullScreenLoading(modifier: Modifier = Modifier) { } } +@Composable +private fun HtmlText( + text: String, + style: TextStyle, + color: Color +) { + val annotationString = buildAnnotatedString { + val htmlCompat = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT) + append(htmlCompat) + } + SelectionContainer { + Text( + text = annotationString, + style = style, + color = color + ) + } +} + @Preview @Composable fun TopAppBarPreview() { diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index a3e9811f80..9e2e8a8c9a 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -9,10 +9,10 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.3" androidx-benchmark-junit4 = "1.2.3" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-compose-material3-adaptive = "1.0.0-alpha10" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-runtime = "2.7.0" androidx-lifecycle-compose = "2.7.0" @@ -25,7 +25,7 @@ androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" androidx-tv-foundation = "1.0.0-alpha10" androidx-tv-material = "1.0.0-alpha10" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.2.0" androix-test-uiautomator = "2.3.0" coil = "2.5.0" @@ -49,7 +49,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.12.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.1" secrets = "2.0.1" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 06b1280815..aa1910385a 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -121,4 +121,5 @@ dependencies { androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.kotlinx.coroutines.test) androidTestImplementation(libs.androidx.compose.ui.test) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) } diff --git a/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt b/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt index 0a869527ef..646a3d6a4f 100644 --- a/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt +++ b/Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt @@ -20,9 +20,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createAndroidComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import com.example.jetsnack.ui.JetsnackApp import com.example.jetsnack.ui.MainActivity -import org.junit.Before import org.junit.Rule import org.junit.Test @@ -31,13 +29,6 @@ class AppTest { @get:Rule val composeTestRule = createAndroidComposeRule() - @Before - fun setUp() { - composeTestRule.setContent { - JetsnackApp() - } - } - @Test fun app_launches() { // Check app launches at the correct destination diff --git a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Theme.kt b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Theme.kt index b54a5f3c73..75558ecc7a 100644 --- a/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Theme.kt +++ b/Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Theme.kt @@ -21,11 +21,7 @@ import androidx.compose.material.Colors import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.runtime.Stable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue +import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color @@ -107,169 +103,44 @@ object JetsnackTheme { /** * Jetsnack custom Color Palette */ -@Stable -class JetsnackColors( - gradient6_1: List, - gradient6_2: List, - gradient3_1: List, - gradient3_2: List, - gradient2_1: List, - gradient2_2: List, - gradient2_3: List, - brand: Color, - brandSecondary: Color, - uiBackground: Color, - uiBorder: Color, - uiFloated: Color, - interactivePrimary: List = gradient2_1, - interactiveSecondary: List = gradient2_2, - interactiveMask: List = gradient6_1, - textPrimary: Color = brand, - textSecondary: Color, - textHelp: Color, - textInteractive: Color, - textLink: Color, - tornado1: List, - iconPrimary: Color = brand, - iconSecondary: Color, - iconInteractive: Color, - iconInteractiveInactive: Color, - error: Color, - notificationBadge: Color = error, - isDark: Boolean -) { - var gradient6_1 by mutableStateOf(gradient6_1) - private set - var gradient6_2 by mutableStateOf(gradient6_2) - private set - var gradient3_1 by mutableStateOf(gradient3_1) - private set - var gradient3_2 by mutableStateOf(gradient3_2) - private set - var gradient2_1 by mutableStateOf(gradient2_1) - private set - var gradient2_2 by mutableStateOf(gradient2_2) - private set - var gradient2_3 by mutableStateOf(gradient2_3) - private set - var brand by mutableStateOf(brand) - private set - var brandSecondary by mutableStateOf(brandSecondary) - private set - var uiBackground by mutableStateOf(uiBackground) - private set - var uiBorder by mutableStateOf(uiBorder) - private set - var uiFloated by mutableStateOf(uiFloated) - private set - var interactivePrimary by mutableStateOf(interactivePrimary) - private set - var interactiveSecondary by mutableStateOf(interactiveSecondary) - private set - var interactiveMask by mutableStateOf(interactiveMask) - private set - var textPrimary by mutableStateOf(textPrimary) - private set - var textSecondary by mutableStateOf(textSecondary) - private set - var textHelp by mutableStateOf(textHelp) - private set - var textInteractive by mutableStateOf(textInteractive) - private set - var tornado1 by mutableStateOf(tornado1) - private set - var textLink by mutableStateOf(textLink) - private set - var iconPrimary by mutableStateOf(iconPrimary) - private set - var iconSecondary by mutableStateOf(iconSecondary) - private set - var iconInteractive by mutableStateOf(iconInteractive) - private set - var iconInteractiveInactive by mutableStateOf(iconInteractiveInactive) - private set - var error by mutableStateOf(error) - private set - var notificationBadge by mutableStateOf(notificationBadge) - private set - var isDark by mutableStateOf(isDark) - private set - - fun update(other: JetsnackColors) { - gradient6_1 = other.gradient6_1 - gradient6_2 = other.gradient6_2 - gradient3_1 = other.gradient3_1 - gradient3_2 = other.gradient3_2 - gradient2_1 = other.gradient2_1 - gradient2_2 = other.gradient2_2 - gradient2_3 = other.gradient2_3 - brand = other.brand - brandSecondary = other.brandSecondary - uiBackground = other.uiBackground - uiBorder = other.uiBorder - uiFloated = other.uiFloated - interactivePrimary = other.interactivePrimary - interactiveSecondary = other.interactiveSecondary - interactiveMask = other.interactiveMask - textPrimary = other.textPrimary - textSecondary = other.textSecondary - textHelp = other.textHelp - textInteractive = other.textInteractive - textLink = other.textLink - tornado1 = other.tornado1 - iconPrimary = other.iconPrimary - iconSecondary = other.iconSecondary - iconInteractive = other.iconInteractive - iconInteractiveInactive = other.iconInteractiveInactive - error = other.error - notificationBadge = other.notificationBadge - isDark = other.isDark - } - - fun copy(): JetsnackColors = JetsnackColors( - gradient6_1 = gradient6_1, - gradient6_2 = gradient6_2, - gradient3_1 = gradient3_1, - gradient3_2 = gradient3_2, - gradient2_1 = gradient2_1, - gradient2_2 = gradient2_2, - gradient2_3 = gradient2_3, - brand = brand, - brandSecondary = brandSecondary, - uiBackground = uiBackground, - uiBorder = uiBorder, - uiFloated = uiFloated, - interactivePrimary = interactivePrimary, - interactiveSecondary = interactiveSecondary, - interactiveMask = interactiveMask, - textPrimary = textPrimary, - textSecondary = textSecondary, - textHelp = textHelp, - textInteractive = textInteractive, - textLink = textLink, - tornado1 = tornado1, - iconPrimary = iconPrimary, - iconSecondary = iconSecondary, - iconInteractive = iconInteractive, - iconInteractiveInactive = iconInteractiveInactive, - error = error, - notificationBadge = notificationBadge, - isDark = isDark, - ) -} +@Immutable +data class JetsnackColors( + val gradient6_1: List, + val gradient6_2: List, + val gradient3_1: List, + val gradient3_2: List, + val gradient2_1: List, + val gradient2_2: List, + val gradient2_3: List, + val brand: Color, + val brandSecondary: Color, + val uiBackground: Color, + val uiBorder: Color, + val uiFloated: Color, + val interactivePrimary: List = gradient2_1, + val interactiveSecondary: List = gradient2_2, + val interactiveMask: List = gradient6_1, + val textPrimary: Color = brand, + val textSecondary: Color, + val textHelp: Color, + val textInteractive: Color, + val textLink: Color, + val tornado1: List, + val iconPrimary: Color = brand, + val iconSecondary: Color, + val iconInteractive: Color, + val iconInteractiveInactive: Color, + val error: Color, + val notificationBadge: Color = error, + val isDark: Boolean +) @Composable fun ProvideJetsnackColors( colors: JetsnackColors, content: @Composable () -> Unit ) { - val colorPalette = remember { - // Explicitly creating a new object here so we don't mutate the initial [colors] - // provided, and overwrite the values set in it. - colors.copy() - } - colorPalette.update(colors) - CompositionLocalProvider(LocalJetsnackColors provides colorPalette, content = content) + CompositionLocalProvider(LocalJetsnackColors provides colors, content = content) } private val LocalJetsnackColors = staticCompositionLocalOf { diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index b64620cd5c..4231a34163 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-beta01" +androidx-corektx = "1.13.0-rc01" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" @@ -21,7 +21,7 @@ androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.3.0-alpha03" +androidx-window = "1.3.0-beta01" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -45,7 +45,7 @@ material = "1.11.0" # @keep minSdk = "21" okhttp = "4.11.0" -robolectric = "4.11.1" +robolectric = "4.12.1" rome = "1.18.0" room = "2.6.0" secrets = "2.0.1"