Format build files

10 files changed, 51 insertions, 67 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 9913e49fd4..03409dba86 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
@@ -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,
         )
     }
 
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index e0045decc6..a136aa6fd8 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
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts
index ea89bc6dca..c901bd53dd 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 0f96eca415..aa0b13f76c 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 638be8b122..2a20310281 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 57a16627a1..6e4b9292d7 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 89bcf1e663..58d8757df0 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/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",
+                )
         }
     }
 }