Skip to content

Commit 798a226

Browse files
authored
chore: bump compile/target SDK to 37 and source from catalog (#473)
* chore: bump compile/target SDK to 37 and source from catalog Wire compileSdk, minSdk, targetSdk, and libraryTargetSdk from the version catalog instead of hardcoding in build files, so future bumps only need a single change in libs.versions.toml. * chore: drop libraryTargetSdk in favor of targetSdk Avoid double bookkeeping by using targetSdk for both app and library modules.
1 parent ee86be8 commit 798a226

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313

1414
defaultConfig {
1515
applicationId = "com.hello.curiosity.design"
16-
targetSdk = 35
16+
targetSdk = libs.versions.targetSdk.get().toInt()
1717

1818
versionCode = System.getenv("GITHUB_RUN_NUMBER")?.toInt() ?: 1
1919
versionName = System.getenv("VERSION") ?: "local"

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ allprojects {
4545
}
4646

4747
fun CommonExtension<*, *, *, *, *, *>.configureAndroidCommon() {
48-
compileSdk = 35
48+
compileSdk = libs.versions.compileSdk.get().toInt()
4949
defaultConfig {
50-
minSdk = 23
50+
minSdk = libs.versions.minSdk.get().toInt()
5151
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
5252
}
5353
compileOptions {
@@ -76,7 +76,7 @@ subprojects {
7676
extensions.configure<LibraryExtension>("android") {
7777
configureAndroidCommon()
7878
defaultConfig {
79-
targetSdk = 35
79+
targetSdk = libs.versions.targetSdk.get().toInt()
8080
}
8181
buildTypes {
8282
release {

gradle/libs.versions.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ customviewPoolingContainer = "1.1.0"
1818
navigationCompose = "2.9.8"
1919

2020
# Android
21-
compileSdk = "35"
21+
compileSdk = "37"
2222
minSdk = "23"
23-
targetSdk = "35"
23+
targetSdk = "37"
2424
buildTools = "34.0.0"
2525

26-
# Library targetSdk (curiosity, navigation)
27-
libraryTargetSdk = "34"
28-
2926
# Other libs
3027
leakcanary = "2.14"
3128
ktor = "3.4.3"

0 commit comments

Comments
 (0)