4 files changed, 31 insertions, 34 deletions
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts
index e84d725f87..11503955d7 100644
--- a/android/test/arch/build.gradle.kts
+++ b/android/test/arch/build.gradle.kts
@@ -1,16 +1,15 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-
-    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
+    alias(libs.plugins.junit5.android)
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.arch"
-    compileSdk = Versions.compileSdkVersion
-    buildToolsVersion = Versions.buildToolsVersion
+    compileSdk = libs.versions.compile.sdk.get().toInt()
+    buildToolsVersion = libs.versions.build.tools.get()
 
-    defaultConfig { minSdk = Versions.minSdkVersion }
+    defaultConfig { minSdk = libs.versions.min.sdk.get().toInt() }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -18,7 +17,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+        jvmTarget = libs.versions.jvm.target.get()
         allWarningsAsErrors = true
     }
 
@@ -34,11 +33,11 @@ androidComponents {
 }
 
 dependencies {
-    testRuntimeOnly(Dependencies.junitJupiterEngine)
+    testRuntimeOnly(libs.junit.jupiter.engine)
 
     testImplementation(libs.compose.ui.tooling.android.preview)
     testImplementation(libs.compose.destinations)
     testImplementation(libs.androidx.appcompat)
-    testImplementation(Dependencies.junitJupiterApi)
+    testImplementation(libs.junit.jupiter.api)
     testImplementation(libs.konsist)
 }
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index a479efadf2..0a089017af 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.common"
-    compileSdk = Versions.compileSdkVersion
-    buildToolsVersion = Versions.buildToolsVersion
+    compileSdk = libs.versions.compile.sdk.get().toInt()
+    buildToolsVersion = libs.versions.build.tools.get()
 
-    defaultConfig { minSdk = Versions.minSdkVersion }
+    defaultConfig { minSdk = libs.versions.min.sdk.get().toInt() }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -17,7 +17,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+        jvmTarget = libs.versions.jvm.target.get()
         allWarningsAsErrors = true
     }
 
@@ -53,7 +53,7 @@ dependencies {
     implementation(libs.androidx.test.runner)
     implementation(libs.androidx.test.rules)
     implementation(libs.androidx.test.uiautomator)
-    implementation(Dependencies.junitJupiterEngine)
+    implementation(libs.junit.jupiter.engine)
     implementation(libs.kermit)
     implementation(libs.kotlin.stdlib)
 
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index debd5ff9b6..b342aadc16 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -4,17 +4,16 @@ plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlinx.serialization)
-
-    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
+    alias(libs.plugins.junit5.android)
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.e2e"
-    compileSdk = Versions.compileSdkVersion
-    buildToolsVersion = Versions.buildToolsVersion
+    compileSdk = libs.versions.compile.sdk.get().toInt()
+    buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig {
-        minSdk = Versions.minSdkVersion
+        minSdk = libs.versions.min.sdk.get().toInt()
         testApplicationId = "net.mullvad.mullvadvpn.test.e2e"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["runnerBuilder"] =
@@ -65,7 +64,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+        jvmTarget = libs.versions.jvm.target.get()
         allWarningsAsErrors = true
     }
 
@@ -90,7 +89,7 @@ android {
 
 junitPlatform {
     instrumentationTests {
-        version.set(Versions.junit5Android)
+        version.set(libs.versions.junit5.android.asProvider())
         includeExtensions.set(true)
     }
 }
@@ -119,9 +118,9 @@ dependencies {
     implementation(libs.androidx.test.rules)
     implementation(libs.androidx.test.uiautomator)
     implementation(libs.kermit)
-    implementation(Dependencies.junitJupiterApi)
-    implementation(Dependencies.junit5AndroidTestExtensions)
-    implementation(Dependencies.junit5AndroidTestRunner)
+    implementation(libs.junit.jupiter.api)
+    implementation(libs.junit5.android.test.extensions)
+    implementation(libs.junit5.android.test.runner)
     implementation(libs.kotlin.stdlib)
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.cio)
@@ -134,7 +133,7 @@ dependencies {
     androidTestUtil(libs.androidx.test.orchestrator)
 
     // Needed or else the app crashes when launched
-    implementation(Dependencies.junit5AndroidTestCompose)
+    implementation(libs.junit5.android.test.compose)
     implementation(libs.compose.material3)
 
     // Need these for forcing later versions of dependencies
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index a384fe61f0..2a96d32028 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -1,17 +1,16 @@
 plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
-
-    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
+    alias(libs.plugins.junit5.android)
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.mockapi"
-    compileSdk = Versions.compileSdkVersion
-    buildToolsVersion = Versions.buildToolsVersion
+    compileSdk = libs.versions.compile.sdk.get().toInt()
+    buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig {
-        minSdk = Versions.minSdkVersion
+        minSdk = libs.versions.min.sdk.get().toInt()
         testApplicationId = "net.mullvad.mullvadvpn.test.mockapi"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["runnerBuilder"] =
@@ -39,7 +38,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = Versions.jvmTarget
+        jvmTarget = libs.versions.jvm.target.get()
         allWarningsAsErrors = true
     }
 
@@ -73,16 +72,16 @@ dependencies {
     implementation(libs.androidx.test.rules)
     implementation(libs.androidx.test.uiautomator)
     implementation(libs.kermit)
-    implementation(Dependencies.junitJupiterApi)
-    implementation(Dependencies.junit5AndroidTestExtensions)
-    implementation(Dependencies.junit5AndroidTestRunner)
+    implementation(libs.junit.jupiter.api)
+    implementation(libs.junit5.android.test.extensions)
+    implementation(libs.junit5.android.test.runner)
     implementation(libs.kotlin.stdlib)
     implementation(libs.mockkWebserver)
 
     androidTestUtil(libs.androidx.test.orchestrator)
 
     // Needed or else the app crashes when launched
-    implementation(Dependencies.junit5AndroidTestCompose)
+    implementation(libs.junit5.android.test.compose)
     implementation(libs.compose.material3)
 
     // Need these for forcing later versions of dependencies