Migrate to version catalogs

4 files changed, 67 insertions, 66 deletions

diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts
index d2debc07dd..01922ac2de 100644
--- a/android/test/arch/build.gradle.kts
+++ b/android/test/arch/build.gradle.kts
@@ -1,14 +1,15 @@
 plugins {
-    id(Dependencies.Plugin.androidLibraryId)
-    id(Dependencies.Plugin.kotlinAndroidId)
-    id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+
+    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.arch"
-    compileSdk = Versions.Android.compileSdkVersion
+    compileSdk = Versions.compileSdkVersion
 
-    defaultConfig { minSdk = Versions.Android.minSdkVersion }
+    defaultConfig { minSdk = Versions.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -29,11 +30,11 @@ androidComponents {
 }
 
 dependencies {
-    testRuntimeOnly(Dependencies.junitEngine)
+    testRuntimeOnly(Dependencies.junitJupiterEngine)
 
-    testImplementation(Dependencies.Compose.uiToolingAndroidPreview)
-    testImplementation(Dependencies.Compose.destinations)
-    testImplementation(Dependencies.AndroidX.appcompat)
-    testImplementation(Dependencies.junitApi)
-    testImplementation(Dependencies.konsist)
+    testImplementation(libs.compose.ui.tooling.android.preview)
+    testImplementation(libs.compose.destinations)
+    testImplementation(libs.androidx.appcompat)
+    testImplementation(Dependencies.junitJupiterApi)
+    testImplementation(libs.konsist)
 }
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 84a7a46c9c..65bd43ed1c 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
-    id(Dependencies.Plugin.androidLibraryId)
-    id(Dependencies.Plugin.kotlinAndroidId)
-    id(Dependencies.Plugin.kotlinParcelizeId)
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.common"
-    compileSdk = Versions.Android.compileSdkVersion
+    compileSdk = Versions.compileSdkVersion
 
-    defaultConfig { minSdk = Versions.Android.minSdkVersion }
+    defaultConfig { minSdk = Versions.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -41,15 +41,15 @@ androidComponents {
 }
 
 dependencies {
-    implementation(project(Dependencies.Mullvad.endpointLib))
+    implementation(projects.lib.endpoint)
 
-    implementation(Dependencies.AndroidX.testCore)
-    implementation(Dependencies.AndroidX.testRunner)
-    implementation(Dependencies.AndroidX.testRules)
-    implementation(Dependencies.AndroidX.testUiAutomator)
-    implementation(Dependencies.junitEngine)
-    implementation(Dependencies.kermit)
-    implementation(Dependencies.Kotlin.stdlib)
+    implementation(libs.androidx.test.core)
+    implementation(libs.androidx.test.runner)
+    implementation(libs.androidx.test.rules)
+    implementation(libs.androidx.test.uiautomator)
+    implementation(Dependencies.junitJupiterEngine)
+    implementation(libs.kermit)
+    implementation(libs.kotlin.stdlib)
 
-    androidTestUtil(Dependencies.AndroidX.testOrchestrator)
+    androidTestUtil(libs.androidx.test.orchestrator)
 }
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index f7afe1b3af..2e9d19b83c 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -3,17 +3,18 @@ import java.util.Properties
 import org.gradle.configurationcache.extensions.capitalized
 
 plugins {
-    id(Dependencies.Plugin.androidTestId)
-    id(Dependencies.Plugin.kotlinAndroidId)
-    id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
+    alias(libs.plugins.android.test)
+    alias(libs.plugins.kotlin.android)
+
+    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.e2e"
-    compileSdk = Versions.Android.compileSdkVersion
+    compileSdk = Versions.compileSdkVersion
 
     defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
+        minSdk = Versions.minSdkVersion
         testApplicationId = "net.mullvad.mullvadvpn.test.e2e"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["runnerBuilder"] =
@@ -125,21 +126,20 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
 }
 
 dependencies {
-    implementation(project(Projects.testCommon))
-    implementation(project(Dependencies.Mullvad.endpointLib))
-    implementation(Dependencies.AndroidX.testCore)
+    implementation(projects.test.common)
+    implementation(projects.lib.endpoint)
+    implementation(libs.androidx.test.core)
     // Fixes: https://github.com/android/android-test/issues/1589
-    implementation(Dependencies.AndroidX.testMonitor)
-    implementation(Dependencies.AndroidX.testRunner)
-    implementation(Dependencies.AndroidX.testRules)
-    implementation(Dependencies.AndroidX.testUiAutomator)
-    implementation(Dependencies.androidVolley)
-    implementation(Dependencies.kermit)
-    implementation(Dependencies.junitAndroidTestExtensions)
-    implementation(Dependencies.junitApi)
-    implementation(Dependencies.junitAndroidTestCore)
-    implementation(Dependencies.junitAndroidTestRunner)
-    implementation(Dependencies.Kotlin.stdlib)
+    implementation(libs.androidx.test.monitor)
+    implementation(libs.androidx.test.runner)
+    implementation(libs.androidx.test.rules)
+    implementation(libs.androidx.test.uiautomator)
+    implementation(libs.android.volley)
+    implementation(libs.kermit)
+    implementation(Dependencies.junitJupiterApi)
+    implementation(Dependencies.junit5AndroidTestExtensions)
+    implementation(Dependencies.junit5AndroidTestRunner)
+    implementation(libs.kotlin.stdlib)
 
-    androidTestUtil(Dependencies.AndroidX.testOrchestrator)
+    androidTestUtil(libs.androidx.test.orchestrator)
 }
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 69991d24bb..cc13c6dbed 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -1,15 +1,16 @@
 plugins {
-    id(Dependencies.Plugin.androidTestId)
-    id(Dependencies.Plugin.kotlinAndroidId)
-    id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
+    alias(libs.plugins.android.test)
+    alias(libs.plugins.kotlin.android)
+
+    id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
 }
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.mockapi"
-    compileSdk = Versions.Android.compileSdkVersion
+    compileSdk = Versions.compileSdkVersion
 
     defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
+        minSdk = Versions.minSdkVersion
         testApplicationId = "net.mullvad.mullvadvpn.test.mockapi"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["runnerBuilder"] =
@@ -69,23 +70,22 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
 }
 
 dependencies {
-    implementation(project(Projects.testCommon))
-    implementation(project(Dependencies.Mullvad.endpointLib))
+    implementation(projects.lib.endpoint)
+    implementation(projects.test.common)
 
-    implementation(Dependencies.AndroidX.testCore)
+    implementation(libs.androidx.test.core)
     // Fixes: https://github.com/android/android-test/issues/1589
-    implementation(Dependencies.AndroidX.testMonitor)
-    implementation(Dependencies.AndroidX.testRunner)
-    implementation(Dependencies.AndroidX.testRules)
-    implementation(Dependencies.AndroidX.testUiAutomator)
-    implementation(Dependencies.kermit)
-    implementation(Dependencies.jodaTime)
-    implementation(Dependencies.junitAndroidTestExtensions)
-    implementation(Dependencies.junitApi)
-    implementation(Dependencies.junitAndroidTestCore)
-    implementation(Dependencies.junitAndroidTestRunner)
-    implementation(Dependencies.Kotlin.stdlib)
-    implementation(Dependencies.mockkWebserver)
+    implementation(libs.androidx.test.monitor)
+    implementation(libs.androidx.test.runner)
+    implementation(libs.androidx.test.rules)
+    implementation(libs.androidx.test.uiautomator)
+    implementation(libs.kermit)
+    implementation(libs.jodatime)
+    implementation(Dependencies.junitJupiterApi)
+    implementation(Dependencies.junit5AndroidTestExtensions)
+    implementation(Dependencies.junit5AndroidTestRunner)
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.mockkWebserver)
 
-    androidTestUtil(Dependencies.AndroidX.testOrchestrator)
+    androidTestUtil(libs.androidx.test.orchestrator)
 }