Merge branch 'bump-dependencies'

4 files changed, 24 insertions, 37 deletions

diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt
index 56f85b79d2..a2c743b360 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt
@@ -14,7 +14,8 @@ class JUnitTest {
             .functions()
             .filter {
                 it.annotations.any { annotation ->
-                    annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$"))
+                    annotation.fullyQualifiedName?.matches(Regex("org.junit((?!jupiter).)*\$"))
+                        ?: false
                 }
             }
             .assertEmpty()
@@ -25,7 +26,8 @@ class JUnitTest {
             .classes()
             .filter {
                 it.annotations.any { annotation ->
-                    annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$"))
+                    annotation.fullyQualifiedName?.matches(Regex("org.junit((?!jupiter).)*\$"))
+                        ?: false
                 }
             }
             .assertEmpty()
@@ -47,18 +49,7 @@ class JUnitTest {
     }
 
     private fun allNonAndroidTests() =
-        Konsist.scopeFromTest()
-            .functions()
-            .withAnnotationOf(Test::class)
-            .filter { it.sourceSetName != "androidTest" }
-            .filter { function ->
-                ignoredTestPackages.none { function.packagee!!.fullyQualifiedName.startsWith(it) }
-            }
-
-    companion object {
-        // The following packages are not following the naming convention since they are android
-        // test that does not support spaces in function names.
-        private val ignoredTestPackages =
-            listOf("net.mullvad.mullvadvpn.test.e2e", "net.mullvad.mullvadvpn.test.mockapi")
-    }
+        Konsist.scopeFromTest().functions().withAnnotationOf(Test::class).filter {
+            it.sourceSetName != "androidTest"
+        }
 }
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 65bd43ed1c..26195ecb39 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -25,11 +25,12 @@ android {
 
     packaging {
         resources {
-            pickFirsts += setOf(
-                // Fixes packaging error caused by: jetified-junit-*
-                "META-INF/LICENSE.md",
-                "META-INF/LICENSE-notice.md"
-            )
+            pickFirsts +=
+                setOf(
+                    // Fixes packaging error caused by: jetified-junit-*
+                    "META-INF/LICENSE.md",
+                    "META-INF/LICENSE-notice.md",
+                )
         }
     }
 }
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index fa59f81940..4250793efc 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -61,7 +61,7 @@ android {
             buildConfigField(
                 type = "String",
                 name = "INFRASTRUCTURE_BASE_DOMAIN",
-                value = "\"mullvad.net\""
+                value = "\"mullvad.net\"",
             )
         }
         create(Flavors.STAGEMOLE) {
@@ -69,7 +69,7 @@ android {
             buildConfigField(
                 type = "String",
                 name = "INFRASTRUCTURE_BASE_DOMAIN",
-                value = "\"stagemole.eu\""
+                value = "\"stagemole.eu\"",
             )
         }
     }
@@ -95,13 +95,11 @@ android {
                 setOf(
                     // Fixes packaging error caused by: jetified-junit-*
                     "META-INF/LICENSE.md",
-                    "META-INF/LICENSE-notice.md"
+                    "META-INF/LICENSE-notice.md",
                 )
         }
     }
-    buildFeatures {
-        buildConfig = true
-    }
+    buildFeatures { buildConfig = true }
 }
 
 androidComponents {
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 78994f610a..fa24be000e 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -20,11 +20,7 @@ android {
         missingDimensionStrategy(FlavorDimensions.BILLING, Flavors.OSS)
         missingDimensionStrategy(FlavorDimensions.INFRASTRUCTURE, Flavors.PROD)
 
-        testInstrumentationRunnerArguments.putAll(
-            mapOf(
-                "clearPackageData" to "true",
-            )
-        )
+        testInstrumentationRunnerArguments.putAll(mapOf("clearPackageData" to "true"))
     }
 
     flavorDimensions += FlavorDimensions.BILLING
@@ -51,11 +47,12 @@ android {
 
     packaging {
         resources {
-            pickFirsts += setOf(
-                // Fixes packaging error caused by: jetified-junit-*
-                "META-INF/LICENSE.md",
-                "META-INF/LICENSE-notice.md"
-            )
+            pickFirsts +=
+                setOf(
+                    // Fixes packaging error caused by: jetified-junit-*
+                    "META-INF/LICENSE.md",
+                    "META-INF/LICENSE-notice.md",
+                )
         }
     }
 }