Merge branch 'set-minor-android-compile-sdk-explicitly'

Author: albin-mullvad

android/app/build.gradle.kts

@@ -40,7 +40,8 @@ val appVersion = appVersionProvider.get()
 
 android {
     namespace = "net.mullvad.mullvadvpn"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
     ndkVersion = libs.versions.ndk.get()
 

android/gradle/build-logic/src/main/kotlin/AndroidLibraryPlugin.kt

@@ -15,7 +15,8 @@ class AndroidLibraryPlugin : Plugin<Project> {
             apply(plugin = "mullvad.kotlin-toolchain")
 
             extensions.configure<LibraryExtension> {
-                compileSdk = libs.findVersion("compile-sdk").get().toString().toInt()
+                compileSdk = libs.findVersion("compile-sdk-major").get().toString().toInt()
+                compileSdkMinor = libs.findVersion("compile-sdk-minor").get().toString().toInt()
                 buildToolsVersion = libs.findVersion("build-tools").get().toString()
 
                 defaultConfig { minSdk = libs.findVersion("min-sdk").get().toString().toInt() }

android/gradle/libs.versions.toml

@@ -2,7 +2,8 @@
 # Core
 # Updating the sdk version requires updating the version used in the build container.
 # See Bump SDK or container image template in Linear for more details.
-compile-sdk = "36"
+compile-sdk-major = "36"
+compile-sdk-minor = "1"
 build-tools = "36.1.0"
 min-sdk = "28"
 target-sdk = "36"

android/test/arch/build.gradle.kts

@@ -5,7 +5,8 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.arch"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig { minSdk = libs.versions.min.sdk.get().toInt() }

android/test/baselineprofile/build.gradle.kts

@@ -12,7 +12,8 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.baselineprofile"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
 
     kotlin { compilerOptions { allWarningsAsErrors = true } }

android/test/common/build.gradle.kts

@@ -10,7 +10,8 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.common"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig { minSdk = libs.versions.min.sdk.get().toInt() }

android/test/e2e/build.gradle.kts

@@ -13,7 +13,8 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.e2e"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig {

android/test/mockapi/build.gradle.kts

@@ -8,7 +8,8 @@ plugins {
 
 android {
     namespace = "net.mullvad.mullvadvpn.test.mockapi"
-    compileSdk = libs.versions.compile.sdk.get().toInt()
+    compileSdk = libs.versions.compile.sdk.major.get().toInt()
+    compileSdkMinor = libs.versions.compile.sdk.minor.get().toInt()
     buildToolsVersion = libs.versions.build.tools.get()
 
     defaultConfig {

nix/android-toolchain.nix

@@ -17,14 +17,15 @@ let
     versions
     ;
 
-  compileSdkVersion = versions."compile-sdk";
+  compileSdkVersion = versions."compile-sdk-major";
+  compileSdkMinorVersion = versions."compile-sdk-minor" or "0";
   buildToolsVersion = versions."build-tools";
   minSdkVersion = versions."min-sdk";
   ndkVersion = versions.ndk;
 
   android-sdk = android-nixpkgs.sdk.${system} (
     sdkPkgs: with sdkPkgs; [
-      (builtins.getAttr "platforms-android-${compileSdkVersion}" sdkPkgs)
+      (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs)
       (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs)
       (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs)
       cmdline-tools-latest