diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml index 1f45285aeef2..522567588738 100644 --- a/.github/workflows/android-audit.yml +++ b/.github/workflows/android-audit.yml @@ -84,6 +84,11 @@ jobs: - name: Fix git dir run: git config --global --add safe.directory $(pwd) + - name: Copy maybenot machines to asset directory + run: | + mkdir -p android/app/build/extraAssets + cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines + - name: Re-generate lockfile run: android/scripts/update-lockfile.sh diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index f5e4c22d6bf5..03409dba8688 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,7 +1,5 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties -import com.android.build.gradle.internal.lint.LintModelWriterTask import com.android.build.gradle.internal.tasks.factory.dependsOn -import com.android.build.gradle.tasks.MergeSourceSetFolders import java.io.FileInputStream import java.util.Properties import org.gradle.configurationcache.extensions.capitalized @@ -18,11 +16,11 @@ plugins { } val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath -val extraAssetsDirectory = "${project.buildDir}/extraAssets" -val relayListPath = "$extraAssetsDirectory/relays.json" -val maybenotMachinesDirectory = "$extraAssetsDirectory/maybenot_machines" +val extraAssetsDirectory = layout.buildDirectory.dir("extraAssets").get() +val relayListPath = extraAssetsDirectory.file("relays.json").asFile +val maybenotMachinesFile = extraAssetsDirectory.file("maybenot_machines").asFile val defaultChangelogAssetsDirectory = "$repoRootPath/android/src/main/play/release-notes/" -val extraJniDirectory = "${project.buildDir}/extraJni" +val extraJniDirectory = layout.buildDirectory.dir("extraJni").get() val credentialsPath = "${rootProject.projectDir}/credentials" val keystorePropertiesFile = file("$credentialsPath/keystore.properties") @@ -77,7 +75,7 @@ android { isShrinkResources = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" + "proguard-rules.pro", ) } create(BuildTypes.FDROID) { @@ -144,7 +142,7 @@ android { "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi", // Opt-in option for Koin annotation of KoinComponent. - "-opt-in=kotlin.RequiresOptIn" + "-opt-in=kotlin.RequiresOptIn", ) } @@ -174,7 +172,7 @@ android { "META-INF/LICENSE.md", "META-INF/LICENSE-notice.md", "META-INF/io.netty.versions.properties", - "META-INF/INDEX.LIST" + "META-INF/INDEX.LIST", ) } } @@ -193,7 +191,7 @@ android { buildConfigField( "boolean", "ENABLE_IN_APP_VERSION_NOTIFICATIONS", - enableInAppVersionNotifications + enableInAppVersionNotifications, ) } @@ -229,7 +227,7 @@ android { val createDistBundle = tasks.register("create${capitalizedVariantName}DistBundle") { - from("$buildDir/outputs/bundle/$variantName") + from("${layout.buildDirectory}/outputs/bundle/$variantName") into("${rootDir.parent}/dist") include { it.name.endsWith(".aab") } rename { "$artifactName.aab" } @@ -254,8 +252,6 @@ junitPlatform { } } -composeCompiler { enableStrongSkippingMode = true } - androidComponents { beforeVariants { variantBuilder -> variantBuilder.enable = @@ -279,7 +275,7 @@ configure { tasks.register("ensureRelayListExist") { doLast { - if (!file(relayListPath).exists()) { + if (!relayListPath.exists()) { throw GradleException("Missing relay list: $relayListPath") } } @@ -287,15 +283,15 @@ tasks.register("ensureRelayListExist") { tasks.register("ensureMaybenotMachinesExist") { doLast { - if (!file(maybenotMachinesDirectory).exists()) { - throw GradleException("Missing maybenot machines: $maybenotMachinesDirectory") + if (!maybenotMachinesFile.exists()) { + throw GradleException("Missing maybenot machines: $maybenotMachinesFile") } } } tasks.register("ensureJniDirectoryExist") { doLast { - if (!file(extraJniDirectory).exists()) { + if (!extraJniDirectory.asFile.exists()) { throw GradleException("Missing JNI directory: $extraJniDirectory") } } diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 5964065f2f32..a136aa6fd847 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -27,7 +27,8 @@ buildscript { gradlePluginPortal() } dependencies { - // Dependency class paths are required for Gradle metadata verification to work properly, see: + // Dependency class paths are required for Gradle metadata verification to work properly, + // see: // https://github.com/gradle/gradle/issues/19228s //noinspection UseTomlInstead val aapt = libs.android.gradle.aapt.get().toString() @@ -74,11 +75,7 @@ val baselineFile = file("$rootDir/config/baseline.xml") val configFile = files("$rootDir/config/detekt.yml") val projectSource = file(projectDir) -val detektExcludedPaths = - listOf( - "**/build/**", - "**/mullvad_daemon/management_interface/**", - ) +val detektExcludedPaths = listOf("**/build/**", "**/mullvad_daemon/management_interface/**") detekt { buildUponDefaultConfig = true @@ -127,4 +124,4 @@ tasks.withType { rejectVersionIf { candidate.version.isNonStableVersion() } } -tasks.register("clean", Delete::class) { delete(rootProject.buildDir) } +tasks.register("clean", Delete::class) { delete(rootProject.layout.buildDirectory) } diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml index f2b34872e8e3..ae30e89fff41 100644 --- a/android/config/dependency-check-suppression.xml +++ b/android/config/dependency-check-suppression.xml @@ -8,7 +8,7 @@ ^pkg:maven/org\.jetbrains\.kotlin/kotlin\-stdlib.*@.*$ CVE-2022-24329 - + ^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$ CVE-2018-1000840 - - - ^pkg:maven/androidx\.test\.services/storage@.*$ - CVE-2014-9152 - - - - + + + - - + + @@ -109,12 +109,12 @@ - - - + + + - - + + @@ -149,12 +149,12 @@ - - - + + + - - + + @@ -183,14 +183,6 @@ - - - - - - - - @@ -207,6 +199,14 @@ + + + + + + + + @@ -220,6 +220,14 @@ + + + + + + + + @@ -244,6 +252,14 @@ + + + + + + + + @@ -330,6 +346,11 @@ + + + + + @@ -338,6 +359,14 @@ + + + + + + + + @@ -348,6 +377,11 @@ + + + + + @@ -356,54 +390,51 @@ + + + + + + + + - - - - - - + + + - - - + + + - + - - - + + + - - + + - - - - - - - - - - - + + + - - - + + + - + @@ -421,28 +452,20 @@ - - - - - - - - - - - + + + - + - - - + + + - - + + @@ -450,20 +473,12 @@ - - - + + + - - - - - - - - - + @@ -471,78 +486,52 @@ - - - + + + - - + + - - - - - - + + + - - - - + + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - + + - - - + + + - + - - - + + + - - - - - - - - - - + + @@ -558,57 +547,41 @@ - - - - - - - - - - - - - - - - + + + - + - - - + + + - - + + - - - - - - + + + - - - + + + - + - - - + + + - - + + @@ -680,52 +653,52 @@ - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - - + + @@ -743,33 +716,33 @@ - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -777,57 +750,49 @@ - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - + @@ -835,102 +800,100 @@ - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + - - - + + + - - + + - - - + + + - - - - - - + - - - + + + - - + + @@ -943,100 +906,100 @@ - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -1044,28 +1007,28 @@ - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -1073,28 +1036,28 @@ - - - + + + - - + + - - - + + + - + - - - + + + - - + + @@ -1352,11 +1315,11 @@ - - - + + + - + @@ -1381,12 +1344,12 @@ - - + + - - + + @@ -1397,12 +1360,12 @@ - - + + - - + + @@ -1426,17 +1389,12 @@ - - - + + + - - - - - - - + + @@ -1481,12 +1439,12 @@ - - - + + + - - + + @@ -1510,12 +1468,12 @@ - - - + + + - - + + @@ -1544,17 +1502,12 @@ - - - - - - + + + - - - - + + @@ -1591,11 +1544,11 @@ - - - + + + - + @@ -1607,12 +1560,12 @@ - - - + + + - + @@ -1620,11 +1573,11 @@ - - - + + + - + @@ -1636,28 +1589,28 @@ - - - + + + - + - - + + - - + + - - + + - - + + @@ -1678,11 +1631,11 @@ - - - + + + - + @@ -1694,25 +1647,20 @@ - - - + + + - + - - - + + + - - - - - - - + + @@ -1752,14 +1700,14 @@ - - + + - - + + - + @@ -1771,12 +1719,12 @@ - - - + + + - + @@ -1792,11 +1740,11 @@ - - - + + + - + @@ -1808,28 +1756,28 @@ - - - + + + - + - - + + - - + + - - + + - - + + @@ -1853,12 +1801,12 @@ - - - + + + - - + + @@ -1903,12 +1851,12 @@ - - - + + + - - + + @@ -1916,44 +1864,44 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2296,14 +2244,14 @@ - - - + + + - - - + + + @@ -2777,14 +2725,6 @@ - - - - - - - - @@ -2795,60 +2735,60 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2869,36 +2809,36 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2996,6 +2936,11 @@ + + + + + @@ -3006,9 +2951,9 @@ - - - + + + @@ -3019,33 +2964,33 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -3058,16 +3003,16 @@ - - - - - + + + + + @@ -3118,17 +3063,6 @@ - - - - - - - - - - - @@ -3137,6 +3071,17 @@ + + + + + + + + + + + @@ -3175,6 +3120,11 @@ + + + + + @@ -3200,43 +3150,43 @@ - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3294,12 +3244,12 @@ - - - + + + - - + + @@ -3351,124 +3301,124 @@ - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -3583,9 +3533,9 @@ - - - + + + @@ -3666,6 +3616,19 @@ + + + + + + + + + + + + + @@ -3786,17 +3749,17 @@ - - - + + + - - - + + + - - + + @@ -3812,11 +3775,6 @@ - - - - - @@ -3825,224 +3783,224 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + @@ -4051,9 +4009,9 @@ - - - + + + @@ -4061,9 +4019,9 @@ - - - + + + @@ -4071,9 +4029,9 @@ - - - + + + @@ -4089,9 +4047,9 @@ - - - + + + @@ -4104,9 +4062,9 @@ - - - + + + @@ -4119,38 +4077,38 @@ - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -4391,6 +4349,14 @@ + + + + + + + + @@ -4436,9 +4402,9 @@ - - - + + + @@ -4501,9 +4467,9 @@ - - - + + + @@ -4516,9 +4482,9 @@ - - - + + + @@ -4678,6 +4644,11 @@ + + + + + @@ -4726,6 +4697,14 @@ + + + + + + + + @@ -4762,12 +4741,12 @@ - - - + + + - - + + @@ -4775,9 +4754,9 @@ - - - + + + @@ -4798,14 +4777,14 @@ - - - + + + - - - + + + @@ -4813,9 +4792,9 @@ - - - + + + @@ -4823,9 +4802,9 @@ - - - + + + @@ -4833,19 +4812,19 @@ - - - - - - - - + + + + + + + + @@ -4853,14 +4832,14 @@ - - - + + + - - - + + + @@ -4868,9 +4847,9 @@ - - - + + + @@ -4878,19 +4857,19 @@ - - - - - - - - + + + + + + + + @@ -4901,12 +4880,12 @@ - - - + + + - - + + @@ -4914,9 +4893,9 @@ - - - + + + @@ -4930,15 +4909,15 @@ - - - + + + - - + + - - + + @@ -4949,12 +4928,12 @@ - - + + - - + + @@ -4962,9 +4941,9 @@ - - - + + + @@ -4975,12 +4954,12 @@ - - - + + + - - + + @@ -4988,9 +4967,9 @@ - - - + + + @@ -4998,9 +4977,9 @@ - - - + + + @@ -5008,23 +4987,23 @@ - - - + + + - - - + + + - - + + - - + + - - + + @@ -5032,19 +5011,19 @@ - - - + + + - - - + + + - - - + + + @@ -5082,6 +5061,16 @@ + + + + + + + + + + @@ -5100,19 +5089,19 @@ - - - - - - - - + + + + + + + + @@ -5120,9 +5109,9 @@ - - - + + + @@ -5130,9 +5119,9 @@ - - - + + + @@ -5140,9 +5129,9 @@ - - - + + + @@ -5150,9 +5139,9 @@ - - - + + + @@ -5189,9 +5178,6 @@ - - - @@ -5208,16 +5194,29 @@ - - - - - - + + + + + + + + + + + + + + + + + + + @@ -5243,19 +5242,19 @@ - - - - - - - - + + + + + + + + @@ -5308,6 +5307,11 @@ + + + + + @@ -5353,6 +5357,11 @@ + + + + + @@ -5361,31 +5370,31 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -5393,9 +5402,9 @@ - - - + + + @@ -5403,9 +5412,9 @@ - - - + + + @@ -5413,9 +5422,9 @@ - - - + + + @@ -5487,14 +5496,6 @@ - - - - - - - - @@ -5503,9 +5504,12 @@ - - - + + + + + + @@ -5541,8 +5545,13 @@ - - + + + + + + + @@ -5577,14 +5586,6 @@ - - - - - - - - @@ -5593,17 +5594,12 @@ - - - - - - - - + + + - - + + @@ -5614,25 +5610,17 @@ - - - - - - - - - - - + + + - - + + @@ -5643,6 +5631,14 @@ + + + + + + + + @@ -5682,6 +5678,11 @@ + + + + + @@ -5690,17 +5691,12 @@ - - - + + + - - - - - - - + + @@ -5728,6 +5724,11 @@ + + + + + @@ -5764,11 +5765,6 @@ - - - - - @@ -5881,22 +5877,22 @@ - - - + + + - - - + + + - - + + - - - + + + @@ -5904,19 +5900,14 @@ - - - - - - - - + + + diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts index ea89bc6dcac4..c901bd53dd58 100644 --- a/android/lib/billing/build.gradle.kts +++ b/android/lib/billing/build.gradle.kts @@ -19,9 +19,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = Versions.jvmTarget - } + kotlinOptions { jvmTarget = Versions.jvmTarget } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") @@ -31,11 +29,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", + ) } } } @@ -44,16 +43,16 @@ dependencies { implementation(libs.kotlin.stdlib) implementation(libs.kotlinx.coroutines.android) - //Billing library + // Billing library implementation(libs.android.billingclient) - //Model + // Model implementation(projects.lib.model) - //Payment library + // Payment library implementation(projects.lib.payment) - //Either + // Either implementation(libs.arrow) // Management service diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts index 0f96eca4159f..aa0b13f76c7a 100644 --- a/android/lib/common-test/build.gradle.kts +++ b/android/lib/common-test/build.gradle.kts @@ -24,11 +24,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/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts index 638be8b1224d..2a203102819e 100644 --- a/android/lib/endpoint/build.gradle.kts +++ b/android/lib/endpoint/build.gradle.kts @@ -22,9 +22,7 @@ android { abortOnError = true warningsAsErrors = true } - buildFeatures { - buildConfig = true - } + buildFeatures { buildConfig = true } } dependencies { implementation(libs.kotlin.stdlib) } diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts index 57a16627a13e..6e4b9292d7aa 100644 --- a/android/lib/payment/build.gradle.kts +++ b/android/lib/payment/build.gradle.kts @@ -17,9 +17,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = Versions.jvmTarget - } + kotlinOptions { jvmTarget = Versions.jvmTarget } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") @@ -29,11 +27,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/service/build.gradle.kts b/android/service/build.gradle.kts index 89bcf1e663ca..58d8757df0f1 100644 --- a/android/service/build.gradle.kts +++ b/android/service/build.gradle.kts @@ -8,18 +8,14 @@ android { namespace = "net.mullvad.mullvadvpn.service" compileSdk = Versions.compileSdkVersion - defaultConfig { - minSdk = Versions.minSdkVersion - } + defaultConfig { minSdk = Versions.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") 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 56f85b79d259..a2c743b36005 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 65bd43ed1cd8..26195ecb39dc 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 fa59f81940fd..4250793efc21 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 78994f610aa2..fa24be000e3a 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", + ) } } }