🎨 moved android sdk versioning to to version catalogue

schachi5000 · Jun 4, 2024 · 9aa1206 · 9aa1206
1 parent 2d141de
commit 9aa1206
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -16,17 +16,17 @@ kotlin {
 }
 
 android {
-    compileSdk = (findProperty("android.compileSdk") as String).toInt()
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
     namespace = "net.schacher.mcc"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
         applicationId = "net.schacher.mcc"
-        minSdk = (findProperty("android.minSdk") as String).toInt()
-        targetSdk = (findProperty("android.targetSdk") as String).toInt()
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
         versionCode = 4
-        versionName = "1.0.0-alpha"
+        versionName = "1.0.0-development"
     }
 
     buildTypes {

diff --git a/gradle.properties b/gradle.properties
@@ -15,14 +15,8 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 
 #Android
 android.useAndroidX=true
-android.targetSdk=34
-android.compileSdk=34
-android.minSdk=24
 
 #Versions
 kotlin.version=1.9.22
 agp.version=8.3.0
-compose.version=1.6.0
-
-#SQLDelight
-sqlDelightVersion=1.5.5
+compose.version=1.6.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,11 @@
 [versions]
+# @keep
+androidCompileSdk = "34"
+androidGradlePlugin = "8.2.2"
+# @keep
+androidMinSdk = "24"
+# @keep
+androidTargetSdk = "34"
 appcompat = "1.6.1"
 activity = "1.8.2"
 core-ktx = "1.12.0"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,8 +29,6 @@ pluginManagement {
     }
 }
 
-
-
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
 }

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -123,15 +123,15 @@ fun getLocalProperty(key: String, file: String = "local.properties"): Any {
 }
 
 android {
-    compileSdk = (findProperty("android.compileSdk") as String).toInt()
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
     namespace = "net.schacher.mcc"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        minSdk = (findProperty("android.minSdk") as String).toInt()
+        minSdk = libs.versions.androidMinSdk.get().toInt()
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17