From 3fd93b25896422c5152ad9a533e49c03c34dd6f2 Mon Sep 17 00:00:00 2001 From: Brian Yencho Date: Wed, 20 Dec 2023 14:18:05 -0600 Subject: [PATCH] Update various dependencies to latest versions (#426) --- .../ui/platform/base/FakeNavHostController.kt | 9 ++++++++ gradle/libs.versions.toml | 22 +++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/FakeNavHostController.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/FakeNavHostController.kt index fee68d66d7..b96f406d31 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/FakeNavHostController.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/base/FakeNavHostController.kt @@ -10,9 +10,11 @@ import androidx.navigation.NavHostController import androidx.navigation.NavOptions import androidx.navigation.Navigator import androidx.navigation.NavigatorProvider +import androidx.navigation.NavigatorState import androidx.navigation.compose.ComposeNavigator import io.mockk.every import io.mockk.mockk +import kotlinx.coroutines.flow.MutableStateFlow import org.junit.Assert.assertEquals /** @@ -40,6 +42,13 @@ class FakeNavHostController : NavHostController(context = mockk()) { init { navigatorProvider = TestNavigatorProvider() navigatorProvider.addNavigator(ComposeNavigator()) + + val state = mockk(relaxed = true) { + every { backStack } returns MutableStateFlow(emptyList()) + } + navigatorProvider.navigators.forEach { (_, navigator) -> + navigator.onAttach(state) + } } /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 14e7a48503..155d4f9397 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,36 +9,36 @@ minSdk = "28" # Dependency Versions accompanist = "0.30.1" androidGradlePlugin = "8.2.0" -androidxActivity = "1.8.0" -androidxBrowser = "1.6.0" +androidxActivity = "1.8.2" +androidxBrowser = "1.7.0" androidxComposeBom = "2023.10.01" # TODO: Once the Material3 color scheme changes are no longer in alpha, we should remove this # individual dependency version and use the Compose BOM version (BIT-702). -androidxComposeMaterial3 = "1.2.0-alpha12" +androidxComposeMaterial3 = "1.2.0-beta01" androidxCore = "1.12.0" androidxHiltNavigationCompose = "1.1.0" androidxLifecycle = "2.6.2" -androidxNavigation = "2.7.4" -androidxRoom = "2.6.0" +androidxNavigation = "2.7.6" +androidxRoom = "2.6.1" androidxSplash = "1.1.0-alpha02" # Once the app and SDK reach a critical point of completeness we should begin fixing the version # here (BIT-311). bitwardenSdk = "0.3.1-20231219.150921-55" detekt = "1.23.1" -firebaseBom = "32.5.0" +firebaseBom = "32.7.0" glide = "1.0.0-beta01" -hilt = "2.47" +hilt = "2.48" junit5 = "5.8.2" jvmTarget = "1.8" -kotlin = "1.9.10" -kotlinCompilerExtensionVersion = "1.5.3" +kotlin = "1.9.21" +kotlinCompilerExtensionVersion = "1.5.7" kotlinxCollectionsImmutable = "0.3.6" kotlinxCoroutines = "1.7.3" kotlinxSerialization = "1.5.1" kotlinxKover = "0.7.3" -ksp = "1.9.10-1.0.13" +ksp = "1.9.21-1.0.16" mockk = "1.13.5" -okhttp = "4.11.0" +okhttp = "4.12.0" retrofit = "2.9.0" retrofitKotlinxSerialization = "1.0.0" roboelectric = "4.10.3"