diff options
| author | Albin <albin@mullvad.net> | 2023-05-12 16:02:55 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-09-21 18:30:51 +0200 |
| commit | 8066e42cff442207830ed05e6db1395e34c2d1db (patch) | |
| tree | fac0fbd6bd1c28204014d5b57ef3cd6cddf0cd89 /android/test | |
| parent | 2b2dbded60ba1e03112781dc6a04705e08286805 (diff) | |
| download | mullvadvpn-8066e42cff442207830ed05e6db1395e34c2d1db.tar.xz mullvadvpn-8066e42cff442207830ed05e6db1395e34c2d1db.zip | |
Apply automatic formatting and cleanup of gradle files
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/test/common/build.gradle.kts | 14 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 30 | ||||
| -rw-r--r-- | android/test/mockapi/build.gradle.kts | 8 |
4 files changed, 18 insertions, 35 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..311742c412 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") @@ -29,11 +25,7 @@ android { } androidComponents { - beforeVariants { variantBuilder -> - variantBuilder.apply { - enable = name != "release" - } - } + beforeVariants { variantBuilder -> variantBuilder.apply { enable = name != "release" } } } dependencies { diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 6e8f5a0eb9..104f17bceb 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -18,11 +18,7 @@ android { 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 +28,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") diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts index 274892a703..dd08cd66a5 100644 --- a/android/test/mockapi/build.gradle.kts +++ b/android/test/mockapi/build.gradle.kts @@ -20,18 +20,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") |
