Implement detekt and ktfmt for buildSrc

7 files changed, 41 insertions, 17 deletions

diff --git a/.github/workflows/android-kotlin-format-check.yml b/.github/workflows/android-kotlin-format-check.yml
index dec8d0325a..31bfc9af3c 100644
--- a/.github/workflows/android-kotlin-format-check.yml
+++ b/.github/workflows/android-kotlin-format-check.yml
@@ -47,4 +47,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run ktfmt check
-        run: android/gradlew -p android ktfmtCheck
+        run: android/gradlew -p android ktfmtCheck :buildSrc:ktfmtCheck
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index b43f4fec86..f27c5e41e7 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -117,6 +117,7 @@ allprojects {
             )
     }
 
+    // Should be the same as ktfmt config in buildSrc/build.gradle.kts
     configure<com.ncorti.ktfmt.gradle.KtfmtExtension> {
         kotlinLangStyle()
         maxWidth.set(100)
diff --git a/android/buildSrc/build.gradle.kts b/android/buildSrc/build.gradle.kts
index 3d5c9c9643..cf2545b068 100644
--- a/android/buildSrc/build.gradle.kts
+++ b/android/buildSrc/build.gradle.kts
@@ -1,5 +1,16 @@
-plugins { `kotlin-dsl` }
+plugins {
+    `kotlin-dsl`
+    alias(libs.plugins.ktfmt) apply true
+    alias(libs.plugins.detekt) apply true
+}
 
 repositories { maven("https://plugins.gradle.org/m2/") }
 
 kotlin { jvmToolchain(17) }
+
+// Should be the same as ktfmt config in project root build.gradle.kts
+ktfmt {
+    kotlinLangStyle()
+    maxWidth.set(100)
+    removeUnusedImports.set(true)
+}
diff --git a/android/buildSrc/settings.gradle.kts b/android/buildSrc/settings.gradle.kts
index 29744ec1bc..62991c1ef5 100644
--- a/android/buildSrc/settings.gradle.kts
+++ b/android/buildSrc/settings.gradle.kts
@@ -1 +1,9 @@
 rootProject.name = "buildSrc"
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
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()