From 0c51b3da0e5ca7b616e7ce9bbc50127c2a0204da Mon Sep 17 00:00:00 2001 From: theophiluskibet Date: Thu, 6 Jun 2024 09:38:23 +0300 Subject: [PATCH] move compile and minSdk versions to version catalog --- .../src/main/kotlin/MultiplaftormConventionPlugin.kt | 5 +++-- gradle/libs.versions.toml | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/MultiplaftormConventionPlugin.kt b/build-logic/convention/src/main/kotlin/MultiplaftormConventionPlugin.kt index 31906b4a..586f5b4b 100644 --- a/build-logic/convention/src/main/kotlin/MultiplaftormConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/MultiplaftormConventionPlugin.kt @@ -1,4 +1,5 @@ import com.android.build.gradle.LibraryExtension +import com.android254.libs import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project @@ -34,9 +35,9 @@ class MultiplaftormConventionPlugin : Plugin { } extensions.configure { - compileSdk = 34 + compileSdk = libs.findVersion("android-compile-sdk").get().toString().toInt() defaultConfig { - minSdk = 24 + minSdk = libs.findVersion("android-min-sdk").get().toString().toInt() } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c937911..b6cd25f2 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,6 @@ [versions] +android-compile-sdk = "34" +android-min-sdk = "24" composecompiler = "1.5.3" coroutines = "1.7.3" coroutines_datetime = "0.4.0"