Apply automatic formatting and cleanup of gradle files

19 files changed, 81 insertions, 166 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index b1b1b5616a..34313f689a 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import java.io.FileInputStream
-import java.util.Properties
+import java.util.*
 
 plugins {
     id(Dependencies.Plugin.androidApplicationId)
@@ -55,11 +55,7 @@ android {
             }
         }
 
-        buildTypes {
-            getByName("release") {
-                signingConfig = signingConfigs.getByName("release")
-            }
-        }
+        buildTypes { getByName("release") { signingConfig = signingConfigs.getByName("release") } }
     }
 
     buildTypes {
@@ -88,23 +84,18 @@ android {
 
     sourceSets {
         getByName("main") {
-            val changelogDir = gradleLocalProperties(rootProject.projectDir).getOrDefault(
-                "OVERRIDE_CHANGELOG_DIR",
-                defaultChangeLogAssetsDirectory
-            )
+            val changelogDir =
+                gradleLocalProperties(rootProject.projectDir)
+                    .getOrDefault("OVERRIDE_CHANGELOG_DIR", defaultChangeLogAssetsDirectory)
 
             assets.srcDirs(extraAssetsDirectory, changelogDir)
             jniLibs.srcDirs(extraJniDirectory)
         }
     }
 
-    buildFeatures {
-        compose = true
-    }
+    buildFeatures { compose = true }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion
-    }
+    composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -114,12 +105,13 @@ android {
     kotlinOptions {
         allWarningsAsErrors = false
         jvmTarget = Versions.jvmTarget
-        freeCompilerArgs = listOf(
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi",
-            // Opt-in option for Koin annotation of KoinComponent.
-            "-opt-in=kotlin.RequiresOptIn"
-        )
+        freeCompilerArgs =
+            listOf(
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi",
+                // Opt-in option for Koin annotation of KoinComponent.
+                "-opt-in=kotlin.RequiresOptIn"
+            )
     }
 
     tasks.withType<com.android.build.gradle.tasks.MergeSourceSetFolders> {
@@ -143,29 +135,29 @@ android {
     packaging {
         jniLibs.useLegacyPackaging = true
         resources {
-            pickFirsts += setOf(
-                // Fixes packaging error caused by: androidx.compose.ui:ui-test-junit4
-                "META-INF/AL2.0",
-                "META-INF/LGPL2.1",
-                // Fixes packaging error caused by: jetified-junit-*
-                "META-INF/LICENSE.md",
-                "META-INF/LICENSE-notice.md"
-            )
+            pickFirsts +=
+                setOf(
+                    // Fixes packaging error caused by: androidx.compose.ui:ui-test-junit4
+                    "META-INF/AL2.0",
+                    "META-INF/LGPL2.1",
+                    // Fixes packaging error caused by: jetified-junit-*
+                    "META-INF/LICENSE.md",
+                    "META-INF/LICENSE-notice.md"
+                )
         }
     }
 
     applicationVariants.configureEach {
-        val alwaysShowChangelog = gradleLocalProperties(rootProject.projectDir)
-            .getProperty("ALWAYS_SHOW_CHANGELOG") ?: "false"
+        val alwaysShowChangelog =
+            gradleLocalProperties(rootProject.projectDir).getProperty("ALWAYS_SHOW_CHANGELOG")
+                ?: "false"
 
-        buildConfigField(
-            "boolean",
-            "ALWAYS_SHOW_CHANGELOG",
-            alwaysShowChangelog
-        )
+        buildConfigField("boolean", "ALWAYS_SHOW_CHANGELOG", alwaysShowChangelog)
 
-        val enableInAppVersionNotifications = gradleLocalProperties(rootProject.projectDir)
-            .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true"
+        val enableInAppVersionNotifications =
+            gradleLocalProperties(rootProject.projectDir)
+                .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS")
+                ?: "true"
 
         buildConfigField(
             "boolean",
@@ -212,9 +204,7 @@ afterEvaluate {
     }
 }
 
-play {
-    serviceAccountCredentials.set(file("play-api-key.json"))
-}
+play { serviceAccountCredentials.set(file("play-api-key.json")) }
 
 configurations.all {
     resolutionStrategy {
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index b9ff70a359..8f801b85a7 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -50,11 +50,7 @@ allprojects {
 
 tasks.withType<DependencyUpdatesTask> {
     gradleReleaseChannel = "current"
-    rejectVersionIf {
-        candidate.version.isNonStableVersion()
-    }
+    rejectVersionIf { candidate.version.isNonStableVersion() }
 }
 
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
+tasks.register("clean", Delete::class) { delete(rootProject.buildDir) }
diff --git a/android/buildSrc/build.gradle.kts b/android/buildSrc/build.gradle.kts
index d58dd3f651..3d5c9c9643 100644
--- a/android/buildSrc/build.gradle.kts
+++ b/android/buildSrc/build.gradle.kts
@@ -1,11 +1,5 @@
-plugins {
-    `kotlin-dsl`
-}
+plugins { `kotlin-dsl` }
 
-repositories {
-    maven("https://plugins.gradle.org/m2/")
-}
+repositories { maven("https://plugins.gradle.org/m2/") }
 
-kotlin {
-    jvmToolchain(17)
-}
+kotlin { jvmToolchain(17) }
diff --git a/android/lib/build.gradle.kts b/android/lib/build.gradle.kts
index e69de29bb2..8b13789179 100644
--- a/android/lib/build.gradle.kts
+++ b/android/lib/build.gradle.kts
@@ -0,0 +1 @@
+
diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts
index ca820dbadd..3d0ef6c028 100644
--- a/android/lib/common-test/build.gradle.kts
+++ b/android/lib/common-test/build.gradle.kts
@@ -7,9 +7,7 @@ android {
     namespace = "net.mullvad.mullvadvpn.lib.common.test"
     compileSdk = Versions.Android.compileSdkVersion
 
-    defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
-    }
+    defaultConfig { minSdk = Versions.Android.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts
index d8a8458140..ba33ab7db7 100644
--- a/android/lib/common/build.gradle.kts
+++ b/android/lib/common/build.gradle.kts
@@ -8,9 +8,7 @@ android {
     namespace = "net.mullvad.mullvadvpn.lib.common"
     compileSdk = Versions.Android.compileSdkVersion
 
-    defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
-    }
+    defaultConfig { minSdk = Versions.Android.minSdkVersion }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
index 282d9df76a..f46c70c7d7 100644
--- a/android/lib/endpoint/build.gradle.kts
+++ b/android/lib/endpoint/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.mullvadvpn.lib.endpoint"
     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")
@@ -28,6 +24,4 @@ android {
     }
 }
 
-dependencies {
-    implementation(Dependencies.Kotlin.stdlib)
-}
+dependencies { implementation(Dependencies.Kotlin.stdlib) }
diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts
index 6fbc935b70..0c6213e889 100644
--- a/android/lib/ipc/build.gradle.kts
+++ b/android/lib/ipc/build.gradle.kts
@@ -18,9 +18,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = Versions.jvmTarget
-    }
+    kotlinOptions { jvmTarget = Versions.jvmTarget }
 
     lint {
         lintConfig = file("${rootProject.projectDir}/config/lint.xml")
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts
index bd949928bf..040c2fca0c 100644
--- a/android/lib/model/build.gradle.kts
+++ b/android/lib/model/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.mullvadvpn.model"
     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")
diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts
index d42d6b9355..e5a33a6615 100644
--- a/android/lib/resource/build.gradle.kts
+++ b/android/lib/resource/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.mullvadvpn.lib.resource"
     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("lint.xml")
@@ -29,6 +25,4 @@ android {
     }
 }
 
-dependencies {
-    implementation(Dependencies.AndroidX.appcompat)
-}
+dependencies { implementation(Dependencies.AndroidX.appcompat) }
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index e18c1c962b..ac760a860e 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.talpid"
     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")
diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts
index d5efe5c96f..687184c5c0 100644
--- a/android/lib/theme/build.gradle.kts
+++ b/android/lib/theme/build.gradle.kts
@@ -7,26 +7,18 @@ android {
     namespace = "net.mullvad.mullvadvpn.lib.theme"
     compileSdk = Versions.Android.compileSdkVersion
 
-    defaultConfig {
-        minSdk = Versions.Android.minSdkVersion
-    }
+    defaultConfig { minSdk = Versions.Android.minSdkVersion }
 
-    buildFeatures {
-        compose = true
-    }
+    buildFeatures { compose = true }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion
-    }
+    composeOptions { kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion }
 
     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/service/build.gradle.kts b/android/service/build.gradle.kts
index cf10c2859f..65d3737068 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.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")
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 03bb8c781c..5df9c08f1e 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -1,8 +1,5 @@
-include(
-    ":app",
-    ":service",
-    ":tile"
-)
+include(":app", ":service", ":tile")
+
 include(
     ":lib:common",
     ":lib:endpoint",
@@ -13,9 +10,5 @@ include(
     ":lib:theme",
     ":lib:common-test"
 )
-include(
-    ":test",
-    ":test:common",
-    ":test:e2e",
-    ":test:mockapi"
-)
+
+include(":test", ":test:common", ":test:e2e", ":test:mockapi")
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")
diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts
index befd86c63c..419ab58dc0 100644
--- a/android/tile/build.gradle.kts
+++ b/android/tile/build.gradle.kts
@@ -8,18 +8,14 @@ android {
     namespace = "net.mullvad.mullvadvpn.tile"
     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")