Merge branch 'tim/targetSdkFiasco' into 'master'

maint: Upgrade Gradle and fix targetSdk deprecation fiasco See merge request TankerHQ/sdk-android!285
TankerHQ · Dec 6, 2023 · 7731818 · 7731818
2 parents dc400ed + 672b587
commit 7731818
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.1.2"
+androidGradlePlugin = "8.2.0"
 kotlinAndroid = "1.9.10"
 dokka = "1.8.10"
 wupAndroidMavenPublish = "3.6.2"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 23 15:51:18 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tanker-bindings/build.gradle.kts b/tanker-bindings/build.gradle.kts
@@ -15,21 +15,17 @@ apply(from = "native.gradle")
 group = "io.tanker"
 version = "dev"
 
+val minSdkVersion = 21
+val targetSdkVersion = 34
+
 android {
     namespace = "io.tanker.tanker_bindings"
 
     ndkVersion = "26.0.10792818"
 
-    compileSdk = 34
+    compileSdk = targetSdkVersion
     defaultConfig {
-        minSdk = 21
-
-        // Apps that depend on a library ignore the library's targetSdk entirely (as they should).
-        // But we *do* need the field for androidTests, which install a real test app on a device.
-        // Google has now deprecated targetSdk for libraries entirely, with no replacement.
-        // https://issuetracker.google.com/issues/230625468 tracks the rollout of this mistake.
-        @SuppressLint("ExpiredTargetSdkVersion")
-        targetSdk = 34
+        minSdk = minSdkVersion
 
         ndk {
             moduleName = "tanker-bindings-jni"
@@ -51,6 +47,17 @@ android {
         jvmTarget = "17"
     }
 
+    lint {
+        targetSdk = targetSdkVersion
+    }
+
+    testOptions {
+        targetSdk = targetSdkVersion
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+
     publishing {
         singleVariant("release")
     }
@@ -85,10 +92,6 @@ android {
         }
     }
 
-    testOptions.unitTests {
-        isIncludeAndroidResources = true
-    }
-
     sourceSets.getByName("main") {
         java.srcDir("src/main/kotlin")
         java.exclude("src/main/kotlin/io/tanker/admin/**")