Skip to content

Commit 1d83ee5

Browse files
committed
Use new dsl api for setting sdk versions
1 parent c9b7e42 commit 1d83ee5

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

build-logic/convention/src/main/kotlin/dev/clombardo/dnsnet/convention/AndroidApplicationConventionPlugin.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ abstract class AndroidApplicationConventionPlugin : Plugin<Project> {
2121
override fun apply(target: Project): Unit = with(target) {
2222
apply(plugin = "com.android.application")
2323
extensions.configure<ApplicationExtension> {
24-
defaultConfig.targetSdk = libs.findVersion("targetSdk").get().toString().toInt()
24+
defaultConfig.targetSdk {
25+
version = release(libs.findVersion("targetSdk").get().toString().toInt())
26+
}
2527
configureKotlin()
2628
configureAndroid(this)
2729
}

build-logic/convention/src/main/kotlin/dev/clombardo/dnsnet/convention/AndroidConfiguration.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ import org.gradle.kotlin.dsl.provideDelegate
1818
internal fun Project.configureAndroid(
1919
commonExtension: CommonExtension,
2020
) = with(commonExtension) {
21-
compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
21+
compileSdk {
22+
version = release(libs.findVersion("compileSdk").get().toString().toInt())
23+
}
2224

2325
defaultConfig.apply {
24-
minSdk = libs.findVersion("minSdk").get().toString().toInt()
26+
minSdk {
27+
version = release(libs.findVersion("minSdk").get().toString().toInt())
28+
}
2529

2630
val versionName: String by rootProject.extra
2731
buildConfigField(

0 commit comments

Comments
 (0)