diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 95fbdc3..51b07f4 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -13,17 +13,17 @@ class AndroidApplicationConventionPlugin : Plugin { pluginManager.apply("org.jetbrains.kotlinx.kover") extensions.configure { - jvmToolchain(17) + jvmToolchain(BuildConstants.JVM_TOOLCHAIN_VERSION) compilerOptions { freeCompilerArgs.addAll("-opt-in=kotlin.time.ExperimentalTime") } } extensions.configure { - compileSdk = 36 + compileSdk = BuildConstants.COMPILE_SDK defaultConfig { - minSdk = 26 - targetSdk = 35 + minSdk = BuildConstants.MIN_SDK + targetSdk = BuildConstants.TARGET_SDK versionCode = 1 versionName = "0.1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index fdd0bed..ab9a857 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -13,16 +13,16 @@ class AndroidLibraryConventionPlugin : Plugin { pluginManager.apply("org.jetbrains.kotlinx.kover") extensions.configure { - jvmToolchain(17) + jvmToolchain(BuildConstants.JVM_TOOLCHAIN_VERSION) compilerOptions { freeCompilerArgs.addAll("-opt-in=kotlin.time.ExperimentalTime") } } extensions.configure { - compileSdk = 36 + compileSdk = BuildConstants.COMPILE_SDK defaultConfig { - minSdk = 26 + minSdk = BuildConstants.MIN_SDK testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions { diff --git a/build-logic/convention/src/main/kotlin/BuildConstants.kt b/build-logic/convention/src/main/kotlin/BuildConstants.kt new file mode 100644 index 0000000..7149457 --- /dev/null +++ b/build-logic/convention/src/main/kotlin/BuildConstants.kt @@ -0,0 +1,6 @@ +object BuildConstants { + const val JVM_TOOLCHAIN_VERSION = 21 + const val COMPILE_SDK = 36 + const val MIN_SDK = 26 + const val TARGET_SDK = 35 +} diff --git a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt index dc1b986..a36f1c9 100644 --- a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt @@ -13,7 +13,7 @@ class KmpLibraryConventionPlugin : Plugin { pluginManager.apply("org.jetbrains.kotlinx.kover") extensions.configure { - jvmToolchain(17) + jvmToolchain(BuildConstants.JVM_TOOLCHAIN_VERSION) compilerOptions { freeCompilerArgs.addAll( "-opt-in=kotlin.time.ExperimentalTime", @@ -34,9 +34,9 @@ class KmpLibraryConventionPlugin : Plugin { } extensions.configure { - compileSdk = 36 + compileSdk = BuildConstants.COMPILE_SDK defaultConfig { - minSdk = 26 + minSdk = BuildConstants.MIN_SDK testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } compileOptions {