diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-27 10:47:04 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-29 14:23:33 +0100 |
| commit | cea1ed7b1a8aafab9280fefd019f405463f3c3ca (patch) | |
| tree | 2b9f97cb272951853c2bfccf75973f311330782d /android/buildSrc/src | |
| parent | 6c0dd68310036e52d92027810effbaeb530548fc (diff) | |
| download | mullvadvpn-cea1ed7b1a8aafab9280fefd019f405463f3c3ca.tar.xz mullvadvpn-cea1ed7b1a8aafab9280fefd019f405463f3c3ca.zip | |
Implement detekt and ktfmt for buildSrc
Diffstat (limited to 'android/buildSrc/src')
| -rw-r--r-- | android/buildSrc/src/main/kotlin/BuildVariants.kt | 8 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Extensions.kt | 7 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Utils.kt | 19 |
3 files changed, 19 insertions, 15 deletions
diff --git a/android/buildSrc/src/main/kotlin/BuildVariants.kt b/android/buildSrc/src/main/kotlin/BuildVariants.kt index 4595cf5b9d..7ca8368ad4 100644 --- a/android/buildSrc/src/main/kotlin/BuildVariants.kt +++ b/android/buildSrc/src/main/kotlin/BuildVariants.kt @@ -44,11 +44,7 @@ val enabledAppVariantTriples = Triple(PLAY, DEVMOLE, DEBUG), Triple(PLAY, DEVMOLE, RELEASE), Triple(PLAY, STAGEMOLE, DEBUG), - Triple(PLAY, STAGEMOLE, RELEASE) + Triple(PLAY, STAGEMOLE, RELEASE), ) -val enabledE2eVariantTriples = - listOf( - Triple(OSS, PROD, DEBUG), - Triple(PLAY, STAGEMOLE, DEBUG) - ) +val enabledE2eVariantTriples = listOf(Triple(OSS, PROD, DEBUG), Triple(PLAY, STAGEMOLE, DEBUG)) diff --git a/android/buildSrc/src/main/kotlin/Extensions.kt b/android/buildSrc/src/main/kotlin/Extensions.kt index b81a40537b..400df4406e 100644 --- a/android/buildSrc/src/main/kotlin/Extensions.kt +++ b/android/buildSrc/src/main/kotlin/Extensions.kt @@ -4,9 +4,10 @@ import org.gradle.api.artifacts.dsl.DependencyHandler fun String.isNonStableVersion(): Boolean { val nonStableQualifiers = listOf("alpha", "beta", "rc") - val isNonStable = nonStableQualifiers - .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") } - .any { it.matches(this) } + val isNonStable = + nonStableQualifiers + .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") } + .any { it.matches(this) } return isNonStable } diff --git a/android/buildSrc/src/main/kotlin/Utils.kt b/android/buildSrc/src/main/kotlin/Utils.kt index 514d511c03..b442ad453a 100644 --- a/android/buildSrc/src/main/kotlin/Utils.kt +++ b/android/buildSrc/src/main/kotlin/Utils.kt @@ -33,11 +33,18 @@ fun Project.generateRemapArguments(): String { } private fun Project.execVersionCodeCargoCommand() = - providers.exec { - commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionCode") - }.standardOutput.asText.get().trim().toInt() + providers + .exec { commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionCode") } + .standardOutput + .asText + .get() + .trim() + .toInt() private fun Project.execVersionNameCargoCommand() = - providers.exec { - commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionName") - }.standardOutput.asText.get().trim() + providers + .exec { commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionName") } + .standardOutput + .asText + .get() + .trim() |