Merge branch 'cleanup-gradle-configuration'

13 files changed, 7 insertions, 20 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index d67a07a191..56b6480210 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -126,6 +126,9 @@ android {
         dependsOn(getTasksByName("copyExtraAssets", true))
     }
 
+    // Suppressing since we don't seem have much of an option than using this api. The impact should
+    // also be limited to tests.
+    @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.all { test ->
             test.testLogging {
@@ -137,7 +140,7 @@ android {
         }
     }
 
-    packagingOptions {
+    packaging {
         jniLibs.useLegacyPackaging = true
         resources {
             pickFirsts += setOf(
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index bedbc0610f..b9ff70a359 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -49,14 +49,9 @@ allprojects {
 }
 
 tasks.withType<DependencyUpdatesTask> {
-    resolutionStrategy {
-        componentSelection {
-            all {
-                if (candidate.version.isNonStableVersion()) {
-                    reject("Non-stable version.")
-                }
-            }
-        }
+    gradleReleaseChannel = "current"
+    rejectVersionIf {
+        candidate.version.isNonStableVersion()
     }
 }
 
diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts
index a0439a829d..d8a8458140 100644
--- a/android/lib/common/build.gradle.kts
+++ b/android/lib/common/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
index 02ef2d2064..282d9df76a 100644
--- a/android/lib/endpoint/build.gradle.kts
+++ b/android/lib/endpoint/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts
index 0c4d6f9127..6fbc935b70 100644
--- a/android/lib/ipc/build.gradle.kts
+++ b/android/lib/ipc/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts
index 7368c28069..bd949928bf 100644
--- a/android/lib/model/build.gradle.kts
+++ b/android/lib/model/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts
index ea2d52ee24..d42d6b9355 100644
--- a/android/lib/resource/build.gradle.kts
+++ b/android/lib/resource/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index c57ff8010c..e18c1c962b 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
index 2dfc76225f..cf10c2859f 100644
--- a/android/service/build.gradle.kts
+++ b/android/service/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 9dd71c8dd8..941e79f757 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index 2c6224dce8..6e8f5a0eb9 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -12,7 +12,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
         testApplicationId = "net.mullvad.mullvadvpn.test.e2e"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 3c9d309e5b..274892a703 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -9,7 +9,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
         testApplicationId = "net.mullvad.mullvadvpn.test.mockapi"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts
index 9c4ac5589e..befd86c63c 100644
--- a/android/tile/build.gradle.kts
+++ b/android/tile/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Versions.Android.minSdkVersion
-        targetSdk = Versions.Android.targetSdkVersion
     }
 
     compileOptions {