Merge branch 'improve-gradle-variant-configuration-droid-18'

4 files changed, 24 insertions, 34 deletions

diff --git a/android/test/build.gradle.kts b/android/test/build.gradle.kts
index e69de29bb2..8b13789179 100644
--- a/android/test/build.gradle.kts
+++ b/android/test/build.gradle.kts
@@ -0,0 +1 @@
+
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 941e79f757..99fcb9d2a7 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.mullvadvpn.test.common"
     compileSdk = Versions.Android.compileSdkVersion
 
-    defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
-    }
+    defaultConfig { minSdk = Versions.Android.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
-    }
+    kotlinOptions { jvmTarget = Versions.jvmTarget }
 
     lint {
         lintConfig = file("${rootProject.projectDir}/config/lint.xml")
@@ -30,9 +26,7 @@ android {
 
 androidComponents {
     beforeVariants { variantBuilder ->
-        variantBuilder.apply {
-            enable = name != "release"
-        }
+        variantBuilder.apply { enable = name != BuildTypes.RELEASE }
     }
 }
 
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index 6e8f5a0eb9..8e24974fcd 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -16,13 +16,12 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
 
+        missingDimensionStrategy(FlavorDimensions.BILLING, Flavors.OSS)
+        missingDimensionStrategy(FlavorDimensions.INFRASTRUCTURE, Flavors.PROD)
+
         fun Properties.addRequiredPropertyAsBuildConfigField(name: String) {
             val value = getProperty(name) ?: throw GradleException("Missing property: $name")
-            buildConfigField(
-                type = "String",
-                name = name,
-                value = "\"$value\""
-            )
+            buildConfigField(type = "String", name = name, value = "\"$value\"")
         }
 
         Properties().apply {
@@ -32,33 +31,31 @@ android {
         }
 
         fun MutableMap<String, String>.addOptionalPropertyAsArgument(name: String) {
-            val value = rootProject.properties.getOrDefault(name, null) as? String
-                ?: gradleLocalProperties(rootProject.projectDir).getProperty(name)
+            val value =
+                rootProject.properties.getOrDefault(name, null) as? String
+                    ?: gradleLocalProperties(rootProject.projectDir).getProperty(name)
 
             if (value != null) {
                 put(name, value)
             }
         }
 
-        testInstrumentationRunnerArguments += mutableMapOf<String, String>().apply {
-            put("clearPackageData", "true")
-            addOptionalPropertyAsArgument("valid_test_account_token")
-            addOptionalPropertyAsArgument("invalid_test_account_token")
-        }
+        testInstrumentationRunnerArguments +=
+            mutableMapOf<String, String>().apply {
+                put("clearPackageData", "true")
+                addOptionalPropertyAsArgument("valid_test_account_token")
+                addOptionalPropertyAsArgument("invalid_test_account_token")
+            }
     }
 
-    testOptions {
-        execution = "ANDROIDX_TEST_ORCHESTRATOR"
-    }
+    testOptions { execution = "ANDROIDX_TEST_ORCHESTRATOR" }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
-    }
+    kotlinOptions { jvmTarget = Versions.jvmTarget }
 
     lint {
         lintConfig = file("${rootProject.projectDir}/config/lint.xml")
@@ -79,7 +76,6 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
 dependencies {
     implementation(project(Projects.testCommon))
     implementation(project(Dependencies.Mullvad.endpointLib))
-
     implementation(Dependencies.AndroidX.testCore)
     // Fixes: https://github.com/android/android-test/issues/1589
     implementation(Dependencies.AndroidX.testMonitor)
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 274892a703..8be38fdcbc 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -13,6 +13,9 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
 
+        missingDimensionStrategy(FlavorDimensions.BILLING, Flavors.OSS)
+        missingDimensionStrategy(FlavorDimensions.INFRASTRUCTURE, Flavors.PROD)
+
         testInstrumentationRunnerArguments.putAll(
             mapOf(
                 "clearPackageData" to "true",
@@ -20,18 +23,14 @@ android {
         )
     }
 
-    testOptions {
-        execution = "ANDROIDX_TEST_ORCHESTRATOR"
-    }
+    testOptions { execution = "ANDROIDX_TEST_ORCHESTRATOR" }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
-    }
+    kotlinOptions { jvmTarget = Versions.jvmTarget }
 
     lint {
         lintConfig = file("${rootProject.projectDir}/config/lint.xml")