chore(deps): bump dependencies (#11098)

wmontwe · web-flow · commit 23b599c03fd0 · 2026-06-08T14:22:14.000+02:00
diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
diff --git a/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/CatalogScreen.kt b/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/CatalogScreen.kt
@@ -14,7 +14,7 @@ import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeChanged
 import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeVariantChanged
 import net.thunderbird.ui.catalog.ui.CatalogContract.ViewModel
 import net.thunderbird.ui.catalog.ui.common.theme.ThemeSwitch
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun CatalogScreen(
diff --git a/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/atom/CatalogAtomScreen.kt b/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/atom/CatalogAtomScreen.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
 import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun CatalogAtomScreen(
diff --git a/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/molecule/CatalogMoleculeScreen.kt b/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/molecule/CatalogMoleculeScreen.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
 import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun CatalogMoleculeScreen(
diff --git a/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/organism/CatalogOrganismScreen.kt b/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/organism/CatalogOrganismScreen.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
 import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun CatalogOrganismScreen(
diff --git a/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/template/CatalogTemplateScreen.kt b/app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/template/CatalogTemplateScreen.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
 import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun CatalogTemplateScreen(
diff --git a/build-plugin/build.gradle.kts b/build-plugin/build.gradle.kts
@@ -26,10 +26,6 @@ dependencies {
     implementation(project(":plugin"))
 
     compileOnly(libs.android.tools.common)
-
-    // This defines the used Kotlin version for all Plugin dependencies
-    // and ensures that transitive dependencies are aligned on one version.
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:${libs.versions.kotlinGradleBom.get()}"))
 }
 
 kotlin {
diff --git a/feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditIncomingServerSettingsNavHost.kt b/feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditIncomingServerSettingsNavHost.kt
@@ -14,8 +14,8 @@ import app.k9mail.feature.account.server.settings.R
 import app.k9mail.feature.account.server.settings.ui.incoming.IncomingServerSettingsScreen
 import app.k9mail.feature.account.server.validation.ui.IncomingServerValidationViewModel
 import app.k9mail.feature.account.server.validation.ui.ServerValidationScreen
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 private const val NESTED_NAVIGATION_ROUTE_MODIFY = "modify"
diff --git a/feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditOutgoingServerSettingsNavHost.kt b/feature/account/edit/src/main/kotlin/app/k9mail/feature/account/edit/ui/server/settings/EditOutgoingServerSettingsNavHost.kt
@@ -14,8 +14,8 @@ import app.k9mail.feature.account.server.settings.R
 import app.k9mail.feature.account.server.settings.ui.outgoing.OutgoingServerSettingsScreen
 import app.k9mail.feature.account.server.validation.ui.OutgoingServerValidationViewModel
 import app.k9mail.feature.account.server.validation.ui.ServerValidationScreen
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 private const val NESTED_NAVIGATION_ROUTE_MODIFY = "modify"
diff --git a/feature/account/server/certificate/src/main/kotlin/app/k9mail/feature/account/server/certificate/ui/ServerCertificateErrorScreen.kt b/feature/account/server/certificate/src/main/kotlin/app/k9mail/feature/account/server/certificate/ui/ServerCertificateErrorScreen.kt
@@ -30,7 +30,7 @@ import app.k9mail.feature.account.server.certificate.ui.ServerCertificateErrorCo
 import app.k9mail.feature.account.server.certificate.ui.ServerCertificateErrorContract.ViewModel
 import net.thunderbird.core.ui.compose.theme2.MainTheme
 import net.thunderbird.core.ui.contract.mvi.observe
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun ServerCertificateErrorScreen(
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/general/GeneralSettingsScreen.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/general/GeneralSettingsScreen.kt
@@ -11,8 +11,8 @@ import net.thunderbird.feature.account.AccountId
 import net.thunderbird.feature.account.settings.impl.ui.general.GeneralSettingsContract.Effect
 import net.thunderbird.feature.account.settings.impl.ui.general.GeneralSettingsContract.Event
 import net.thunderbird.feature.account.settings.impl.ui.general.GeneralSettingsContract.SettingsBuilder
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/readingMail/ReadingMailSettingsScreen.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/readingMail/ReadingMailSettingsScreen.kt
@@ -11,8 +11,8 @@ import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.core.ui.setting.SettingViewProvider
 import net.thunderbird.feature.account.AccountId
 import net.thunderbird.feature.account.settings.impl.ui.readingMail.ReadingMailSettingsContract.SettingsBuilder
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @SuppressLint("ContextCastToActivity")
diff --git a/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/search/SearchSettingsScreen.kt b/feature/account/settings/impl/src/main/kotlin/net/thunderbird/feature/account/settings/impl/ui/search/SearchSettingsScreen.kt
@@ -9,8 +9,8 @@ import net.thunderbird.core.common.provider.AppNameProvider
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.core.ui.setting.SettingViewProvider
 import net.thunderbird.feature.account.AccountId
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
diff --git a/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/navigation/AccountSetupNavHost.kt b/feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/navigation/AccountSetupNavHost.kt
@@ -26,8 +26,8 @@ import app.k9mail.feature.account.setup.ui.options.sync.SyncOptionsScreen
 import app.k9mail.feature.account.setup.ui.options.sync.SyncOptionsViewModel
 import app.k9mail.feature.account.setup.ui.specialfolders.SpecialFoldersScreen
 import app.k9mail.feature.account.setup.ui.specialfolders.SpecialFoldersViewModel
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 
 const val NESTED_NAVIGATION_AUTO_CONFIG = "autoconfig"
 private const val NESTED_NAVIGATION_INCOMING_SERVER_CONFIG = "incoming-server/config"
diff --git a/feature/changelog/internal/src/main/kotlin/net/thunderbird/feature/changelog/internal/DefaultChangelogNavigation.kt b/feature/changelog/internal/src/main/kotlin/net/thunderbird/feature/changelog/internal/DefaultChangelogNavigation.kt
@@ -6,7 +6,7 @@ import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.core.ui.navigation.deepLinkComposable
 import net.thunderbird.feature.navigation.changelog.api.ChangelogNavigation
 import net.thunderbird.feature.navigation.changelog.api.ChangelogRoute
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 internal class DefaultChangelogNavigation : ChangelogNavigation {
diff --git a/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/featureflag/DebugFeatureFlagSection.kt b/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/featureflag/DebugFeatureFlagSection.kt
@@ -39,7 +39,7 @@ import net.thunderbird.core.ui.compose.theme2.MainTheme
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.feature.debug.settings.R
 import net.thunderbird.feature.debug.settings.navigation.SecretDebugSettingsRoute
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun DebugFeatureFlagSection(
diff --git a/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/notification/DebugNotificationSection.kt b/feature/debug-settings/src/main/kotlin/net/thunderbird/feature/debug/settings/notification/DebugNotificationSection.kt
@@ -31,7 +31,7 @@ import net.thunderbird.feature.debug.settings.notification.DebugNotificationSect
 import net.thunderbird.feature.mail.account.api.BaseAccount
 import net.thunderbird.feature.notification.api.content.MailNotification
 import net.thunderbird.feature.notification.api.content.Notification
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 private const val UUID_MAX_CHAR_DISPLAY = 4
 
diff --git a/feature/funding/googleplay/src/main/kotlin/net/thunderbird/feature/funding/googleplay/ui/contribution/ContributionScreen.kt b/feature/funding/googleplay/src/main/kotlin/net/thunderbird/feature/funding/googleplay/ui/contribution/ContributionScreen.kt
@@ -17,7 +17,7 @@ import net.thunderbird.feature.funding.googleplay.domain.entity.ContributionId
 import net.thunderbird.feature.funding.googleplay.ui.contribution.ContributionContract.Effect
 import net.thunderbird.feature.funding.googleplay.ui.contribution.ContributionContract.Event
 import net.thunderbird.feature.funding.googleplay.ui.contribution.ContributionContract.ViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 import net.thunderbird.feature.funding.googleplay.ui.contribution.purchase.PurchaseSliceContract.Event as PurchaseEvent
 
 @Composable
diff --git a/feature/mail/message/list/api/src/main/kotlin/net/thunderbird/feature/mail/message/list/ui/MessageListContract.kt b/feature/mail/message/list/api/src/main/kotlin/net/thunderbird/feature/mail/message/list/ui/MessageListContract.kt
@@ -16,7 +16,7 @@ import net.thunderbird.feature.mail.message.list.ui.legacy.LegacyMessageListBrid
 import net.thunderbird.feature.mail.message.list.ui.state.MessageListState
 import net.thunderbird.feature.mail.message.list.ui.state.sideeffect.MessageListStateSideEffectHandlerFactory
 import net.thunderbird.feature.notification.api.content.InAppNotification
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 /**
  * Defines the contract between the View and the ViewModel for the message list screen.
diff --git a/feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/dialog/SetupArchiveFolderDialog.kt b/feature/mail/message/list/internal/src/main/kotlin/net/thunderbird/feature/mail/message/list/internal/ui/dialog/SetupArchiveFolderDialog.kt
@@ -29,7 +29,7 @@ import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDia
 import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract.Event
 import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract.State
 import net.thunderbird.feature.mail.message.list.ui.dialog.SetupArchiveFolderDialogContract.ViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 
 @Composable
diff --git a/feature/migration/qrcode/src/main/kotlin/app/k9mail/feature/migration/qrcode/ui/QrCodeScannerScreen.kt b/feature/migration/qrcode/src/main/kotlin/app/k9mail/feature/migration/qrcode/ui/QrCodeScannerScreen.kt
@@ -16,7 +16,7 @@ import app.k9mail.feature.migration.qrcode.ui.QrCodeScannerContract.Effect
 import app.k9mail.feature.migration.qrcode.ui.QrCodeScannerContract.Event
 import net.thunderbird.core.logging.legacy.Log
 import net.thunderbird.core.ui.contract.mvi.observe
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 internal fun QrCodeScannerScreen(
diff --git a/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt b/feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerView.kt
@@ -7,7 +7,7 @@ import net.thunderbird.feature.navigation.drawer.dropdown.FolderDrawerState
 import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.Effect
 import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.Event
 import net.thunderbird.feature.navigation.drawer.dropdown.ui.DrawerContract.ViewModel
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Suppress("LongParameterList")
 @Composable
diff --git a/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt b/feature/onboarding/permissions/src/main/kotlin/app/k9mail/feature/onboarding/permissions/ui/PermissionsScreen.kt
@@ -12,8 +12,8 @@ import app.k9mail.feature.onboarding.permissions.ui.PermissionsContract.Effect
 import app.k9mail.feature.onboarding.permissions.ui.PermissionsContract.Event
 import net.thunderbird.core.common.provider.BrandNameProvider
 import net.thunderbird.core.ui.contract.mvi.observe
-import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun PermissionsScreen(
diff --git a/feature/thundermail/internal/common/src/main/kotlin/net/thunderbird/feature/thundermail/internal/common/ui/ThundermailOAuthRedirectScreen.kt b/feature/thundermail/internal/common/src/main/kotlin/net/thunderbird/feature/thundermail/internal/common/ui/ThundermailOAuthRedirectScreen.kt
@@ -30,7 +30,7 @@ import net.thunderbird.core.ui.compose.theme2.MainTheme
 import net.thunderbird.core.ui.contract.mvi.observe
 import net.thunderbird.feature.thundermail.internal.common.R
 import net.thunderbird.feature.thundermail.navigation.ThundermailRoute
-import org.koin.androidx.compose.koinViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 internal fun ThundermailOAuthRedirectScreen(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,31 +13,31 @@
 [versions]
 androidBilling = "7.1.1"
 androidDesugar = "2.1.5"
-androidMaterial = "1.13.0"
+androidMaterial = "1.14.0"
 # AGP and tools should be updated together.
 # Also, make sure AGP version is compatible with both AS and IntelliJ IDEA.
-androidGradlePlugin = "9.1.0"
-androidTools = "32.1.0"
-androidxActivity = "1.12.2"
-androidxAnnotation = "1.9.1"
+androidGradlePlugin = "9.2.1"
+androidTools = "32.2.1"
+androidxActivity = "1.13.0"
+androidxAnnotation = "1.10.0"
 androidxAppCompat = "1.7.1"
 androidxAutofill = "1.3.0"
 androidxBiometric = "1.1.0"
-androidxCamera = "1.5.2"
+androidxCamera = "1.6.1"
 # https://developer.android.com/jetpack/compose/bom/bom-mapping
-androidxComposeBom = "2026.01.00"
+androidxComposeBom = "2026.05.01"
 androidxConstraintLayout = "2.2.1"
 androidxCoordinatorLayout = "1.3.0"
-androidxCore = "1.17.0"
+androidxCore = "1.18.0"
 androidxCoreSplashscreen = "1.2.0"
-androidxDatastore = "1.2.0"
+androidxDatastore = "1.2.1"
 androidxFragment = "1.8.9"
 androidxGlance = "1.1.1"
 androidxGlanceMaterial3 = "1.1.1"
-androidxGraphicsPath = "1.1.0-alpha01"
+androidxGraphicsPath = "1.1.0"
 androidxLifecycle = "2.10.0"
 androidxLocalBroadcastManager = "1.1.0"
-androidxNavigation = "2.9.7"
+androidxNavigation = "2.9.8"
 androidxRecyclerView = "1.4.0"
 androidxPreference = "1.2.1"
 # Pinning on 1.1.0: The 1.2.0 caused the Message List RecyclerView
@@ -51,14 +51,14 @@ androidxTestExt = "1.3.0"
 androidxTestRules = "1.7.0"
 androidxTestRunner = "1.7.0"
 androidxWebkit = "1.15.0"
-androidxWindow = "1.3.0"
-androidxWork = "2.11.0"
+androidxWindow = "1.5.1"
+androidxWork = "2.11.2"
 apacheHttpclient5 = "5.6.1"
 appAuth = "0.11.1"
 assertk = "0.28.1"
 circleImageView = "3.1.0"
 ckchangelog = "2.0.0-beta02"
-clikt = "5.0.3"
+clikt = "5.1.0"
 commonsIo = "2.22.0"
 dependencyCheckPlugin = "0.54.0"
 dependencyGuardPlugin = "0.5.0"
@@ -73,7 +73,7 @@ icu4j = "78.3"
 javaDiffUtils = "4.17"
 jcipAnnotations = "1.0"
 jetbrainsAnnotations = "26.1.0"
-jetbrainsCompose = "1.11.0"
+jetbrainsCompose = "1.11.1"
 jetbrainsComposeLifecycle = "2.10.0"
 jetbrainsComposeMaterial3 = "1.9.0"
 jetbrainsComposeNavigation = "2.9.2"
@@ -87,11 +87,7 @@ jutf7 = "1.0.0"
 jzlib = "1.0.7"
 koinBom = "4.2.1"
 konsist = "0.17.3"
-kotlinBom = "2.3.21"
-# Needs to match the version used by Gradle, just check with `./gradlew --version`
-# In case Gradle has a newer version of Kotlin, we need to update kotlinBom to the same version of newer to avoid
-# version conflicts with the Gradle Kotlin plugin.
-kotlinGradleBom = "2.3.20"
+kotlinBom = "2.4.0"
 kotlinKsp = "2.3.9"
 kotlinxCoroutines = "1.11.0"
 kotlinxCollectionsImmutable = "0.4.0"
@@ -102,14 +98,14 @@ kover = "0.9.8"
 ktlint = "1.5.0"
 ktor = "3.5.0"
 kxml2 = "1.0"
-landscapist = "2.9.5"
+landscapist = "2.9.8"
 leakcanary = "2.14"
 logbackClassic = "1.5.33"
 mime4j = "0.8.14"
 minidns = "1.1.1"
 mockito = "5.23.0"
 mockitoKotlin = "6.3.0"
-mokkery = "3.3.0"
+mokkery = "3.4.0"
 moshi = "1.15.2"
 mozillaAndroidComponents = "145.0.1"
 okhttp = "5.3.2"
@@ -265,8 +261,9 @@ jutf7 = { module = "com.beetstra.jutf7:jutf7", version.ref = "jutf7" }
 jzlib = { module = "com.jcraft:jzlib", version.ref = "jzlib" }
 koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koinBom" }
 koin-core = { module = "io.insert-koin:koin-core" }
+koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" }
+koin-compose = { module = "io.insert-koin:koin-compose" }
 koin-android = { module = "io.insert-koin:koin-android" }
-koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose" }
 koin-test = { module = "io.insert-koin:koin-test" }
 koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4" }
 konsist = { module = "com.lemonappdev:konsist", version.ref = "konsist" }
@@ -336,7 +333,8 @@ shared-kmp-compose-common = [
   #  "jetbrains-compose-navigation-event",
 ]
 shared-kmp-compose-android = [
-  "koin-androidx-compose",
+  "koin-compose",
+  "koin-compose-viewmodel",
 ]
 shared-kmp-common-test = [
   "assertk",
@@ -371,7 +369,8 @@ shared-jvm-android-compose = [
   "androidx-lifecycle-runtime-compose",
   "androidx-lifecycle-viewmodel-compose",
   "androidx-navigation-compose",
-  "koin-androidx-compose",
+  "koin-compose",
+  "koin-compose-viewmodel",
   "kotlinx-collections-immutable",
   "kotlinx-serialization-json",
   "jetbrains-compose-components-resources"
