Merge branch 'improve-gradle-variant-configuration-droid-18'

10 files changed, 18 insertions, 60 deletions

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/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt
index 3fa4ec3034..f46664e929 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/StringExtensions.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt
@@ -1,7 +1,5 @@
 package net.mullvad.mullvadvpn.lib.common.util
 
-import net.mullvad.mullvadvpn.lib.common.BuildConfig
-import net.mullvad.mullvadvpn.lib.common.constant.BuildTypes
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 
@@ -23,13 +21,6 @@ fun String.parseAsDateTime(): DateTime? {
     }
 }
 
-fun String.appendHideNavOnReleaseBuild(): String =
-    if (BuildTypes.RELEASE == BuildConfig.BUILD_TYPE) {
-        "$this?hide_nav"
-    } else {
-        this
-    }
-
 fun String.groupWithSpaces(groupCharSize: Int = 4): String {
     return fold(StringBuilder()) { formattedText, nextDigit ->
             if ((formattedText.length % (groupCharSize + 1)) == groupCharSize) {
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")