diff options
Diffstat (limited to 'android')
26 files changed, 158 insertions, 169 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 28c9f354b1..0dfc4d9236 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -13,8 +13,7 @@ plugins { alias(libs.plugins.compose) alias(libs.plugins.protobuf.core) alias(libs.plugins.rust.android.gradle) - - id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin + alias(libs.plugins.junit5.android) } val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath @@ -32,14 +31,14 @@ if (keystorePropertiesFile.exists()) { android { namespace = "net.mullvad.mullvadvpn" - compileSdk = Versions.compileSdkVersion - buildToolsVersion = Versions.buildToolsVersion - ndkVersion = Versions.ndkVersion + compileSdk = libs.versions.compile.sdk.get().toInt() + buildToolsVersion = libs.versions.build.tools.get() + ndkVersion = libs.versions.ndk.get() defaultConfig { applicationId = "net.mullvad.mullvadvpn" - minSdk = Versions.minSdkVersion - targetSdk = Versions.targetSdkVersion + minSdk = libs.versions.min.sdk.get().toInt() + targetSdk = libs.versions.target.sdk.get().toInt() versionCode = generateVersionCode() versionName = generateVersionName() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -140,7 +139,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true freeCompilerArgs = listOf( @@ -241,7 +240,7 @@ android { junitPlatform { instrumentationTests { - version.set(Versions.junit5Android) + version.set(libs.versions.junit5.android.asProvider()) includeExtensions.set(true) } } @@ -403,9 +402,9 @@ dependencies { testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockk) testImplementation(libs.turbine) - testImplementation(Dependencies.junitJupiterApi) - testRuntimeOnly(Dependencies.junitJupiterEngine) - testImplementation(Dependencies.junitJupiterParams) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(libs.junit.jupiter.params) // UI test dependencies debugImplementation(libs.compose.ui.test.manifest) @@ -413,6 +412,6 @@ dependencies { androidTestImplementation(libs.kotlin.test) androidTestImplementation(libs.mockk.android) androidTestImplementation(libs.turbine) - androidTestImplementation(Dependencies.junitJupiterApi) - androidTestImplementation(Dependencies.junit5AndroidTestCompose) + androidTestImplementation(libs.junit.jupiter.api) + androidTestImplementation(libs.junit5.android.test.compose) } diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 28007c4ffb..b79254868c 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -28,11 +28,10 @@ buildscript { dependencies { // Dependency class paths are required for Gradle metadata verification to work properly, // see: - // https://github.com/gradle/gradle/issues/19228s + // https://github.com/gradle/gradle/issues/19228 //noinspection UseTomlInstead - val aapt = libs.android.gradle.aapt.get().toString() - val aaptVersion = libs.versions.android.gradle.aapt.get() - val agpVersion = libs.versions.android.gradle.plugin.get() + val (aapt, aaptVersion) = with(libs.android.gradle.aapt.get()) { module to version } + val agpVersion = libs.plugins.android.gradle.plugin.get().version.requiredVersion classpath("$aapt:$agpVersion-$aaptVersion:linux") classpath("$aapt:$agpVersion-$aaptVersion:osx") classpath("$aapt:$agpVersion-$aaptVersion:windows") diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index 066c065f46..0000000000 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,15 +0,0 @@ -object Dependencies { - const val junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junitJupiter}" - const val junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}" - const val junitJupiterParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junitJupiter}" - - const val junit5AndroidPluginId = "de.mannodermaus.android-junit5" - const val junit5AndroidTestCompose = - "de.mannodermaus.junit5:android-test-compose:${Versions.junit5Android}" - const val junit5AndroidTestCore = - "de.mannodermaus.junit5:android-test-core:${Versions.junit5Android}" - const val junit5AndroidTestExtensions = - "de.mannodermaus.junit5:android-test-extensions:${Versions.junit5Android}" - const val junit5AndroidTestRunner = - "de.mannodermaus.junit5:android-test-runner:${Versions.junit5Android}" -} diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 8fd69166e6..0000000000 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,12 +0,0 @@ -object Versions { - const val jvmTarget = "17" - const val compileSdkVersion = 35 - const val buildToolsVersion = "35.0.0" - const val minSdkVersion = 26 - const val targetSdkVersion = 35 - const val ndkVersion = "27.2.12479018" - - const val junitJupiter = "5.12.2" - const val junit5Android = "1.7.0" - const val junit5Plugin = "1.12.2.0" -} diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index cf9e8ed4c7..15561de31d 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,4 +1,12 @@ [versions] + +jvm-target = "17" +compile-sdk = "35" +build-tools = "35.0.0" +min-sdk = "26" +target-sdk = "35" +ndk = "27.2.12479018" + # Android # The android-gradle-aapt plugin version must be in sync with the android plugin version. # Required for Gradle metadata verification to work properly, see: @@ -41,6 +49,10 @@ grpc = "1.72.0" grpc-kotlin = "1.4.1" grpc-kotlin-jar = "1.4.1:jdk8@jar" +junit = "5.12.2" +junit5-android = "1.7.0" +junit5-android-plugin = "1.12.2.0" + # Koin koin = "4.0.4" koin-compose = "4.0.4" @@ -83,7 +95,7 @@ turbine = "1.2.0" [libraries] # Android android-billingclient = { module = "com.android.billingclient:billing-ktx", version.ref = "android-billingclient" } -android-gradle-aapt = { module = "com.android.tools.build:aapt2" } +android-gradle-aapt = { module = "com.android.tools.build:aapt2", version.ref = "android-gradle-aapt" } # AndroidX androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activitycompose" } @@ -133,6 +145,16 @@ grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpc-kotlin" } grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" } +# JUnit +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" } + +junit5-android-test-compose = { module = "de.mannodermaus.junit5:android-test-compose", version.ref = "junit5-android" } +junit5-android-test-core = { module = "de.mannodermaus.junit5:android-test-core", version.ref = "junit5-android" } +junit5-android-test-extensions = { module = "de.mannodermaus.junit5:android-test-extensions", version.ref = "junit5-android" } +junit5-android-test-runner = { module = "de.mannodermaus.junit5:android-test-runner", version.ref = "junit5-android" } + # Protobuf protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" } @@ -184,6 +206,9 @@ android-test = { id = "com.android.test", version.ref = "android-gradle-plugin" # Compose compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +#Junit +junit5-android = { id = "de.mannodermaus.android-junit5", version.ref = "junit5-android-plugin" } + # Kotlin kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts index d9b4c4dc68..69e160f84f 100644 --- a/android/lib/billing/build.gradle.kts +++ b/android/lib/billing/build.gradle.kts @@ -1,17 +1,16 @@ 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.lib.billing" - 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() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -21,7 +20,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } @@ -66,13 +65,13 @@ dependencies { implementation(libs.kermit) // Test dependencies - testRuntimeOnly(Dependencies.junitJupiterEngine) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(projects.lib.commonTest) testImplementation(libs.kotlin.test) testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockk) - testImplementation(Dependencies.junitJupiterApi) + testImplementation(libs.junit.jupiter.api) testImplementation(libs.turbine) androidTestImplementation(projects.lib.commonTest) @@ -80,7 +79,7 @@ dependencies { androidTestImplementation(libs.kotlin.test) androidTestImplementation(libs.kotlinx.coroutines.test) androidTestImplementation(libs.turbine) - androidTestImplementation(Dependencies.junitJupiterApi) - androidTestImplementation(Dependencies.junitJupiterEngine) + androidTestImplementation(libs.junit.jupiter.api) + androidTestImplementation(libs.junit.jupiter.engine) androidTestImplementation(libs.androidx.espresso) } diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts index 733d2b9111..68e05a8ee2 100644 --- a/android/lib/common-test/build.gradle.kts +++ b/android/lib/common-test/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.common.test" - 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 @@ -16,7 +16,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } @@ -41,5 +41,5 @@ android { dependencies { implementation(libs.kotlin.test) implementation(libs.kotlinx.coroutines.test) - implementation(Dependencies.junitJupiterApi) + implementation(libs.junit.jupiter.api) } diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts index 24468d9815..ff8bb7521f 100644 --- a/android/lib/common/build.gradle.kts +++ b/android/lib/common/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.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 } diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts index f3b8799f95..774124a135 100644 --- a/android/lib/daemon-grpc/build.gradle.kts +++ b/android/lib/daemon-grpc/build.gradle.kts @@ -5,16 +5,15 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.protobuf.core) - - id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin + alias(libs.plugins.junit5.android) } android { namespace = "net.mullvad.mullvadvpn.lib.daemon.grpc" - 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 @@ -22,7 +21,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } @@ -83,7 +82,7 @@ dependencies { testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockk) testImplementation(libs.turbine) - testImplementation(Dependencies.junitJupiterApi) - testRuntimeOnly(Dependencies.junitJupiterEngine) - testImplementation(Dependencies.junitJupiterParams) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(libs.junit.jupiter.params) } diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts index 7b6e82b769..fdff5dc202 100644 --- a/android/lib/endpoint/build.gradle.kts +++ b/android/lib/endpoint/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.endpoint" - 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 } diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts index a0253ebc4d..81aecdeda9 100644 --- a/android/lib/map/build.gradle.kts +++ b/android/lib/map/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.map" - 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 } diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts index f83ff3d5d4..c91a930627 100644 --- a/android/lib/model/build.gradle.kts +++ b/android/lib/model/build.gradle.kts @@ -3,17 +3,16 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) alias(libs.plugins.kotlin.ksp) - - id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin + alias(libs.plugins.junit5.android) } android { namespace = "net.mullvad.mullvadvpn.lib.model" - 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() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -23,7 +22,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } @@ -42,10 +41,10 @@ dependencies { ksp(libs.arrow.optics.ksp) // Test dependencies - testRuntimeOnly(Dependencies.junitJupiterEngine) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(libs.kotlin.test) - testImplementation(Dependencies.junitJupiterApi) + testImplementation(libs.junit.jupiter.api) testImplementation(projects.lib.commonTest) } diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts index 02cbcaf0c4..56f4d27047 100644 --- a/android/lib/payment/build.gradle.kts +++ b/android/lib/payment/build.gradle.kts @@ -6,11 +6,11 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.payment" - 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() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -20,7 +20,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts index 7463441274..969f67c9a2 100644 --- a/android/lib/resource/build.gradle.kts +++ b/android/lib/resource/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.resource" - 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 } diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts index 7e2730a9e9..a025a0a72a 100644 --- a/android/lib/shared/build.gradle.kts +++ b/android/lib/shared/build.gradle.kts @@ -2,16 +2,15 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.parcelize) - - id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin + alias(libs.plugins.junit5.android) } android { namespace = "net.mullvad.mullvadvpn.lib.shared" - 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 @@ -19,7 +18,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } @@ -45,9 +44,9 @@ dependencies { testImplementation(libs.kotlin.test) testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.mockk) - testImplementation(Dependencies.junitJupiterApi) - testImplementation(Dependencies.junitJupiterParams) + testImplementation(libs.junit.jupiter.api) + testImplementation(libs.junit.jupiter.params) testImplementation(libs.turbine) testImplementation(projects.lib.commonTest) - testRuntimeOnly(Dependencies.junitJupiterEngine) + testRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts index 24ba625ff2..81747e0c88 100644 --- a/android/lib/talpid/build.gradle.kts +++ b/android/lib/talpid/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.talpid" - 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 } diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts index 9c1ac32b09..3ac5d227e3 100644 --- a/android/lib/theme/build.gradle.kts +++ b/android/lib/theme/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.theme" - 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() } buildFeatures { compose = true } @@ -19,7 +19,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } diff --git a/android/lib/tv/build.gradle.kts b/android/lib/tv/build.gradle.kts index ef6b922da6..aa4eb89bae 100644 --- a/android/lib/tv/build.gradle.kts +++ b/android/lib/tv/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.tv" - 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() } buildFeatures { compose = true } @@ -19,7 +19,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } diff --git a/android/lib/ui/component/build.gradle.kts b/android/lib/ui/component/build.gradle.kts index d41863e495..a63362db66 100644 --- a/android/lib/ui/component/build.gradle.kts +++ b/android/lib/ui/component/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.ui.component" - 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() } buildFeatures { compose = true } @@ -19,7 +19,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } diff --git a/android/lib/ui/tag/build.gradle.kts b/android/lib/ui/tag/build.gradle.kts index 5816277ffb..1d08f395f9 100644 --- a/android/lib/ui/tag/build.gradle.kts +++ b/android/lib/ui/tag/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.lib.ui.tag" - 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 @@ -16,7 +16,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts index 004e7a9d7b..5ec1fa7d84 100644 --- a/android/service/build.gradle.kts +++ b/android/service/build.gradle.kts @@ -6,11 +6,11 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.service" - 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() val shouldRequireBundleRelayFile = isReleaseBuild() && !isDevBuild() buildConfigField( "Boolean", @@ -25,7 +25,7 @@ android { } kotlinOptions { - jvmTarget = Versions.jvmTarget + jvmTarget = libs.versions.jvm.target.get() allWarningsAsErrors = true } 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 diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts index 816c7de883..a8fc409e1b 100644 --- a/android/tile/build.gradle.kts +++ b/android/tile/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "net.mullvad.mullvadvpn.tile" - 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 } |