Merge branch 'update-to-compilesdk-targetsdk-34-droid-472'

4 files changed, 200 insertions, 207 deletions

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 432244d16f..10b40b9347 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <!-- https://developer.android.com/guide/components/fg-service-types#system-exempted -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-feature android:name="android.hardware.touchscreen"
                   android:required="false" />
     <uses-feature android:name="android.hardware.faketouch"
@@ -49,11 +51,17 @@
             however as it's protected by the bind vpn permission
             (android.permission.BIND_VPN_SERVICE) it's protected against third party apps/services.
         -->
+        <!--
+            foregroundServiceType="systemExempted" is required in Android 14+
+            https://developer.android.com/guide/components/fg-service-types#system-exempted
+            -->
         <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
                  android:exported="true"
                  android:permission="android.permission.BIND_VPN_SERVICE"
                  android:process=":mullvadvpn_daemon"
-                 android:stopWithTask="false">
+                 android:stopWithTask="false"
+                 android:foregroundServiceType="systemExempted"
+                 tools:ignore="ForegroundServicePermission">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 4ceb4f787f..06d5392f2f 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -14,10 +14,10 @@ object Versions {
     const val billingClient = "6.0.1"
 
     object Android {
-        const val compileSdkVersion = 33
+        const val compileSdkVersion = 34
         const val material = "1.9.0"
         const val minSdkVersion = 26
-        const val targetSdkVersion = 33
+        const val targetSdkVersion = 34
         const val volley = "1.2.1"
     }
 
@@ -51,7 +51,7 @@ object Versions {
         // The androidAapt plugin version must be in sync with the android plugin version.
         // Required for Gradle metadata verification to work properly, see:
         // https://github.com/gradle/gradle/issues/19228
-        const val android = "8.1.0"
+        const val android = "8.1.4"
         const val androidAapt = "$android-10154469"
         const val playPublisher = "3.8.4"
         const val dependencyCheck = "8.3.1"
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index 074e8a71a2..6fc79e4bd9 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -850,14 +850,14 @@
             <sha256 value="903034d5152dd2e0162b1468ea25a22e1ca384006b3d282d5a143cc760321a01" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="8.1.0">
-         <artifact name="databinding-common-8.1.0.jar">
+      <component group="androidx.databinding" name="databinding-common" version="8.1.4">
+         <artifact name="databinding-common-8.1.4.jar">
             <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="8.1.0">
-         <artifact name="databinding-compiler-common-8.1.0.jar">
-            <sha256 value="f0c2138f13aa2dd72b8e89f379cd2b638ec59206d5aaf07c155613dbac83f519" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.1.4">
+         <artifact name="databinding-compiler-common-8.1.4.jar">
+            <sha256 value="14022f670afc4a1f0aea1565242b566e84a859094ce6bd48dc87994649713d1b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.documentfile" name="documentfile" version="1.0.0">
@@ -1458,13 +1458,13 @@
             <sha256 value="34813438ae79db84f4459c19f440ef3346ee141bab671aed874d22c1c4bd4f88" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="8.1.0">
-         <artifact name="signflinger-8.1.0.jar">
+      <component group="com.android" name="signflinger" version="8.1.4">
+         <artifact name="signflinger-8.1.4.jar">
             <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="8.1.0">
-         <artifact name="zipflinger-8.1.0.jar">
+      <component group="com.android" name="zipflinger" version="8.1.4">
+         <artifact name="zipflinger-8.1.4.jar">
             <sha256 value="56589abf965af58ea1d31c15d676fe0d62b9db92983fbdfe8e72c983ea577dbb" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -1478,125 +1478,125 @@
             <sha256 value="5c243282d12cb21bbc2d7fea388d54183140f8d4b201a4380a0a6e8f3122a15e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="8.1.0">
-         <artifact name="baseLibrary-8.1.0.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="8.1.4">
+         <artifact name="baseLibrary-8.1.4.jar">
             <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="31.1.0">
-         <artifact name="annotations-31.1.0.jar">
+      <component group="com.android.tools" name="annotations" version="31.1.4">
+         <artifact name="annotations-31.1.4.jar">
             <sha256 value="ee3bfd9cdb5012bdb61520f8654a785577e9bb337e5939c5c6149a446684ee16" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="31.1.0">
-         <artifact name="common-31.1.0.jar">
-            <sha256 value="18429dd4f4eef4f382f81c5970776f825c13da2fc34c6cd42e69b016c4fcf072" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="common" version="31.1.4">
+         <artifact name="common-31.1.4.jar">
+            <sha256 value="fb820702330dd6f7b55a7b8e652d9831423155bd7931f2006dfa3eb1764d2672" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="31.1.0">
-         <artifact name="dvlib-31.1.0.jar">
+      <component group="com.android.tools" name="dvlib" version="31.1.4">
+         <artifact name="dvlib-31.1.4.jar">
             <sha256 value="f6e31a2b7da1b62a401e5e3f0304426faa119dcfd1651f8f67a9a4c254d59faf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="play-sdk-proto" version="31.1.0">
-         <artifact name="play-sdk-proto-31.1.0.jar">
+      <component group="com.android.tools" name="play-sdk-proto" version="31.1.4">
+         <artifact name="play-sdk-proto-31.1.4.jar">
             <sha256 value="5c77cd5fabe3d288272c088b05576085ebbfd1ddaac299bbebb93ce53b0ffe7e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="31.1.0">
-         <artifact name="repository-31.1.0.jar">
+      <component group="com.android.tools" name="repository" version="31.1.4">
+         <artifact name="repository-31.1.4.jar">
             <sha256 value="8fe8e9d6bcebe92dd4eee3e8f8e122b521f03a8f49e28f6a814b46e3822e4aaa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="31.1.0">
-         <artifact name="sdk-common-31.1.0.jar">
+      <component group="com.android.tools" name="sdk-common" version="31.1.4">
+         <artifact name="sdk-common-31.1.4.jar">
             <sha256 value="47a63f3c957cc7a108000f945fdcff935148d5c213cb5887472cc091599a44c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="31.1.0">
-         <artifact name="sdklib-31.1.0.jar">
-            <sha256 value="9b344f6587e890bd0d4b68667c8fb652be12227fbe4c21cd8824d292e4ed6ddb" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdklib" version="31.1.4">
+         <artifact name="sdklib-31.1.4.jar">
+            <sha256 value="095b853614c8bee7dcaf9bfcc41288dc4c8ce0929becb2ef80933cfcf12c93c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="31.1.0">
-         <artifact name="crash-31.1.0.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="31.1.4">
+         <artifact name="crash-31.1.4.jar">
             <sha256 value="cc5f028ac4fd037d57c0bb0cdc84ca37671852ea2370216b5ce6f45479f03261" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="31.1.0">
-         <artifact name="protos-31.1.0.jar">
-            <sha256 value="c1731e7dd1c07a10a0b11a62fff27448bfa260f7b534276bc9dbad857fbd76fd" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="protos" version="31.1.4">
+         <artifact name="protos-31.1.4.jar">
+            <sha256 value="04dc44183b4a2b7f141590ac1b2dc53d6be615723a181a4818fd9550ad1d0263" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="31.1.0">
-         <artifact name="shared-31.1.0.jar">
+      <component group="com.android.tools.analytics-library" name="shared" version="31.1.4">
+         <artifact name="shared-31.1.4.jar">
             <sha256 value="1c0059475ddac544e9f8f43ae018092dbb446c86970e2b5fe1e65931c780d42a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="31.1.0">
-         <artifact name="tracker-31.1.0.jar">
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.1.4">
+         <artifact name="tracker-31.1.4.jar">
             <sha256 value="02cc932f48012d8feae1d09f949697c6e2154e821d6d4649e1e39dc911c46977" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2" version="8.1.0-10154469">
-         <artifact name="aapt2-8.1.0-10154469-linux.jar">
-            <sha256 value="09408183419a74c405d7c5a964a800da916758988cbc5c6cfdbb1c309aaea03c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2" version="8.1.4-10154469">
+         <artifact name="aapt2-8.1.4-10154469-linux.jar">
+            <sha256 value="94252db9886dcb1b8689a656e1cd8f222e68b8223b03951350b064c3c4e3eb91" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-8.1.0-10154469-osx.jar">
-            <sha256 value="c34f5c26a014199da8e86c85f4ed0bfbe804fc087b98539c9481add23eae05e0" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.1.4-10154469-osx.jar">
+            <sha256 value="8f11aa29098554b5298fd94160befa4a92d1355b097194d193ede8455a041e85" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-8.1.0-10154469-windows.jar">
-            <sha256 value="12aee6bd1f6afe1cef8b6fcb64b0f0962c925c7c6241add572e03bf8be103f5c" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.1.4-10154469-windows.jar">
+            <sha256 value="8c6bf3a4428ed04efec1346b8c6ccbaaf9d3a59b9bbd3a12f641006807a730e1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="8.1.0-10154469">
-         <artifact name="aapt2-proto-8.1.0-10154469.jar">
-            <sha256 value="6d8d14b91285cc7c1b73460f413bb3f80672dc34dc506ed578fba1f6dde8661e" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.1.4-10154469">
+         <artifact name="aapt2-proto-8.1.4-10154469.jar">
+            <sha256 value="5d75e394f368e70765baac77b04ca77e18fef892ab65acadda2831f4af2e9bd8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-8.1.0-10154469.module">
-            <sha256 value="fd72696795dc762c9f6e3698acfa22bfc6c75a862659bba2adb783e6b9138006" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-8.1.4-10154469.module">
+            <sha256 value="20717a02d688910dc98fe50cf2ce16c8be5aef3f93070b62fbdd0b1616f7a3d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="8.1.0">
-         <artifact name="aaptcompiler-8.1.0.jar">
-            <sha256 value="5de36b2081e635c2dfe93e62f9861a6f527878fdb5cb4c464e872cca4df06250" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.1.4">
+         <artifact name="aaptcompiler-8.1.4.jar">
+            <sha256 value="33bdd912702b8cd02ae1f3d6faf0cb72ec860d0cfcdc0fc7ee3abb46fa53bb62" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-8.1.0.module">
-            <sha256 value="19c9f8a4f359a58b2e60192f1dff2f1a8d8dc97adb03a8d04f3031cb39856c3a" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-8.1.4.module">
+            <sha256 value="ea7e4def86ba7b8901d8d743a92a054e05610366fe04fd23a49f68a83cca4f5c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="8.1.0">
-         <artifact name="apksig-8.1.0.jar">
+      <component group="com.android.tools.build" name="apksig" version="8.1.4">
+         <artifact name="apksig-8.1.4.jar">
             <sha256 value="468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="8.1.0">
-         <artifact name="apkzlib-8.1.0.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="8.1.4">
+         <artifact name="apkzlib-8.1.4.jar">
             <sha256 value="ec6cdd0645c9923c733d38a0a68c1b47919a822f138d56dc99ba9c78c361fa00" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="8.1.0">
-         <artifact name="builder-8.1.0.jar">
-            <sha256 value="be41a2a8b1056729c3d4bf4c79cc9c0f344c77932bfdb31961d96ce70bd187da" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder" version="8.1.4">
+         <artifact name="builder-8.1.4.jar">
+            <sha256 value="9d610cf18879757518eeeab89b21e2ea077244804a71cc8b3591a63010cb6930" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-8.1.0.module">
-            <sha256 value="5b8de94b653a88f9fe91c8e654e66ec618a8adba7068022de598085be8e67f0f" origin="Generated by Gradle"/>
+         <artifact name="builder-8.1.4.module">
+            <sha256 value="947e0a5f5b3816f6fec043dd82a72c453b9c6506ed1b14debb66865715c34085" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="8.1.0">
-         <artifact name="builder-model-8.1.0.jar">
-            <sha256 value="efe9220a2334d9bafe655dd895a007b2c403f509ae2be037c60ab4f47cc398f1" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-model" version="8.1.4">
+         <artifact name="builder-model-8.1.4.jar">
+            <sha256 value="e7e215793f01d8b7dbe07696b432972695781b515d51f52a3129a779eb81c8b7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-8.1.0.module">
-            <sha256 value="e10891390a314ce811c634980ccb4d35d2ba4e81c64be6a11a402d3763013a5f" origin="Generated by Gradle"/>
+         <artifact name="builder-model-8.1.4.module">
+            <sha256 value="59f28348cc4974f167702bd6daf6bdab73aa3da3f4f565e7381545ea9eb4e4ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="8.1.0">
-         <artifact name="builder-test-api-8.1.0.jar">
-            <sha256 value="e1474815e603a4f4b7d9e086c481775d3d7837c8254a0831a8cbee8a5d11ac8a" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.1.4">
+         <artifact name="builder-test-api-8.1.4.jar">
+            <sha256 value="eb976a24de99df733de6b651e90f86a403ac097ab81ece3bd2e2e85853e53446" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-test-api-8.1.0.module">
-            <sha256 value="5655ff7edadc61daf9cf898f77f7ab0105e8c034722a2be66edee86871ba8e40" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-8.1.4.module">
+            <sha256 value="c30a24ba44757b2cc9021f9d49a707caac44451133acce195c5cedb138af38c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="bundletool" version="1.14.0">
@@ -1604,36 +1604,36 @@
             <sha256 value="8e44e4b396f12dc2fa55d40985ceb08b1bed222077a5dedbafdeb46da8fb9d06" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="8.1.0">
-         <artifact name="gradle-8.1.0.jar">
-            <sha256 value="bee5ca8b8255096decc397372c104e4a2a2d7c690d712e10181609ed85cd1cb2" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle" version="8.1.4">
+         <artifact name="gradle-8.1.4.jar">
+            <sha256 value="54d8d419825eddfd8cb4a1f33ece9e0e6996fde24348a556d67a950b44dc3669" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-8.1.0.module">
-            <sha256 value="763dc2345d186f73afe3b8bea2d7a651f22516f4915075fdd8d3877f397579ce" origin="Generated by Gradle"/>
+         <artifact name="gradle-8.1.4.module">
+            <sha256 value="55b9623ccfc983011e8e05526c07e52a5de436d5113cbc8f46bb4b03e65a7e2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="8.1.0">
-         <artifact name="gradle-api-8.1.0.jar">
-            <sha256 value="01cb192f3ab8d5ef0ed1e42d1d03b068a1f5317983e64f0682dccbcff76ec16f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-api" version="8.1.4">
+         <artifact name="gradle-api-8.1.4.jar">
+            <sha256 value="614be3505dffc1c000106baab8d70cb5c2f7c5854adaf666d1a473c0b8c1f66d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-8.1.0.module">
-            <sha256 value="d3c0779a7b91f1a931228d8f7e86219f3be6fa12fb9bf7bee4f60968b2b25730" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-8.1.4.module">
+            <sha256 value="ef490d0543dbf74dbf488a79fa191c46cb763bcdd44bf75023497dc433dc74a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="8.1.0">
-         <artifact name="gradle-settings-api-8.1.0.jar">
-            <sha256 value="5751e038e07eb33f3e51da0a0e6691d806106cdb4f10930dcd7e81304c7c847f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.1.4">
+         <artifact name="gradle-settings-api-8.1.4.jar">
+            <sha256 value="2a3b59510f08a909eb40bf0e3a93f68330b88bb11a7bb50168d0d2083453da92" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-8.1.0.module">
-            <sha256 value="c4a017f363aacbd199b23c9c9c482d41570bbcd83b678b4d567f8ea2a100e5d2" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-8.1.4.module">
+            <sha256 value="19fc53d02dbf7c8a0f99a0b29b35f7a6eaa2ef1d233aea35a77b9fe2b5430a26" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="31.1.0">
-         <artifact name="manifest-merger-31.1.0.jar">
-            <sha256 value="80ecad8096efbd50778ccb3aa848e16aa092fde2e68d213cebca2b83d2399dbb" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.1.4">
+         <artifact name="manifest-merger-31.1.4.jar">
+            <sha256 value="9ab1be097f813eb50f60c7cf6571aa296d785098e394da89d17eba2764d3b07a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-31.1.0.module">
-            <sha256 value="15d4c068e62a53a53a4c139ef3af8417f332384ee0648e0da5ed74563ca53055" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-31.1.4.module">
+            <sha256 value="3cdd1a1a46df873bb221a486c4cc1309376c7e141e439c875628d474599990a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
@@ -1657,193 +1657,193 @@
             <sha256 value="36c25576b19993df360170528cc62b7246c37776d6158154a67cdf8fc2d58e13" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="31.1.0">
-         <artifact name="ddmlib-31.1.0.jar">
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.1.4">
+         <artifact name="ddmlib-31.1.4.jar">
             <sha256 value="8c2fb144e61ca79aab8edc7c3ffe2c2b74bc6b23cb0cac6c8b7e066b5151e8ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.emulator" name="proto" version="31.1.0">
-         <artifact name="proto-31.1.0.jar">
+      <component group="com.android.tools.emulator" name="proto" version="31.1.4">
+         <artifact name="proto-31.1.4.jar">
             <sha256 value="6c07754c4051e3b1cbbecbe0f14c6e9c5137a63ff3ea2afe529236435fc971bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.1.0">
-         <artifact name="intellij-core-31.1.0.jar">
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.1.4">
+         <artifact name="intellij-core-31.1.4.jar">
             <sha256 value="558db7e4be3f09a72d15c9ec1adf4c7ad78b6b8af927b36bc3e1b1093e86b7ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.1.0">
-         <artifact name="kotlin-compiler-31.1.0.jar">
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.1.4">
+         <artifact name="kotlin-compiler-31.1.4.jar">
             <sha256 value="59af5f311b8864df211293fe6ba3a8019bb40f5fc226ece7ecbcd0a0614a326b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.1.0">
-         <artifact name="uast-31.1.0.jar">
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.1.4">
+         <artifact name="uast-31.1.4.jar">
             <sha256 value="3cbce06d8859b6d39f498316bb32f542f89631251447b5938e5783a1a6ead79f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.1.0">
-         <artifact name="layoutlib-api-31.1.0.jar">
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.1.4">
+         <artifact name="layoutlib-api-31.1.4.jar">
             <sha256 value="2b8b35a2125b9e11c450bcdb5774aa698b199b4026ae49f28b07c1c2325b5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="31.1.0">
-         <artifact name="lint-31.1.0.jar">
-            <sha256 value="377363a39926aa0b2e2f368f1f846086c3ea4f21e9b94278d0ed933e9a0b37d4" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint" version="31.1.4">
+         <artifact name="lint-31.1.4.jar">
+            <sha256 value="497a4a5c9eab0603c86651aa1e355a9f0fd05171b06af672d11ea999b4f4bf16" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="31.1.0">
-         <artifact name="lint-api-31.1.0.jar">
+      <component group="com.android.tools.lint" name="lint-api" version="31.1.4">
+         <artifact name="lint-api-31.1.4.jar">
             <sha256 value="d0b73b509452c2cb6070d2a11e5ddcd0b6bcad452af7a531bcb095797257930b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="31.1.0">
-         <artifact name="lint-checks-31.1.0.jar">
+      <component group="com.android.tools.lint" name="lint-checks" version="31.1.4">
+         <artifact name="lint-checks-31.1.4.jar">
             <sha256 value="38756dc2929d5fd6decd90680c422ea57736392edf3c1f34b2092168dd9b7952" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="31.1.0">
-         <artifact name="lint-gradle-31.1.0.jar">
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.1.4">
+         <artifact name="lint-gradle-31.1.4.jar">
             <sha256 value="e3bfad176e85b83306f487ca1f70b63b0e2e27e95d3280b8730051c9890d24b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="31.1.0">
-         <artifact name="lint-model-31.1.0.jar">
+      <component group="com.android.tools.lint" name="lint-model" version="31.1.4">
+         <artifact name="lint-model-31.1.4.jar">
             <sha256 value="a37eb5447a242fc3c8ef54e2fa625be4324fcc7807076ddc80db6a08081d31d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.1.0">
-         <artifact name="lint-typedef-remover-31.1.0.jar">
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.1.4">
+         <artifact name="lint-typedef-remover-31.1.4.jar">
             <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.1.0">
-         <artifact name="android-device-provider-ddmlib-31.1.0.jar">
-            <sha256 value="291b0cd5283caf106dfb2a220554a05e8e9a5b1d472e958088b6c61f4a44a9d0" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.1.4">
+         <artifact name="android-device-provider-ddmlib-31.1.4.jar">
+            <sha256 value="a9884c23208883cd767b6d21cc8770b4d637b51fe5e7a57c3960d967e96fa595" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-ddmlib-31.1.0.module">
-            <sha256 value="70b43e2b79736ddfcd6cfd2105cf66fe2949cb473717356ff0a3591d6ada4255" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-31.1.4.module">
+            <sha256 value="0f39dfac5121e7777650c1c17b46328a4bfd23f1bf2db5e87ae3d8ef6036e113" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.1.0">
-         <artifact name="android-device-provider-ddmlib-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.1.4">
+         <artifact name="android-device-provider-ddmlib-proto-31.1.4.jar">
             <sha256 value="1a288dfd22f5baa036bffdfdd3ac7504664b94c86dbf6be36630e5587c22e8fe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.1.0">
-         <artifact name="android-device-provider-gradle-31.1.0.jar">
-            <sha256 value="e979dfbc045186ad46fdcd3f7a099a121faf669e8321cf984562746337f666d3" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.1.4">
+         <artifact name="android-device-provider-gradle-31.1.4.jar">
+            <sha256 value="26eb08fc93e8fb3c4a00a2ecc4dcf1a4936fbf97100418a9909a7cc7441f928c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-gradle-31.1.0.module">
-            <sha256 value="715032ce422c5a13bb18d2c35be59fd16c17aa6811d0275b217daf0644efebd7" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-gradle-31.1.4.module">
+            <sha256 value="ea195139594313cafe3817f21bf637010718bbe298257df28305c8ec65bf1dd9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.1.0">
-         <artifact name="android-device-provider-gradle-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.1.4">
+         <artifact name="android-device-provider-gradle-proto-31.1.4.jar">
             <sha256 value="10f9b620a8403fd6a9c9e9c635c63a7975337b1deb5c375b79a6960eb5af88d4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.1.0">
-         <artifact name="android-test-plugin-host-additional-test-output-31.1.0.jar">
-            <sha256 value="4c2a37ad44b998f22465f28f4eac0211b199781ea857235ed43d213ca8aec6a3" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.1.4">
+         <artifact name="android-test-plugin-host-additional-test-output-31.1.4.jar">
+            <sha256 value="640f48920e3dfaabfa954edf7d359a0e6777b21b9fc26c942b234c5b99060501" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-31.1.0.module">
-            <sha256 value="645e4679f96fec6344c22a290aebe9caacb415a0ebf44d9cef16f2c4d96b23fd" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-31.1.4.module">
+            <sha256 value="f559d36c513b74cbfc21c90591df6f1ef92fff93a0da65110ae35557d6469497" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.1.4.jar">
             <sha256 value="08d12e55fa91ab83dd1b757cdbca3d746809b0a50268f75cf52194f46a2c6673" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.1.0">
-         <artifact name="android-test-plugin-host-apk-installer-31.1.0.jar">
-            <sha256 value="5c043b223a589a3fa631ecefeaa7192483fd10defd7c609ca07f31c6672912a7" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.1.4">
+         <artifact name="android-test-plugin-host-apk-installer-31.1.4.jar">
+            <sha256 value="473db4ec11d91b62ba6e04686967d120b4b45e9a019ba88559735d2f3983d877" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-31.1.0.module">
-            <sha256 value="6408c239b3130bb300e34b72be384410c1e550c42911673647b4fa8b18d33ef5" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-31.1.4.module">
+            <sha256 value="662c9cac04690dc87646d0b9d569e956e53bb421470d24553f36b861a8f55d75" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-apk-installer-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.1.4.jar">
             <sha256 value="abd2aac816a81e2af7705f3edff3de22bcd806212a1d158f432a39b06ae544e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.1.0">
-         <artifact name="android-test-plugin-host-coverage-31.1.0.jar">
-            <sha256 value="089eec62dde4c69c0df614c73a9873cca2052dd6089320f518f1f18b3373aea6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.1.4">
+         <artifact name="android-test-plugin-host-coverage-31.1.4.jar">
+            <sha256 value="6a92db7b2ec36b9e4a537cbe95b1ab5fcb2de449df1a82a7d474bb4e793898ba" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-31.1.0.module">
-            <sha256 value="2e03c3fdea7f9d6f0a912d59b6b954bfdedd8ea04689075ea3442ea73b3c48f2" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-31.1.4.module">
+            <sha256 value="ae604e9cef9a1b90d09f1b7e7b3627ffb766d32395beedb89a52c0c30f6cde62" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-coverage-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-coverage-proto-31.1.4.jar">
             <sha256 value="9ebc9c6279a32a453c90cf6b732b3a3f88a80498e746400850f2c66ea7933580" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.1.0">
-         <artifact name="android-test-plugin-host-device-info-31.1.0.jar">
-            <sha256 value="33e43df378eb7a70a0bc97537ecd0c426f8c481f6487015e4be00092f3603755" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.1.4">
+         <artifact name="android-test-plugin-host-device-info-31.1.4.jar">
+            <sha256 value="8feb61026e28bcdbb56fcd2b8d34c3239378be445a48c8ca5842468ff08f0285" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-31.1.0.module">
-            <sha256 value="6d1df7a2655416781d10a012746027cbfca01cffc13028f7a30505ba14790c39" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-31.1.4.module">
+            <sha256 value="45fa8ac157c252039e96026dc8aed6efd871d1948344ac622f064f4e21c4b25a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-device-info-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-device-info-proto-31.1.4.jar">
             <sha256 value="3d5881c984ba6f7aebf3f79f69842655f7bac9963da68a0fc7f1e940758b4f31" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.1.0">
-         <artifact name="android-test-plugin-host-emulator-control-31.1.0.jar">
-            <sha256 value="9ecdd1dcda2e000a1cc8eacfed454f454ab2d0d3ef440d471d85af42d78eb020" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.1.4">
+         <artifact name="android-test-plugin-host-emulator-control-31.1.4.jar">
+            <sha256 value="3521d691b3a1e648458398a683fd98bffe2d630f3f17b412afbc7eccee6731d1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-31.1.0.module">
-            <sha256 value="3a1602e69e4bad5177b5ae0f1d2ef45248266923ecf22527b487ba06b0460fc2" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-31.1.4.module">
+            <sha256 value="d9edea5d961fc8bec536ba6407b038e7aa4a2c018e2bbe8bc352938741101f28" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-emulator-control-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.1.4.jar">
             <sha256 value="435438bc84016ec5d28c34c9d017b01365f37949168cffc81126d43757c53ca4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.1.0">
-         <artifact name="android-test-plugin-host-logcat-31.1.0.jar">
-            <sha256 value="95076dd661753b0add255a1f8626e370d3c82c4f6a9a8f655cc2683b12af13b6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.1.4">
+         <artifact name="android-test-plugin-host-logcat-31.1.4.jar">
+            <sha256 value="e8412011bbf474868aab8a2015ab5c0eef4bd995f7654411c1de12ab99d53ff7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-31.1.0.module">
-            <sha256 value="1d47b33f8e1f3705b390644af61478bc4911ef5d8c1ca52ddbbff5cc2c028080" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-31.1.4.module">
+            <sha256 value="6b3e521fc47af23000fd9a9f9850ae48017c03d66b7e00735acd6f761fdc8729" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-logcat-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-logcat-proto-31.1.4.jar">
             <sha256 value="d31ca97afbfcd71a54749d265da11a424b122cf1cfbedbff2cb3d7362c579d3b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.1.0">
-         <artifact name="android-test-plugin-host-retention-31.1.0.jar">
-            <sha256 value="a94e3e5854e0c6a669db31c26fd967a6e72da5554449b84a84a427d66292ffc9" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.1.4">
+         <artifact name="android-test-plugin-host-retention-31.1.4.jar">
+            <sha256 value="86a9c9f91f198463185e7056a420ff485aa67be83892359a04a652e4ffab1b33" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-retention-31.1.0.module">
-            <sha256 value="5f5cdb46a5d04523e5b8cf136013ddb4fea27b4275463b1dde2700e652320022" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-retention-31.1.4.module">
+            <sha256 value="fcfddbf992ee232c57c8fde5a96798c9ac094ca1f72bbbee05fbfa37638d68be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.1.0">
-         <artifact name="android-test-plugin-host-retention-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.1.4">
+         <artifact name="android-test-plugin-host-retention-proto-31.1.4.jar">
             <sha256 value="4d1c3faaff5a38b29426f082e8e8c3f8b85a902086b90d18f706754ad93de04d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.1.0">
-         <artifact name="android-test-plugin-result-listener-gradle-31.1.0.jar">
-            <sha256 value="e171a0706257fcd077d09333366bee06b6407fed098b20515cdedc42068e0f2d" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.1.4">
+         <artifact name="android-test-plugin-result-listener-gradle-31.1.4.jar">
+            <sha256 value="8aaac68c544a2f195a48cb34c4cf4eff05e5d378fba2703471386befea108fce" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-31.1.0.module">
-            <sha256 value="af6f8a10edd84d7f65c9ba552a30597ee57f731f961517a10630aaf73fe05f06" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-31.1.4.module">
+            <sha256 value="5e7200d039043d290bd6688510ea3d199f971643292c80a0e02542b3e2faf9f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.1.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-31.1.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.1.4">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.1.4.jar">
             <sha256 value="b1e49ff23fa357f8702aef1632b04405224a3846f4fe76654c76ef9bd7b5a601" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -3408,11 +3408,6 @@
             <sha256 value="3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.7.20">
-         <artifact name="kotlin-reflect-1.7.20.jar">
-            <sha256 value="afe70b6faf6c23f6fedcb0cf88b07cb1778139f4b744ae13b23eb8bbc4ee09f8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.8.20">
          <artifact name="kotlin-reflect-1.8.20.jar">
             <sha256 value="531e3c3f9b0c45f9a21f1642174453066a1066bec0190254a6331b331814ab8b" origin="Generated by Gradle"/>
@@ -3506,11 +3501,6 @@
             <sha256 value="b38ad921299f9365e77a323ec42ebc2e1048c6589af982fbbec0e520f6178036" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.21">
-         <artifact name="kotlin-stdlib-1.8.21.jar">
-            <sha256 value="042a1cd1ac976cdcfe5eb63f1d8e0b0b892c9248e15a69c8cfba495d546ea52a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
          <artifact name="kotlin-stdlib-1.9.10.jar">
             <sha256 value="55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504" origin="Generated by Gradle"/>
@@ -3581,11 +3571,6 @@
             <sha256 value="e398b67977622718bf18ff99b739c7d9da060f33fb458a2e25203221c16af010" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.7.20">
-         <artifact name="kotlin-stdlib-jdk8-1.7.20.jar">
-            <sha256 value="1da0d306c995945e1f807240ef64b5cd2dd5ac58612afb1a8596143d10b7ded5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.20-RC2">
          <artifact name="kotlin-stdlib-jdk8-1.8.20-RC2.jar">
             <sha256 value="83db746a1451310f00a37b915d7106451fd09a27a7621d99411b7bfdd055d2bd" origin="Generated by Gradle"/>
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
index c7b8992292..024522e94a 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
@@ -69,7 +69,7 @@ class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatch
         if (uri != null) {
             contentResolver.openOutputStream(uri).use {
                 try {
-                    this.compress(Bitmap.CompressFormat.JPEG, 50, it)
+                    this.compress(Bitmap.CompressFormat.JPEG, 50, it!!)
                 } catch (e: IOException) {
                     Log.e(testTag, "Unable to store screenshot: ${e.message}")
                 }