Merge branch 'remove-unused-dependencies-droid-552'

8 files changed, 38 insertions, 284 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 51673f611c..a49db33415 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -182,8 +182,7 @@ android {
 
         val enableInAppVersionNotifications =
             gradleLocalProperties(rootProject.projectDir)
-                .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS")
-                ?: "true"
+                .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true"
 
         buildConfigField(
             "boolean",
@@ -321,19 +320,13 @@ dependencies {
     // Play implementation
     playImplementation(project(Dependencies.Mullvad.billingLib))
 
-    implementation(Dependencies.androidMaterial)
     implementation(Dependencies.commonsValidator)
-    implementation(Dependencies.AndroidX.appcompat)
     implementation(Dependencies.AndroidX.constraintlayout)
-    implementation(Dependencies.AndroidX.coordinatorlayout)
     implementation(Dependencies.AndroidX.coreKtx)
-    implementation(Dependencies.AndroidX.fragmentKtx)
     implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
     implementation(Dependencies.AndroidX.lifecycleViewmodelKtx)
-    implementation(Dependencies.AndroidX.recyclerview)
     implementation(Dependencies.Compose.constrainLayout)
     implementation(Dependencies.Compose.foundation)
-    implementation(Dependencies.Compose.viewModelLifecycle)
     implementation(Dependencies.Compose.material3)
     implementation(Dependencies.Compose.uiController)
     implementation(Dependencies.Compose.ui)
@@ -358,7 +351,6 @@ dependencies {
 
     // Test dependencies
     testImplementation(project(Dependencies.Mullvad.commonTestLib))
-    testImplementation(Dependencies.Koin.test)
     testImplementation(Dependencies.Kotlin.test)
     testImplementation(Dependencies.KotlinX.coroutinesTest)
     testImplementation(Dependencies.MockK.core)
@@ -370,8 +362,6 @@ dependencies {
     // Fixes: https://github.com/android/android-test/issues/1589
     debugImplementation(Dependencies.AndroidX.testMonitor)
     debugImplementation(Dependencies.Compose.testManifest)
-    androidTestImplementation(Dependencies.AndroidX.espressoContrib)
-    androidTestImplementation(Dependencies.AndroidX.espressoCore)
     androidTestImplementation(Dependencies.Compose.junit)
     androidTestImplementation(Dependencies.Koin.test)
     androidTestImplementation(Dependencies.Kotlin.test)
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index a77e8798cc..8e38491f41 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,5 +1,4 @@
 object Dependencies {
-    const val androidMaterial = "com.google.android.material:material:${Versions.Android.material}"
     const val androidVolley = "com.android.volley:volley:${Versions.Android.volley}"
     const val commonsValidator = "commons-validator:commons-validator:${Versions.commonsValidator}"
     const val jodaTime = "joda-time:joda-time:${Versions.jodaTime}"
@@ -14,22 +13,15 @@ object Dependencies {
         const val appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}"
         const val constraintlayout =
             "androidx.constraintlayout:constraintlayout:${Versions.AndroidX.constraintlayout}"
-        const val coordinatorlayout =
-            "androidx.coordinatorlayout:coordinatorlayout:${Versions.AndroidX.coordinatorlayout}"
         const val coreKtx = "androidx.core:core-ktx:${Versions.AndroidX.coreKtx}"
-        const val fragmentKtx = "androidx.fragment:fragment-ktx:${Versions.AndroidX.fragment}"
         const val fragmentTestning =
             "androidx.fragment:fragment-testing:${Versions.AndroidX.fragment}"
         const val lifecycleRuntimeKtx =
             "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.AndroidX.lifecycle}"
         const val lifecycleViewmodelKtx =
             "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.AndroidX.lifecycle}"
-        const val recyclerview =
-            "androidx.recyclerview:recyclerview:${Versions.AndroidX.recyclerview}"
         const val espressoCore =
             "androidx.test.espresso:espresso-core:${Versions.AndroidX.espresso}"
-        const val espressoContrib =
-            "androidx.test.espresso:espresso-contrib:${Versions.AndroidX.espresso}"
         const val testCore =
             "androidx.test:core:${Versions.AndroidX.test}"
         const val testMonitor =
@@ -52,8 +44,6 @@ object Dependencies {
         const val foundation =
             "androidx.compose.foundation:foundation:${Versions.Compose.foundation}"
         const val junit = "androidx.compose.ui:ui-test-junit4:${Versions.Compose.base}"
-        const val viewModelLifecycle =
-            "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}"
         const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}"
         const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}"
         const val uiController =
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 01e82fa403..fede1556f7 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -15,7 +15,6 @@ object Versions {
 
     object Android {
         const val compileSdkVersion = 34
-        const val material = "1.9.0"
         const val minSdkVersion = 26
         const val targetSdkVersion = 34
         const val volley = "1.2.1"
@@ -25,12 +24,9 @@ object Versions {
         const val appcompat = "1.6.1"
         const val coreKtx = "1.9.0"
         const val constraintlayout = "2.1.4"
-        const val coordinatorlayout = "1.2.0"
         const val espresso = "3.5.1"
         const val lifecycle = "2.6.1"
         const val fragment = "1.6.1"
-        const val recyclerview = "1.3.1"
-        const val junit = "1.1.4"
         const val test = "1.5.0"
         const val testMonitor = "1.6.1"
         const val testOrchestrator = "1.4.2"
@@ -45,7 +41,6 @@ object Versions {
         const val foundation = base
         const val material3 = "1.1.1"
         const val uiController = "0.30.1"
-        const val viewModelLifecycle = "2.6.1"
     }
 
     object Plugin {
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index b90ce24745..e485d83a53 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -27,11 +27,6 @@
       </trusted-artifacts>
    </configuration>
    <components>
-      <component group="androidx.activity" name="activity" version="1.0.0">
-         <artifact name="activity-1.0.0.aar">
-            <sha256 value="d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.activity" name="activity" version="1.2.1">
          <artifact name="activity-1.2.1.module">
             <sha256 value="7e8cd74c2fa8166d82663f75a65c8375d4fdec6f1ba880b526dae4192a29a2c9" origin="Generated by Gradle"/>
@@ -66,6 +61,14 @@
             <sha256 value="2a746b0126a8ab2f576e7167f1a785b452ef7ee997abd979ee0c5a29c36f6ea6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity" version="1.7.1">
+         <artifact name="activity-1.7.1.aar">
+            <sha256 value="3b72323c5f7b6c85fa33dc541944d0905124b74675c6d0c01ea63b9029d09f1c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-1.7.1.module">
+            <sha256 value="8b85f30db898760eaba336f9f67309c03a60392e4981e389023c0ad1178ccfaa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity" version="1.7.2">
          <artifact name="activity-1.7.2.aar">
             <sha256 value="2a1abf8e0a598d246b1edcb71e2395e39f32332195ebe5ea40a3dd21355ba3ae" origin="Generated by Gradle"/>
@@ -87,6 +90,14 @@
             <sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-compose" version="1.7.1">
+         <artifact name="activity-compose-1.7.1.aar">
+            <sha256 value="ed700423747880ba211cc48ab9d12752b18286bbae90c220aea6249b2b7fd4c8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-compose-1.7.1.module">
+            <sha256 value="053a2a47af98d51c8adb4cff9a5bf434422a565fdd95acd2b5af63b099ceb73d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-compose" version="1.7.2">
          <artifact name="activity-compose-1.7.2.aar">
             <sha256 value="c73db26b1672a63f144457271b49cc40380b5bafe60ed0710e82d0a774e36a88" origin="Generated by Gradle"/>
@@ -121,6 +132,14 @@
             <sha256 value="f4001a709b6f7132b22a5e17c24f8b8a9b3c462a598de3b0f16cc57a4344bab6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity-ktx" version="1.7.1">
+         <artifact name="activity-ktx-1.7.1.aar">
+            <sha256 value="e778613ed4ffcb034c16517c6ec066d23aa1427e2fb20e728c197a25e78e027d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="activity-ktx-1.7.1.module">
+            <sha256 value="7c92137079783d9c569c900e45d0876fcc6e6c924ebd6108e7955007745a961a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity-ktx" version="1.7.2">
          <artifact name="activity-ktx-1.7.2.aar">
             <sha256 value="b0b4206ece92919925061fdf5784dd21f0118534609e8f6d9404bdd0f5cb5a3d" origin="Generated by Gradle"/>
@@ -184,14 +203,6 @@
             <sha256 value="3f5a8faa19de667e63dca9730ff8ef0e478e4bafb5feeb8258e5c086246dc90c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.appcompat" name="appcompat" version="1.2.0">
-         <artifact name="appcompat-1.2.0.aar">
-            <sha256 value="3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="appcompat-1.2.0.module">
-            <sha256 value="2670902fc6c26047c42e0f60ee34656fa071841db370de958198413b5ab58fc3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.appcompat" name="appcompat" version="1.6.1">
          <artifact name="appcompat-1.6.1.aar">
             <sha256 value="7ea5573b93ababd3bd32312451c6ea48a662b03a140dda81aebe75776a20a422" origin="Generated by Gradle"/>
@@ -200,14 +211,6 @@
             <sha256 value="f755380d80563eecca7db0bf6368b796afbefe381554c87b752bf9e291f3c1a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.appcompat" name="appcompat-resources" version="1.2.0">
-         <artifact name="appcompat-resources-1.2.0.aar">
-            <sha256 value="c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="appcompat-resources-1.2.0.module">
-            <sha256 value="75d9865bc6b0f779043b4f6523a944bd2ccb7526f5c1f5ef24624ac78dec3bd3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.appcompat" name="appcompat-resources" version="1.6.1">
          <artifact name="appcompat-resources-1.6.1.aar">
             <sha256 value="db915dbf49357863de1669ff9fdd8e9008d65fe357af6cce9ae63043ad5f6617" origin="Generated by Gradle"/>
@@ -252,11 +255,6 @@
             <sha256 value="c9468f56e05006ea151a426c54957cd0799b8b83a579d2846dd22061f33e5ecd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.cardview" name="cardview" version="1.0.0">
-         <artifact name="cardview-1.0.0.aar">
-            <sha256 value="1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.collection" name="collection" version="1.1.0">
          <artifact name="collection-1.1.0.jar">
             <sha256 value="632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72" origin="Generated by Gradle"/>
@@ -428,11 +426,6 @@
             <sha256 value="ae1777c22c67686561e3eb2bc2449ddc8ddedf38c3d139cfec56c0629b29ba34" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.runtime" name="runtime" version="1.0.1">
-         <artifact name="runtime-1.0.1.module">
-            <sha256 value="2543a8c7edc16bde91f140286b4fd3773d7204a283a4ec99f6e5e286aa92c0c3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.compose.runtime" name="runtime" version="1.4.1">
          <artifact name="runtime-1.4.1.module">
             <sha256 value="66bb8a37827e169f0bd879c64f6746f5eeb64f69707de11f7e6b2abe983a2d05" origin="Generated by Gradle"/>
@@ -717,11 +710,6 @@
             <sha256 value="77639a0b051e22510bad93affcea0ebd781ef124bf9b7621a95749937bcfcdfd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.constraintlayout" name="constraintlayout" version="2.0.1">
-         <artifact name="constraintlayout-2.0.1.aar">
-            <sha256 value="ec15b5d4a2eff07888bc1499ce2e2c6efe24c0ed60cc57b08c9dc4b6fd3c2189" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.constraintlayout" name="constraintlayout" version="2.1.4">
          <artifact name="constraintlayout-2.1.4.aar">
             <sha256 value="0df714c0b51e54710ebf746eb469d333176bbb3cb29f80775dc3ca4eb3162512" origin="Generated by Gradle"/>
@@ -746,24 +734,6 @@
             <sha256 value="7cfe8d755d524185204c68fe512431aafa5487553adcf2356eec59eab9c64185" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.constraintlayout" name="constraintlayout-solver" version="2.0.1">
-         <artifact name="constraintlayout-solver-2.0.1.jar">
-            <sha256 value="b23732edbb3511d937fea1ffef047b0e6c001b50c1921f0d959fc384d706ec6a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.coordinatorlayout" name="coordinatorlayout" version="1.1.0">
-         <artifact name="coordinatorlayout-1.1.0.aar">
-            <sha256 value="44a9e30abf56af1025c52a0af506fee9c4131aa55efda52f9fd9451211c5e8cb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.coordinatorlayout" name="coordinatorlayout" version="1.2.0">
-         <artifact name="coordinatorlayout-1.2.0.aar">
-            <sha256 value="779408b1aa330cd4a7adf1b2e85fd289c30e7edd2e8e42847b7d06589af715fa" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="coordinatorlayout-1.2.0.module">
-            <sha256 value="d3c21e8ebc682c7afc9d103c070390dd57b358e5359d2abedc1dd982e49e311f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.core" name="core" version="1.10.0">
          <artifact name="core-1.10.0.aar">
             <sha256 value="384f05dddec745390c0a0cc44c18292494759fdf1e07a28071a7095bb544c3f5" origin="Generated by Gradle"/>
@@ -772,14 +742,6 @@
             <sha256 value="fae60b9b8ba3e4c376da50f78c02ad98ffa508cb6152e2610cf79990711aec03" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core" version="1.6.0">
-         <artifact name="core-1.6.0.aar">
-            <sha256 value="875dbec888c91b05521575fd180cc08824d2c4d12b10b0261b4f9d6825214ef1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="core-1.6.0.module">
-            <sha256 value="8348e2b5c0c7e283370b85037cec8b32b4acab8d73a7a53235a372446b1387c8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.core" name="core" version="1.7.0">
          <artifact name="core-1.7.0.module">
             <sha256 value="988f820899d5a4982e5c878ca1cd417970ace332ea2ff72f5be19b233fa0e788" origin="Generated by Gradle"/>
@@ -837,11 +799,6 @@
             <sha256 value="20e5b8f6526a34595a604f56718da81167c0b40a7a94a57daa355663f2594df2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.customview" name="customview" version="1.1.0">
-         <artifact name="customview-1.1.0.aar">
-            <sha256 value="01f76ab043770a97b054046f9815717b82ce0355c02967d16c61981359dc189a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.customview" name="customview-poolingcontainer" version="1.0.0">
          <artifact name="customview-poolingcontainer-1.0.0.aar">
             <sha256 value="3584102fc49bf399c56e3b7be4bfe12000c46112320cd8cf85cc0a8f93f3e752" origin="Generated by Gradle"/>
@@ -860,26 +817,11 @@
             <sha256 value="14022f670afc4a1f0aea1565242b566e84a859094ce6bd48dc87994649713d1b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.documentfile" name="documentfile" version="1.0.0">
-         <artifact name="documentfile-1.0.0.aar">
-            <sha256 value="865a061ef2fad16522f8433536b8d47208c46ff7c7745197dfa1eeb481869487" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
          <artifact name="drawerlayout-1.0.0.aar">
             <sha256 value="9402442cdc5a43cf62fb14f8cf98c63342d4d9d9b805c8033c6cf7e802749ac1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.drawerlayout" name="drawerlayout" version="1.1.1">
-         <artifact name="drawerlayout-1.1.1.aar">
-            <sha256 value="2c5f0dca378eb78ca2c4403f9889c77daa3059302260f26a07fe9f63c08926fe" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.dynamicanimation" name="dynamicanimation" version="1.0.0">
-         <artifact name="dynamicanimation-1.0.0.aar">
-            <sha256 value="ce005162c229bf308d2d5b12fb6cad0874069cbbeaccee63a8193bd08d40de04" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.emoji2" name="emoji2" version="1.2.0">
          <artifact name="emoji2-1.2.0.aar">
             <sha256 value="f31a06c150ecb03073f55a6f7b0b74a240a6a8d727c14ce76726d020570dfa8c" origin="Generated by Gradle"/>
@@ -928,11 +870,6 @@
             <sha256 value="248aa276fdba8116e656233cac3f3fd541444df2305de93e6813795fcd0ba26a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment" version="1.1.0">
-         <artifact name="fragment-1.1.0.aar">
-            <sha256 value="a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.fragment" name="fragment" version="1.3.6">
          <artifact name="fragment-1.3.6.aar">
             <sha256 value="12f0831b4f08092d5dda272c1923c11a022ff20ceffed3e801751e21bb8d1c1e" origin="Generated by Gradle"/>
@@ -994,11 +931,6 @@
             <sha256 value="33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.legacy" name="legacy-support-core-utils" version="1.0.0">
-         <artifact name="legacy-support-core-utils-1.0.0.aar">
-            <sha256 value="a7edcf01d5b52b3034073027bc4775b78a4764bb6202bb91d61c829add8dd1c7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1">
          <artifact name="lifecycle-common-2.3.1.jar">
             <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle"/>
@@ -1068,11 +1000,6 @@
             <sha256 value="19a287b46d1b1ffe297bee0df7dee5183aeba95600ec0de8742adeb5b67c8bab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.0.0">
-         <artifact name="lifecycle-livedata-core-2.0.0.aar">
-            <sha256 value="fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1">
          <artifact name="lifecycle-livedata-core-2.3.1.module">
             <sha256 value="b1e095d550d39a7d6c815761d6dbe3fd64eb31a39dc28146e78bbf2c01ba8f41" origin="Generated by Gradle"/>
@@ -1147,21 +1074,11 @@
             <sha256 value="d927d41903a2ff02ba1b9fefa4c25cb58187b1ce3a054945f43ce6a29918a3f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.1.0">
-         <artifact name="lifecycle-runtime-2.1.0.aar">
-            <sha256 value="e5173897b965e870651e83d9d5af1742d3f532d58863223a390ce3a194c8312b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.0">
          <artifact name="lifecycle-runtime-2.3.0.module">
             <sha256 value="01f17f2bc714167f2cc1e66ccf74cbced329fd5be884872c786be69616ca5aad" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.1">
-         <artifact name="lifecycle-runtime-2.3.1.module">
-            <sha256 value="2a7b90e5049b674b36bccfd68677b3a0b3178b3f7c2ef7ddf618d3895598c4ce" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.5.1">
          <artifact name="lifecycle-runtime-2.5.1.aar">
             <sha256 value="33b0d73dc2f028fceb3599bacabe563c3db6d26f3513d889595863536a4ac8c0" origin="Generated by Gradle"/>
@@ -1207,21 +1124,11 @@
             <sha256 value="3c9af03a3a543394e67ab599b727ba331e6f330a55829f6d52f63a8772f4cbdc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.1.0">
-         <artifact name="lifecycle-viewmodel-2.1.0.aar">
-            <sha256 value="ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.0">
          <artifact name="lifecycle-viewmodel-2.3.0.module">
             <sha256 value="feeb5ec453c20d8c1900b0849d2066edc8a41532ce0088d641c4a886bae57a08" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.1">
-         <artifact name="lifecycle-viewmodel-2.3.1.module">
-            <sha256 value="a531853dfe316c90b7466d24be94dbe60a60ef54a52c904c86381986202e51f4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.5.1">
          <artifact name="lifecycle-viewmodel-2.5.1.aar">
             <sha256 value="14a27d5fb8a1436b1b7dec18bebaa66c830cdbbc8e28a81ce5f85b7c33b3ae9d" origin="Generated by Gradle"/>
@@ -1280,11 +1187,6 @@
             <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.1">
-         <artifact name="lifecycle-viewmodel-savedstate-2.3.1.module">
-            <sha256 value="8083710b758ac096891e91f51d91ee56a445b265d7becf230355377327c0418b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.5.1">
          <artifact name="lifecycle-viewmodel-savedstate-2.5.1.aar">
             <sha256 value="8481141f97f0e6213dd33fcc89a784c4bd11a6ff7d4779a1cf6a0e9fbdbf24e0" origin="Generated by Gradle"/>
@@ -1314,11 +1216,6 @@
             <sha256 value="11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.localbroadcastmanager" name="localbroadcastmanager" version="1.0.0">
-         <artifact name="localbroadcastmanager-1.0.0.aar">
-            <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.navigation" name="navigation-common" version="2.7.5">
          <artifact name="navigation-common-2.7.5.aar">
             <sha256 value="8e6c87281800c1ec4631be392898bb6d68c682174492cc4e3207c5ef7994a5b5" origin="Generated by Gradle"/>
@@ -1359,11 +1256,6 @@
             <sha256 value="1c5936b073fd6d63b46c6959e14be5f393816275ca83487bb1011d68403d1dbe" 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"/>
-         </artifact>
-      </component>
       <component group="androidx.profileinstaller" name="profileinstaller" version="1.3.0">
          <artifact name="profileinstaller-1.3.0.aar">
             <sha256 value="34e8b2bfc74e23c1525e3da903ae449b7f1b440aef45e18159ee470e91997f48" origin="Generated by Gradle"/>
@@ -1372,22 +1264,6 @@
             <sha256 value="a16fe511e599c2042da122be09569aecd3f4f90cad37ef08bd0bbc39118c92c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.recyclerview" name="recyclerview" version="1.2.1">
-         <artifact name="recyclerview-1.2.1.aar">
-            <sha256 value="a1ea0329ee6d938305dfd0f8ce5c48dea2aac14e5606d23e7fb60afcfb655d6e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="recyclerview-1.2.1.module">
-            <sha256 value="23542c8c85cc58fafe0ae8cba201e6c9e01b4c6799223340a2d6a51d7784828c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.recyclerview" name="recyclerview" version="1.3.1">
-         <artifact name="recyclerview-1.3.1.aar">
-            <sha256 value="4cfed42bdcc196d11e9b10da68c1f96cd4bda4cd8521e7285f62442c0c11de08" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="recyclerview-1.3.1.module">
-            <sha256 value="befd6dc2973bbe6efc5191e7400322713928e7e0764429a275cd9cb1a406dd71" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.resourceinspection" name="resourceinspection-annotation" version="1.0.1">
          <artifact name="resourceinspection-annotation-1.0.1.jar">
             <sha256 value="8cff870ec6fb31db48a52f4a792335b4bf8de07e03bd37823181526433ccd5cb" origin="Generated by Gradle"/>
@@ -1396,11 +1272,6 @@
             <sha256 value="352a11a8d8a4c1bd6cd2c2fefff9c94ca954d7b5202a0656959db95297f6a2b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.savedstate" name="savedstate" version="1.0.0">
-         <artifact name="savedstate-1.0.0.aar">
-            <sha256 value="2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.savedstate" name="savedstate" version="1.1.0">
          <artifact name="savedstate-1.1.0.module">
             <sha256 value="6eea2bc150828c8fcba777e93037038e2ee3ec441c43d6acecf2c5cd9ddc5374" origin="Generated by Gradle"/>
@@ -1473,14 +1344,19 @@
             <sha256 value="dd645929c63e24f41be8e6f57bb06f305d3b02ed1b2a7d961647027ae1d9e17f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="runner" version="1.5.0">
+         <artifact name="runner-1.5.0.aar">
+            <sha256 value="b3c5aabd545b6c260528c8f4e7c98f73628614ea3d5df3a7a44af2136fd8720b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="runner" version="1.5.2">
          <artifact name="runner-1.5.2.aar">
             <sha256 value="36cd6bc876daa1f183ccd11f9898e094c71f06960fde85a373422959613a44d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.test.espresso" name="espresso-contrib" version="3.5.1">
-         <artifact name="espresso-contrib-3.5.1.aar">
-            <sha256 value="a9bdbc2816943886529fd60da4ab65d790281364823a149b159fa6844cbedbb4" origin="Generated by Gradle"/>
+      <component group="androidx.test.espresso" name="espresso-core" version="3.5.0">
+         <artifact name="espresso-core-3.5.0.aar">
+            <sha256 value="34b0493f4e002f205d961e562add0c0c31bb0acc657e89d89d4b188ac13f242c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.test.espresso" name="espresso-core" version="3.5.1">
@@ -1488,6 +1364,11 @@
             <sha256 value="34b0493f4e002f205d961e562add0c0c31bb0acc657e89d89d4b188ac13f242c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test.espresso" name="espresso-idling-resource" version="3.5.0">
+         <artifact name="espresso-idling-resource-3.5.0.aar">
+            <sha256 value="84fb8e2f5eda937771bee28582f5d2cfa61b0e9438d02041ca61b81e3dac3c87" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test.espresso" name="espresso-idling-resource" version="3.5.1">
          <artifact name="espresso-idling-resource-3.5.1.aar">
             <sha256 value="84fb8e2f5eda937771bee28582f5d2cfa61b0e9438d02041ca61b81e3dac3c87" origin="Generated by Gradle"/>
@@ -1521,11 +1402,6 @@
             <sha256 value="fc8b21ebe5fa3a7c96ee098bcdcd00f077ebce73f243fa858e2b0671615f75d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.transition" name="transition" version="1.2.0">
-         <artifact name="transition-1.2.0.aar">
-            <sha256 value="a1e059b3bc0b43a58dec0efecdcaa89c82d2bca552ea5bacf6656c46e853157e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.vectordrawable" name="vectordrawable" version="1.1.0">
          <artifact name="vectordrawable-1.1.0.aar">
             <sha256 value="46fd633ac01b49b7fcabc263bf098c5a8b9e9a69774d234edcca04fb02df8e26" origin="Generated by Gradle"/>
@@ -1546,19 +1422,6 @@
             <sha256 value="147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.viewpager2" name="viewpager2" version="1.0.0">
-         <artifact name="viewpager2-1.0.0.aar">
-            <sha256 value="e95c0031d4cc247cd48196c6287e58d2cee54d9c79b85afea7c90920330275af" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.viewpager2" name="viewpager2" version="1.1.0-beta02">
-         <artifact name="viewpager2-1.1.0-beta02.aar">
-            <sha256 value="bafac3ca991ed68a2c7ca6ff352966d200b12e66a342d10f497cb8168f59054a" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="viewpager2-1.1.0-beta02.module">
-            <sha256 value="1dd2ebd9c18d7299ac9c8d331ae39f2a38fa0c9ed32d6606e041ac34d0c38a3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="app.cash.turbine" name="turbine" version="1.0.0">
          <artifact name="Turbine-metadata.jar">
             <sha256 value="a65b488d928152a91b52d1a0f783fd150ff291998f103db6592f26393d701365" origin="Generated by Gradle"/>
@@ -2109,11 +1972,6 @@
             <sha256 value="ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.apps.common.testing.accessibility.framework" name="accessibility-test-framework" version="3.1.2">
-         <artifact name="accessibility-test-framework-3.1.2.aar">
-            <sha256 value="9b586dc8eeeb4f601038e23ef8ffd6a1deeca1163276d02797b0d2b8f9764b62" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.android.datatransport" name="transport-api" version="3.0.0">
          <artifact name="transport-api-3.0.0.aar">
             <sha256 value="4e6983c0703b357df6f1c6ceacb1b5dfc2c5006a789c799fec2298b2b5337466" origin="Generated by Gradle"/>
@@ -2129,22 +1987,6 @@
             <sha256 value="cb9353ef1791ae17097d878ca711e25a9c32cec9042adc49b00cadfee1a7290b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.material" name="material" version="1.4.0">
-         <artifact name="material-1.4.0.aar">
-            <sha256 value="80a0e02abf8a8a8cbe5716e06ac80cd683840b9f5b0d2f19a2a279e47f2895ee" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="material-1.4.0.module">
-            <sha256 value="91eecf4b1272aacc4fdb41fefaa6324cbd36218c51866d300dcf237670e4e0cc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.android.material" name="material" version="1.9.0">
-         <artifact name="material-1.9.0.aar">
-            <sha256 value="6cc2359979269e4d9eddce7d84682d2bb06a35a14edce806bf0da6e8d4d31806" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="material-1.9.0.module">
-            <sha256 value="5b87bccdfa041a57347f3e1bfa34966030657de6f4cf991d82ec041e8153beb4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.api-client" name="google-api-client" version="2.2.0">
          <artifact name="google-api-client-2.2.0.jar">
             <sha256 value="58eca9fb0a869391689ffc828b3bd0b19ac76042ff9fab4881eddf7fde76903f" origin="Generated by Gradle"/>
@@ -2244,21 +2086,11 @@
             <sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.15.0">
-         <artifact name="error_prone_annotations-2.15.0.jar">
-            <sha256 value="067047714349e7789a5bdbfad9d1c0af9f3a1eb28c55a0ee3f68e682f905c4eb" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
          <artifact name="error_prone_annotations-2.18.0.jar">
             <sha256 value="9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
-         <artifact name="error_prone_annotations-2.3.4.jar">
-            <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.firebase" name="firebase-encoders" version="17.0.0">
          <artifact name="firebase-encoders-17.0.0.jar">
             <sha256 value="282a5a703f9b7eb56508dde97ea918e95d73318b157050f457f7a86dca750150" origin="Generated by Gradle"/>
@@ -2289,11 +2121,6 @@
             <sha256 value="a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.guava" name="guava" version="28.2-android">
-         <artifact name="guava-28.2-android.jar">
-            <sha256 value="1faf214c94723ab9fbadfedd9af88ddc325faf669e68eab04688c3afcf59c037" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.guava" name="guava" version="31.1-jre">
          <artifact name="guava-31.1-jre.jar">
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
@@ -2359,11 +2186,6 @@
             <sha256 value="1ec0733f32d49f8194fb5452613039370623715739568a6d3c987d9a7809c16c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.protobuf" name="protobuf-lite" version="3.0.1">
-         <artifact name="protobuf-lite-3.0.1.jar">
-            <sha256 value="1413393db84e4adef79b2997d9dfeb4793d8f93d196f8347808d15711f0bc69c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.8-alpha08">
          <artifact name="android-device-provider-local-0.0.8-alpha08.jar">
             <sha256 value="a945c7d044f6dd6fae7e315b02dc5cfa75432df41c624c3fb0baeecb841a95ef" origin="Generated by Gradle"/>
@@ -3226,16 +3048,6 @@
             <sha256 value="f3433a97d780fe9fa3dc3d562a41decd59b2e617ce884de9060349ac14750045" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
-         <artifact name="checker-compat-qual-2.5.5.jar">
-            <sha256 value="11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.checkerframework" name="checker-qual" version="2.5.5">
-         <artifact name="checker-qual-2.5.5.jar">
-            <sha256 value="164fe9728cf95a2cdea93e257d0dc3d5e29f29256b3cca900a8e619bc94d5b1f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.checkerframework" name="checker-qual" version="3.12.0">
          <artifact name="checker-qual-3.12.0.jar">
             <sha256 value="ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" origin="Generated by Gradle"/>
@@ -3295,21 +3107,11 @@
             <sha256 value="e852af6f2307881ab5e916e8911fd3310e05d050e5aa999bfcd3d4e98c8608a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.hamcrest" name="hamcrest" version="2.2">
-         <artifact name="hamcrest-2.2.jar">
-            <sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.hamcrest" name="hamcrest-core" version="1.3">
          <artifact name="hamcrest-core-1.3.jar">
             <sha256 value="66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.hamcrest" name="hamcrest-core" version="2.2">
-         <artifact name="hamcrest-core-2.2.jar">
-            <sha256 value="094f5d92b4b7d9c8a2bf53cc69d356243ae89c3499457bcb4b92f7ed3bf95879" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.hamcrest" name="hamcrest-integration" version="1.3">
          <artifact name="hamcrest-integration-1.3.jar">
             <sha256 value="70f418efbb506c5155da5f9a5a33262ea08a9e4d7fea186aa9015c41a7224ac2" origin="Generated by Gradle"/>
@@ -3320,11 +3122,6 @@
             <sha256 value="711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.hamcrest" name="hamcrest-library" version="2.2">
-         <artifact name="hamcrest-library-2.2.jar">
-            <sha256 value="3851523a201a0d4825c25a61a6edc50712825a39bd3d03391b98c48ca3cb396c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jdom" name="jdom2" version="2.0.6">
          <artifact name="jdom2-2.0.6.jar">
             <sha256 value="1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5" origin="Generated by Gradle"/>
@@ -4083,11 +3880,6 @@
             <sha256 value="505008736a6cfab649f81db603eee3b2f828f5d877712a38939efdd5f1fc5170" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jsoup" name="jsoup" version="1.12.2">
-         <artifact name="jsoup-1.12.2.jar">
-            <sha256 value="1f9b6f110f498bb5796cbe2cdd36a83ae242619c816821db23ed088a30347b4a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jsoup" name="jsoup" version="1.16.1">
          <artifact name="jsoup-1.16.1.jar">
             <sha256 value="1f115726540ddf71958c14bc517ebfc49cf481e91cd917b0face84f01272e901" origin="Generated by Gradle"/>
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts
index 255459f453..8ecc14f7cd 100644
--- a/android/lib/billing/build.gradle.kts
+++ b/android/lib/billing/build.gradle.kts
@@ -42,9 +42,6 @@ dependencies {
     implementation(Dependencies.Kotlin.stdlib)
     implementation(Dependencies.KotlinX.coroutinesAndroid)
 
-    implementation(Dependencies.Koin.core)
-    implementation(Dependencies.Koin.android)
-
     //Billing library
     implementation(Dependencies.billingClient)
 
@@ -71,6 +68,5 @@ dependencies {
     androidTestImplementation(Dependencies.KotlinX.coroutinesTest)
     androidTestImplementation(Dependencies.turbine)
     androidTestImplementation(Dependencies.junit)
-    androidTestImplementation(Dependencies.AndroidX.espressoContrib)
     androidTestImplementation(Dependencies.AndroidX.espressoCore)
 }
diff --git a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
index 85982007b8..e6f5225740 100644
--- a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
+++ b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt
@@ -38,9 +38,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.koin.core.context.startKoin
-import org.koin.core.context.stopKoin
-import org.koin.dsl.module
 
 class BillingRepositoryTest {
     @get:Rule val testCoroutineRule = TestCoroutineRule()
@@ -56,8 +53,6 @@ class BillingRepositoryTest {
 
     @Before
     fun setUp() {
-        startKoin { modules(module { single { mockk<Activity>() } }) }
-
         mockkStatic(BILLING_CLIENT_CLASS)
         mockkStatic(BILLING_CLIENT_KOTLIN_CLASS)
         mockkStatic(BILLING_FLOW_PARAMS)
@@ -74,7 +69,6 @@ class BillingRepositoryTest {
     @After
     fun tearDown() {
         unmockkAll()
-        stopKoin()
     }
 
     @Test
diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts
index 0c6213e889..85b15dacaf 100644
--- a/android/lib/ipc/build.gradle.kts
+++ b/android/lib/ipc/build.gradle.kts
@@ -28,7 +28,6 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependencies.Mullvad.commonLib))
     implementation(project(Dependencies.Mullvad.modelLib))
 
     implementation(Dependencies.Kotlin.stdlib)
diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
index 6b9c76f0b3..ebf48d22fd 100644
--- a/android/service/build.gradle.kts
+++ b/android/service/build.gradle.kts
@@ -51,10 +51,8 @@ dependencies {
     implementation(project(Dependencies.Mullvad.endpointLib))
     implementation(project(Dependencies.Mullvad.ipcLib))
     implementation(project(Dependencies.Mullvad.modelLib))
-    implementation(project(Dependencies.Mullvad.resourceLib))
     implementation(project(Dependencies.Mullvad.talpidLib))
 
-    implementation(Dependencies.AndroidX.appcompat)
     implementation(Dependencies.jodaTime)
     implementation(Dependencies.Koin.core)
     implementation(Dependencies.Koin.android)