Skip to content

Commit 026c281

Browse files
committed
Managed compile・target・minSdkVersion in version catalog
1 parent a9cf13e commit 026c281

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import com.android.build.api.dsl.ApplicationExtension
22
import com.android.build.api.dsl.Lint
33
import dev.dai.android.architecture.template.buildlogic.configure
44
import dev.dai.android.architecture.template.buildlogic.configureKotlinAndroid
5+
import dev.dai.android.architecture.template.buildlogic.libs
6+
import dev.dai.android.architecture.template.buildlogic.version
57
import org.gradle.api.Plugin
68
import org.gradle.api.Project
79
import org.gradle.kotlin.dsl.configure
@@ -19,7 +21,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
1921
configureKotlinAndroid(this)
2022

2123
defaultConfig {
22-
targetSdk = 34
24+
targetSdk = libs.version("targetSdkVersion")
2325
versionCode = 1
2426
versionName = "1.0"
2527
vectorDrawables {

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import com.android.build.gradle.LibraryExtension
44
import dev.dai.android.architecture.template.buildlogic.configure
55
import dev.dai.android.architecture.template.buildlogic.configureKotlinAndroid
66
import dev.dai.android.architecture.template.buildlogic.disableUnnecessaryAndroidTests
7+
import dev.dai.android.architecture.template.buildlogic.libs
8+
import dev.dai.android.architecture.template.buildlogic.version
79
import org.gradle.api.Plugin
810
import org.gradle.api.Project
911
import org.gradle.kotlin.dsl.configure
@@ -21,7 +23,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
2123

2224
extensions.configure<LibraryExtension> {
2325
configureKotlinAndroid(this)
24-
defaultConfig.targetSdk = 34
26+
defaultConfig.targetSdk = libs.version("targetSdkVersion")
2527
// The resource prefix is derived from the module name,
2628
// so resources inside ":core:module1" must be prefixed with "core_module1_"
2729
resourcePrefix =

build-logic/convention/src/main/kotlin/dev/dai/android/architecture/template/buildlogic/KotlinAndroid.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ internal fun Project.configureKotlinAndroid(
1616
commonExtension: CommonExtension<*, *, *, *, *, *>,
1717
) {
1818
commonExtension.apply {
19-
compileSdk = 34
19+
compileSdk = libs.version("compileSdkVersion")
2020

2121
defaultConfig {
22-
minSdk = 28
22+
minSdk = libs.version("minSdkVersion")
2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424
}
2525

build-logic/convention/src/main/kotlin/dev/dai/android/architecture/template/buildlogic/ProjectExtensions.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ val Project.libs
1111

1212
internal fun VersionCatalog.library(name: String): MinimalExternalModuleDependency =
1313
findLibrary(name).get().get()
14+
15+
internal fun VersionCatalog.version(name: String): Int = findVersion(name).get().toString().toInt()

gradle/libs.versions.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
[versions]
2+
compileSdkVersion = "35"
3+
targetSdkVersion = "34"
4+
minSdkVersion = "28"
5+
26
androidGradlePlugin = "8.7.2"
37
androidxActivity = "1.9.3"
48
androidxBrowser = "1.8.0"

0 commit comments

Comments
 (0)