Bump gradle dependencies

5 files changed, 29 insertions, 20 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 96163dfb76..5afb5659d9 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -228,6 +228,8 @@ dependencies {
 
     // UI test dependencies
     debugImplementation(Dependencies.AndroidX.fragmentTestning)
+    // 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)
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index c6ae770969..766ff818cb 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -1,6 +1,6 @@
 package net.mullvad.mullvadvpn.viewmodel
 
-import app.cash.turbine.FlowTurbine
+import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
@@ -173,7 +173,7 @@ class LoginViewModelTest {
         verify { mockedAccountRepository.clearAccountHistory() }
     }
 
-    private suspend fun <T> FlowTurbine<T>.skipDefaultItem() where T : Any? {
+    private suspend fun <T> ReceiveTurbine<T>.skipDefaultItem() where T : Any? {
         awaitItem()
     }
 
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 47244ced3a..05c1127732 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -29,14 +29,16 @@ object Dependencies {
             "androidx.test.espresso:espresso-contrib:${Versions.AndroidX.espresso}"
         const val testCore =
             "androidx.test:core:${Versions.AndroidX.test}"
+        const val testMonitor =
+            "androidx.test:monitor:${Versions.AndroidX.testMonitor}"
         const val testRunner =
-            "androidx.test:runner:${Versions.AndroidX.test}"
+            "androidx.test:runner:${Versions.AndroidX.testRunner}"
         const val testRules =
             "androidx.test:rules:${Versions.AndroidX.test}"
         const val testUiAutomator =
             "androidx.test.uiautomator:uiautomator:${Versions.AndroidX.uiautomator}"
         const val testOrchestrator =
-            "androidx.test:orchestrator:${Versions.AndroidX.test}"
+            "androidx.test:orchestrator:${Versions.AndroidX.testOrchestrator}"
     }
 
     object Compose {
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 0edd0adba9..f748d079c9 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -1,42 +1,45 @@
 object Versions {
     const val commonsValidator = "1.7"
-    const val jodaTime = "2.10.14"
+    const val jodaTime = "2.12.2"
     const val junit = "4.13.2"
     const val jvmTarget = "1.8"
     const val koin = "2.2.3"
     const val kotlin = "1.7.20"
     const val kotlinCompilerExtensionVersion = "1.3.2"
     const val kotlinx = "1.6.4"
-    const val leakCanary = "2.8.1"
-    const val mockk = "1.12.3"
-    const val turbine = "0.7.0"
+    const val leakCanary = "2.10"
+    const val mockk = "1.13.3"
+    const val turbine = "0.12.1"
 
     object Android {
         const val compileSdkVersion = 33
-        const val material = "1.4.0"
+        const val material = "1.7.0"
         const val minSdkVersion = 26
         const val targetSdkVersion = 33
         const val volley = "1.2.1"
     }
 
     object AndroidX {
-        const val appcompat = "1.3.1"
-        const val coreKtx = "1.6.0"
-        const val constraintlayout = "2.1.3"
-        const val coordinatorlayout = "1.1.0"
-        const val espresso = "3.3.0"
-        const val lifecycle = "2.4.1"
-        const val fragment = "1.4.1"
+        const val appcompat = "1.5.1"
+        const val coreKtx = "1.9.0"
+        const val constraintlayout = "2.1.4"
+        const val coordinatorlayout = "1.2.0"
+        const val espresso = "3.5.0"
+        const val lifecycle = "2.5.1"
+        const val fragment = "1.5.4"
         const val recyclerview = "1.2.1"
         const val junit = "1.1.4"
-        const val test = "1.4.0"
+        const val test = "1.5.0"
+        const val testMonitor = "1.6.0"
+        const val testOrchestrator = "1.4.2"
+        const val testRunner = "1.5.1"
         const val uiautomator = "2.2.0"
     }
 
     object Compose {
-        const val base = "1.1.1"
-        const val viewModelLifecycle = "2.4.1"
-        const val uiController = "0.23.1"
+        const val base = "1.3.1"
+        const val viewModelLifecycle = "2.5.1"
+        const val uiController = "0.28.0"
         const val constrainLayout = "1.0.1"
     }
 
diff --git a/android/e2e/build.gradle.kts b/android/e2e/build.gradle.kts
index 101f9233e8..1ea4f94058 100644
--- a/android/e2e/build.gradle.kts
+++ b/android/e2e/build.gradle.kts
@@ -106,6 +106,8 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
 
 dependencies {
     implementation(Dependencies.AndroidX.testCore)
+    // Fixes: https://github.com/android/android-test/issues/1589
+    implementation(Dependencies.AndroidX.testMonitor)
     implementation(Dependencies.AndroidX.testOrchestrator)
     implementation(Dependencies.AndroidX.testRunner)
     implementation(Dependencies.AndroidX.testRules)