From 06982b6e5a963b95ad31e0168dbb5f704c4fcfb1 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Tue, 14 Apr 2026 20:00:29 +0200
Subject: [PATCH] Specify compile sdk minor version

Close #1867
---
 app/app/build.gradle.kts                       | 6 +++++-
 app/ui/build.gradle.kts                        | 6 +++++-
 core/base/build.gradle.kts                     | 6 +++++-
 core/compat/build.gradle.kts                   | 6 +++++-
 core/crashreporter/build.gradle.kts            | 6 +++++-
 core/devicepose/build.gradle.kts               | 6 +++++-
 core/i18n/build.gradle.kts                     | 6 +++++-
 core/ktx/build.gradle.kts                      | 6 +++++-
 core/permissions/build.gradle.kts              | 6 +++++-
 core/preferences/build.gradle.kts              | 6 +++++-
 core/profiles/build.gradle.kts                 | 6 +++++-
 core/shared/build.gradle.kts                   | 6 +++++-
 data/applications/build.gradle.kts             | 6 +++++-
 data/appshortcuts/build.gradle.kts             | 6 +++++-
 data/calculator/build.gradle.kts               | 6 +++++-
 data/calendar/build.gradle.kts                 | 6 +++++-
 data/contacts/build.gradle.kts                 | 6 +++++-
 data/currencies/build.gradle.kts               | 6 +++++-
 data/customattrs/build.gradle.kts              | 6 +++++-
 data/database/build.gradle.kts                 | 6 +++++-
 data/files/build.gradle.kts                    | 6 +++++-
 data/i18n/build.gradle.kts                     | 6 +++++-
 data/locations/build.gradle.kts                | 6 +++++-
 data/notifications/build.gradle.kts            | 6 +++++-
 data/plugins/build.gradle.kts                  | 6 +++++-
 data/search-actions/build.gradle.kts           | 6 +++++-
 data/searchable/build.gradle.kts               | 6 +++++-
 data/themes/build.gradle.kts                   | 6 +++++-
 data/unitconverter/build.gradle.kts            | 6 +++++-
 data/weather/build.gradle.kts                  | 6 +++++-
 data/websites/build.gradle.kts                 | 6 +++++-
 data/widgets/build.gradle.kts                  | 6 +++++-
 data/wikipedia/build.gradle.kts                | 6 +++++-
 gradle/libs.versions.toml                      | 1 +
 libs/address-formatter/build.gradle.kts        | 6 +++++-
 libs/material-color-utilities/build.gradle.kts | 6 +++++-
 libs/nextcloud/build.gradle.kts                | 6 +++++-
 libs/owncloud/build.gradle.kts                 | 6 +++++-
 libs/webdav/build.gradle.kts                   | 6 +++++-
 plugins/sdk/build.gradle.kts                   | 6 +++++-
 services/accounts/build.gradle.kts             | 6 +++++-
 services/backup/build.gradle.kts               | 6 +++++-
 services/badges/build.gradle.kts               | 6 +++++-
 services/favorites/build.gradle.kts            | 6 +++++-
 services/feed/build.gradle.kts                 | 6 +++++-
 services/global-actions/build.gradle.kts       | 6 +++++-
 services/icons/build.gradle.kts                | 6 +++++-
 services/music/build.gradle.kts                | 6 +++++-
 services/plugins/build.gradle.kts              | 6 +++++-
 services/search/build.gradle.kts               | 6 +++++-
 services/tags/build.gradle.kts                 | 6 +++++-
 services/widgets/build.gradle.kts              | 6 +++++-
 52 files changed, 256 insertions(+), 51 deletions(-)

diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index e211f9379..7b4156c12 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -24,7 +24,11 @@ android {
         resources.excludes.add("META-INF/NOTICE.md")
     }
 
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
     defaultConfig {
         applicationId = "de.mm20.launcher2"
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 6751e07a8..104ac406a 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     packaging {
         resources.excludes.add("META-INF/DEPENDENCIES")
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index 9da6dcf3e..671758ba4 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts
index ef55e443d..8957094ad 100644
--- a/core/compat/build.gradle.kts
+++ b/core/compat/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts
index 9dfc55685..f00f78291 100644
--- a/core/crashreporter/build.gradle.kts
+++ b/core/crashreporter/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/devicepose/build.gradle.kts b/core/devicepose/build.gradle.kts
index 401cd31d4..dd0ecce90 100644
--- a/core/devicepose/build.gradle.kts
+++ b/core/devicepose/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 
 android {
     namespace = "de.mm20.launcher2.location"
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts
index 38b7e8443..9c8d556f3 100644
--- a/core/i18n/build.gradle.kts
+++ b/core/i18n/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts
index 2921c4bf2..2a20584cb 100644
--- a/core/ktx/build.gradle.kts
+++ b/core/ktx/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts
index 8dca79e3c..6cc05d930 100644
--- a/core/permissions/build.gradle.kts
+++ b/core/permissions/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts
index 39e0dbd99..08de9f4e5 100644
--- a/core/preferences/build.gradle.kts
+++ b/core/preferences/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/profiles/build.gradle.kts b/core/profiles/build.gradle.kts
index fa6a04cbd..cc1e4b934 100644
--- a/core/profiles/build.gradle.kts
+++ b/core/profiles/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts
index 96503fb42..47e295871 100644
--- a/core/shared/build.gradle.kts
+++ b/core/shared/build.gradle.kts
@@ -9,7 +9,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts
index 2f2877443..9d5b96aed 100644
--- a/data/applications/build.gradle.kts
+++ b/data/applications/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts
index 8ec0f539b..ef85dbbab 100644
--- a/data/appshortcuts/build.gradle.kts
+++ b/data/appshortcuts/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts
index aa593c4f1..3ce0853e7 100644
--- a/data/calculator/build.gradle.kts
+++ b/data/calculator/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts
index b79439b64..cd9c290c3 100644
--- a/data/calendar/build.gradle.kts
+++ b/data/calendar/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts
index d3de7a607..a6c8fef04 100644
--- a/data/contacts/build.gradle.kts
+++ b/data/contacts/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts
index 677d3934a..ea8fde11c 100644
--- a/data/currencies/build.gradle.kts
+++ b/data/currencies/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts
index 80af1485f..d054e6691 100644
--- a/data/customattrs/build.gradle.kts
+++ b/data/customattrs/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts
index 706cca79b..905e3c84c 100644
--- a/data/database/build.gradle.kts
+++ b/data/database/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts
index 45b133780..c4a43f34e 100644
--- a/data/files/build.gradle.kts
+++ b/data/files/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/i18n/build.gradle.kts b/data/i18n/build.gradle.kts
index 3a54cae5e..9b8c7d11b 100644
--- a/data/i18n/build.gradle.kts
+++ b/data/i18n/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/locations/build.gradle.kts b/data/locations/build.gradle.kts
index 0a5b6ca27..69efb4a18 100644
--- a/data/locations/build.gradle.kts
+++ b/data/locations/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 
 android {
     namespace = "de.mm20.launcher2.openstreetmaps"
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts
index d09fc64da..138fcd19e 100644
--- a/data/notifications/build.gradle.kts
+++ b/data/notifications/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/plugins/build.gradle.kts b/data/plugins/build.gradle.kts
index 8c29410b6..1f3cbf540 100644
--- a/data/plugins/build.gradle.kts
+++ b/data/plugins/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts
index c870c08fc..11bddc0c5 100644
--- a/data/search-actions/build.gradle.kts
+++ b/data/search-actions/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts
index 93626ab38..334d49f9a 100644
--- a/data/searchable/build.gradle.kts
+++ b/data/searchable/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts
index 305ba51cc..b48ab0389 100644
--- a/data/themes/build.gradle.kts
+++ b/data/themes/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts
index 29d76a7e5..1985bb666 100644
--- a/data/unitconverter/build.gradle.kts
+++ b/data/unitconverter/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts
index 7ca215696..634b2e554 100644
--- a/data/weather/build.gradle.kts
+++ b/data/weather/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts
index 260fb8706..9ec804222 100644
--- a/data/websites/build.gradle.kts
+++ b/data/websites/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts
index 8374e1a3e..bfa6e53f1 100644
--- a/data/widgets/build.gradle.kts
+++ b/data/widgets/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts
index b7b810482..c4e282ea4 100644
--- a/data/wikipedia/build.gradle.kts
+++ b/data/wikipedia/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12088b4a3..9a5858059 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@ jacksonCore = "2.20.1"
 jacksonDataformatYaml = "2.20.1"
 minSdk = "26"
 compileSdk = "37"
+compileSdkMinor = "0"
 targetSdk = "36"
 
 pluginSdk = "2.3.0"
diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts
index 08e575c84..c4c0dc926 100644
--- a/libs/address-formatter/build.gradle.kts
+++ b/libs/address-formatter/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts
index c1a1493b4..ea36ea790 100644
--- a/libs/material-color-utilities/build.gradle.kts
+++ b/libs/material-color-utilities/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts
index 340985ef6..844e607d6 100644
--- a/libs/nextcloud/build.gradle.kts
+++ b/libs/nextcloud/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts
index cdde04943..f07904b53 100644
--- a/libs/owncloud/build.gradle.kts
+++ b/libs/owncloud/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts
index 16c572533..f67744a61 100644
--- a/libs/webdav/build.gradle.kts
+++ b/libs/webdav/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts
index 19873af74..fbc1014b1 100644
--- a/plugins/sdk/build.gradle.kts
+++ b/plugins/sdk/build.gradle.kts
@@ -9,7 +9,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts
index c8ba5ebfd..8dacd8d36 100644
--- a/services/accounts/build.gradle.kts
+++ b/services/accounts/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts
index cc63d367b..92d09d331 100644
--- a/services/backup/build.gradle.kts
+++ b/services/backup/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts
index 1d420a29f..2e34fda1e 100644
--- a/services/badges/build.gradle.kts
+++ b/services/badges/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts
index 9e344ad7c..ce55f6f63 100644
--- a/services/favorites/build.gradle.kts
+++ b/services/favorites/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/feed/build.gradle.kts b/services/feed/build.gradle.kts
index cde9c53cf..7914dc1a2 100644
--- a/services/feed/build.gradle.kts
+++ b/services/feed/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts
index e6beac0ff..62a086664 100644
--- a/services/global-actions/build.gradle.kts
+++ b/services/global-actions/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts
index 4751f1009..f4019898d 100644
--- a/services/icons/build.gradle.kts
+++ b/services/icons/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts
index a5f12d2fc..fb2220927 100644
--- a/services/music/build.gradle.kts
+++ b/services/music/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/plugins/build.gradle.kts b/services/plugins/build.gradle.kts
index 0d7a8475f..9c85f1b8b 100644
--- a/services/plugins/build.gradle.kts
+++ b/services/plugins/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts
index bedea2fb3..d4a0536c1 100644
--- a/services/search/build.gradle.kts
+++ b/services/search/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts
index 580e32e7c..4f1cd96ce 100644
--- a/services/tags/build.gradle.kts
+++ b/services/tags/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts
index f22bdf12c..241c24b5e 100644
--- a/services/widgets/build.gradle.kts
+++ b/services/widgets/build.gradle.kts
@@ -5,7 +5,11 @@ plugins {
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()