Upgrade koin version to 3.4.1 and koin-compose library

Co-authored-by: Albin <albin@mullvad.net>

6 files changed, 115 insertions, 67 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index d6b59b6a2d..5933093223 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -218,10 +218,8 @@ dependencies {
     implementation(Dependencies.Compose.uiUtil)
     implementation(Dependencies.jodaTime)
     implementation(Dependencies.Koin.core)
-    implementation(Dependencies.Koin.coreExt)
-    implementation(Dependencies.Koin.androidXFragment)
-    implementation(Dependencies.Koin.androidXScope)
-    implementation(Dependencies.Koin.androidXViewmodel)
+    implementation(Dependencies.Koin.android)
+    implementation(Dependencies.Koin.compose)
     implementation(Dependencies.Kotlin.reflect)
     implementation(Dependencies.Kotlin.stdlib)
     implementation(Dependencies.KotlinX.coroutinesAndroid)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt
index 7f895618fb..4b7d989444 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionContainer.kt
@@ -7,7 +7,6 @@ import android.util.Log
 import net.mullvad.mullvadvpn.ipc.DispatchingHandler
 import net.mullvad.mullvadvpn.ipc.Event
 import net.mullvad.mullvadvpn.ipc.Request
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
@@ -15,7 +14,6 @@ import org.koin.core.component.get
 //
 // The properties of this class can be used to send events to the service, to listen for events from
 // the service and to get values received from events.
-@OptIn(KoinApiExtension::class)
 class ServiceConnectionContainer(
     val connection: Messenger,
     onServiceReady: (ServiceConnectionContainer) -> Unit,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt
index 519fefb180..43a8a58fbe 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ApplicationImageView.kt
@@ -15,11 +15,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.applist.ApplicationsIconManager
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
-@OptIn(KoinApiExtension::class)
 class ApplicationImageView
 @JvmOverloads
 constructor(
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index de1be2d9b7..f0ca83c629 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -66,10 +66,8 @@ object Dependencies {
 
     object Koin {
         const val core = "io.insert-koin:koin-core:${Versions.koin}"
-        const val coreExt = "io.insert-koin:koin-core-ext:${Versions.koin}"
-        const val androidXFragment = "io.insert-koin:koin-androidx-fragment:${Versions.koin}"
-        const val androidXScope = "io.insert-koin:koin-androidx-scope:${Versions.koin}"
-        const val androidXViewmodel = "io.insert-koin:koin-androidx-viewmodel:${Versions.koin}"
+        const val android = "io.insert-koin:koin-android:${Versions.koin}"
+        const val compose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
         const val test = "io.insert-koin:koin-test:${Versions.koin}"
     }
 
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index a259148dc2..84663674ec 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -3,7 +3,7 @@ object Versions {
     const val jodaTime = "2.12.5"
     const val junit = "4.13.2"
     const val jvmTarget = "1.8"
-    const val koin = "2.2.3"
+    const val koin = "3.4.1"
     const val kotlin = "1.8.21"
     const val kotlinCompilerExtensionVersion = "1.4.7"
     const val kotlinx = "1.7.1"
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index 6f5ced0f48..c660e58de9 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -44,13 +44,18 @@
          </artifact>
       </component>
       <component group="androidx.activity" name="activity" version="1.6.0">
-         <artifact name="activity-1.6.0.aar">
-            <sha256 value="7f08723ecabefba616d60c714b0e9a31301bd4d0792fcc7946c1479c57fd2d28" origin="Generated by Gradle"/>
-         </artifact>
          <artifact name="activity-1.6.0.module">
             <sha256 value="b561e41c1bddb2160f79b9bc7541ad9ed110147ab2ccf63719a23d498470b043" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity" version="1.6.1">
+         <artifact name="activity-1.6.1.aar">
+            <sha256 value="46d9c0e7547ac7276853366a590f891db2a86863387c0738cf1f11731dc8fd7e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-1.6.1.module">
+            <sha256 value="536ab6630c9abbd61d527788af0ae76a8500db6536252512cac3b529d84d2e3a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity" version="1.7.0">
          <artifact name="activity-1.7.0.aar">
             <sha256 value="e44b2032273387156982912c591ef7e2dd485ba0b2e689b528b5a42f271a4f27" origin="Generated by Gradle"/>
@@ -59,6 +64,14 @@
             <sha256 value="2a746b0126a8ab2f576e7167f1a785b452ef7ee997abd979ee0c5a29c36f6ea6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-compose" version="1.5.1">
+         <artifact name="activity-compose-1.5.1.aar">
+            <sha256 value="8374138f15251cc3ed375425599e94a36038c05cf877f877281ae019b95b844a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-compose-1.5.1.module">
+            <sha256 value="10a44d247a4555af19e3bb8e06b5f24c4ed72252c5feace8de244a35ece256f7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-compose" version="1.7.0">
          <artifact name="activity-compose-1.7.0.aar">
             <sha256 value="caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd" origin="Generated by Gradle"/>
@@ -75,6 +88,14 @@
             <sha256 value="890eb6f3aa3d119236b4c96ec6b1beb647c296a4d99ca7e4a500a164a95ca2cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-ktx" version="1.6.1">
+         <artifact name="activity-ktx-1.6.1.aar">
+            <sha256 value="0561745b3ddce53db491221b2b0cd3a44cadfb091b85e7831fd8be344f117d6e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-ktx-1.6.1.module">
+            <sha256 value="eb2f3862d2073c395a5037fb3284de6073b7824df27c7ac934502d6a5ecfcdfa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-ktx" version="1.7.0">
          <artifact name="activity-ktx-1.7.0.aar">
             <sha256 value="fce317d61a22f12967b475bfcb80c89dda66e418975e890ea703cb74e12b5b11" origin="Generated by Gradle"/>
@@ -690,11 +711,6 @@
             <sha256 value="1beb0b9fffb630a005deca1d3583d2acbec8685d6de809a3a6e0e433f418b6c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-extensions" version="2.2.0">
-         <artifact name="lifecycle-extensions-2.2.0.aar">
-            <sha256 value="648c8de1d10b025d524a2e46ac994fc3f6bf186826c09ec1a62d250bf1b877ae" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.0.0">
          <artifact name="lifecycle-livedata-2.0.0.aar">
             <sha256 value="c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39" origin="Generated by Gradle"/>
@@ -878,6 +894,46 @@
             <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.navigation" name="navigation-common" version="2.5.2">
+         <artifact name="navigation-common-2.5.2.aar">
+            <sha256 value="2147409f1ef55bf0d7147ab0fd49e3d8ca4bb3d52ad7c621b5968ff51defdc89" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-common-2.5.2.module">
+            <sha256 value="7474fb56ad8cbf06f1e9047533934c0ca7b311092035cd78ee5e7966f34749cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-common-ktx" version="2.5.2">
+         <artifact name="navigation-common-ktx-2.5.2.aar">
+            <sha256 value="cb24d6496077f87043d8ee489a5e10d240ce0604aeeeb22398fd3fca0caa3e84" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-common-ktx-2.5.2.module">
+            <sha256 value="aa1a95e4cc7ba1199b3eee1034a30f067578823a0a8ff60dcc305d12fd4508ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-compose" version="2.5.2">
+         <artifact name="navigation-compose-2.5.2.aar">
+            <sha256 value="5a57c79baaa6f317f55700ef39aae8a412f8fc6b2239913ee2fdc876af1f409a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-compose-2.5.2.module">
+            <sha256 value="ad56713b97a68c72e8ab4c6e33007012898ad2a301588326d76bd39afc02bf4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-runtime" version="2.5.2">
+         <artifact name="navigation-runtime-2.5.2.aar">
+            <sha256 value="63c72f79209263a59428ac088a6c09af81e1e451ed58127ad2778ca5e30ec60a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-runtime-2.5.2.module">
+            <sha256 value="f47d9520434ad098fc16c87cb23a75573786899cf62059ba6dafce96980f5489" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-runtime-ktx" version="2.5.2">
+         <artifact name="navigation-runtime-ktx-2.5.2.aar">
+            <sha256 value="af6e0a152cc5dc80b12d69e4bb0ee8aa6dfd3aae50e98a974fa50a8c6b2ba9a2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-runtime-ktx-2.5.2.module">
+            <sha256 value="d4186b87776ea8705961e436c5cdbfc811d21b8c5486bc6b5172f35646356c42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.print" name="print" version="1.0.0">
          <artifact name="print-1.0.0.aar">
             <sha256 value="1d5c7f3135a1bba661fc373fd72e11eb0a4adbb3396787826dd8e4190d5d9edd" origin="Generated by Gradle"/>
@@ -1092,6 +1148,22 @@
             <sha256 value="22c5265cbeb733aed74b3d02c9d91864b81fb6af3dc4b7104abd9c2bf978bb03" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="co.touchlab" name="stately-common" version="1.2.2">
+         <artifact name="stately-common-1.2.2.module">
+            <sha256 value="9f808356208b0e9ba0f1c0b017983666b12007329f6866c8ce96c7f7550ab161" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="stately-common-metadata-1.2.2.jar">
+            <sha256 value="2c2ada2446d8fb8b7b2e3052f31cea5cb8f9a7eaef12e4b352ab4a4356b87e71" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="co.touchlab" name="stately-concurrency" version="1.2.2">
+         <artifact name="stately-concurrency-1.2.2.module">
+            <sha256 value="99e352684b777010fc5d9cae7b5757b05725824c580eda34787068392559a6a8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="stately-concurrency-metadata-1.2.2.jar">
+            <sha256 value="34813438ae79db84f4459c19f440ef3346ee141bab671aed874d22c1c4bd4f88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android" name="signflinger" version="7.4.2">
          <artifact name="signflinger-7.4.2.jar">
             <sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
@@ -2175,68 +2247,52 @@
             <sha256 value="c85782e20da6eadbf07537f35d52bf2abafd891ae14c27b7d36a4d450575eeb3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-android" version="2.2.3">
-         <artifact name="koin-android-2.2.3.aar">
-            <sha256 value="ce746a432cc3ac053bb66a7b78ecab743daca0aaa6357d2f11fd548f0591be85" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="koin-android-2.2.3.module">
-            <sha256 value="426c1dc24ff1ecab3aff94db09bb80fb5f7252dc4c2fc65e08dc31bddbdb6dce" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.insert-koin" name="koin-androidx-fragment" version="2.2.3">
-         <artifact name="koin-androidx-fragment-2.2.3.aar">
-            <sha256 value="4d1f9c72a5512cf9bbb139ea02e44ba29d94b5f83eeec8c588af5f5877662e04" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="koin-androidx-fragment-2.2.3.module">
-            <sha256 value="00b5e4cc0ce41fd7b5eda61deff43f94f45f706efb0affc0c2a1cfef4b2c08ac" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="io.insert-koin" name="koin-androidx-scope" version="2.2.3">
-         <artifact name="koin-androidx-scope-2.2.3.aar">
-            <sha256 value="8e398bfe05bd8bf0b5263e4e8dd94109b1f7b0219967dc16cfcb13da928a2920" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-android" version="3.4.1">
+         <artifact name="koin-android-3.4.1.aar">
+            <sha256 value="735d51f2d285007821f6301ca8edd7e3a6b6d88be2e6e7718f01af2871c918f8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-androidx-scope-2.2.3.module">
-            <sha256 value="6268f2a5c9a6e183b3f559abcce1964329aebba0d56df5f304ca095e71316b19" origin="Generated by Gradle"/>
+         <artifact name="koin-android-3.4.1.module">
+            <sha256 value="ae4cc28f4a9e226aeaf8b0b4a8133279dfbea50e8df6a95b697daefc51449ca5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-androidx-viewmodel" version="2.2.3">
-         <artifact name="koin-androidx-viewmodel-2.2.3.aar">
-            <sha256 value="0e82299b3b6f8c2e5268890dddbf17bf452333e50bf64d78ee9c672deddff7fd" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-androidx-compose" version="3.4.1">
+         <artifact name="koin-androidx-compose-3.4.1.aar">
+            <sha256 value="b6c90741907ff983d826af6e669bf864df9270436558343ed1b5f31977fb6b05" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-androidx-viewmodel-2.2.3.module">
-            <sha256 value="b08f80b54364209b842abb495295cb42f25d314a536e0d51449021e69f8c18f5" origin="Generated by Gradle"/>
+         <artifact name="koin-androidx-compose-3.4.1.module">
+            <sha256 value="d5befe6666ed6bcddb88d3fe50a75064f3b5670a1134a2e310b540dd44014f61" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-core" version="2.2.3">
-         <artifact name="koin-core-2.2.3.jar">
-            <sha256 value="ee3dba29861198f0880fe3a27854b398addf73ad9dc86319b8007a1a7fc0bfd0" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-core" version="3.4.1">
+         <artifact name="koin-core-3.4.1.module">
+            <sha256 value="3fd21f6d1332aa3de7de1aad6b6a067a5b7a5bc99b8e9685fca97c1c37c2728a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-core-2.2.3.module">
-            <sha256 value="4ba513d69a528662532dcb1a9db2713ae58f176811a91ba6cc29d327d5c41346" origin="Generated by Gradle"/>
+         <artifact name="koin-core-metadata-3.4.1.jar">
+            <sha256 value="bc818e207a43836f87723f3d5f75c64ae93255ce416303e668b191c9a85eb62f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-core-ext" version="2.2.3">
-         <artifact name="koin-core-ext-2.2.3.jar">
-            <sha256 value="df34c2482056845ab96580aac0acc10348c8bd64e09a4a22570bd999c57d24c1" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-core-jvm" version="3.4.1">
+         <artifact name="koin-core-jvm-3.4.1.jar">
+            <sha256 value="0ab94b18540e6c8e93d5c12b98e39b0bcb891253cf2abaed1d8388499dbfcd4f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-core-ext-2.2.3.module">
-            <sha256 value="512c15533274e50f36969fd83b452589656f803d455b0e17f0b18dc38a5c549d" origin="Generated by Gradle"/>
+         <artifact name="koin-core-jvm-3.4.1.module">
+            <sha256 value="4c8060c0a7ed1c55e51c5f1885c1f0fa36ed6f58e0fd87ce4fa9dbbb1f195c58" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-test" version="2.2.3">
-         <artifact name="koin-test-2.2.3.jar">
-            <sha256 value="b21e007ced633ff501db0ecb0d6223722593783ea5d3bca95200f353c01494af" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-test" version="3.4.1">
+         <artifact name="koin-test-3.4.1.module">
+            <sha256 value="f895400620e6c2877b33da1cd4ea70eeb461771b330792f672ae5d94a76842cd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-test-2.2.3.module">
-            <sha256 value="d05372d3bf302adcefdc436d73c97146f10c993c04d6d6be1c93f27b310ccac3" origin="Generated by Gradle"/>
+         <artifact name="koin-test-metadata-3.4.1.jar">
+            <sha256 value="23c8708288b26347dd3850d4f52b340faafb148aa67539c31afdae2139ebfc8b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.insert-koin" name="koin-test-core" version="2.2.3">
-         <artifact name="koin-test-core-2.2.3.jar">
-            <sha256 value="241df9e2acc2f58133c87d4cdf9b0f379bb38b8a18f9a5f26f4ad3d6aa3407fb" origin="Generated by Gradle"/>
+      <component group="io.insert-koin" name="koin-test-jvm" version="3.4.1">
+         <artifact name="koin-test-jvm-3.4.1.jar">
+            <sha256 value="16b8de69b6137af881c60ac50ad5d701623274523e6d03e4afa8901b29e0fe98" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="koin-test-core-2.2.3.module">
-            <sha256 value="913582152de0d8fead9764bf8053293c9f11b54772cf364c99517ae15952c305" origin="Generated by Gradle"/>
+         <artifact name="koin-test-jvm-3.4.1.module">
+            <sha256 value="6ac46f3122870ba5a99a3c15749da63f127696f22a6c149ec323ff96ffc81d0a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.mockk" name="mockk" version="1.13.5">