Skip to content

Commit 5536e66

Browse files
committed
move dependency and SDK version management to libs.versions.toml
1 parent f3ded91 commit 5536e66

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace 'com.chaeny.busoda'
8-
compileSdk rootProject.compileSdkVersion
8+
compileSdk libs.versions.compileSdk.get().toInteger()
99

1010
defaultConfig {
1111
applicationId "com.chaeny.busoda"
12-
minSdk rootProject.minSdkVersion
13-
targetSdk rootProject.targetSdkVersion
12+
minSdk libs.versions.minSdk.get().toInteger()
13+
targetSdk libs.versions.targetSdk.get().toInteger()
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -33,8 +33,8 @@ android {
3333
}
3434

3535
dependencies {
36-
implementation "androidx.navigation:navigation-fragment-ktx:$rootProject.navigationVersion"
37-
implementation "androidx.navigation:navigation-ui-ktx:$rootProject.navigationVersion"
36+
implementation libs.navigation.fragment
37+
implementation libs.navigation.ui
3838

3939
implementation libs.androidx.core.ktx
4040
implementation libs.androidx.appcompat

build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
buildscript {
3-
ext {
4-
compileSdkVersion = 35
5-
minSdkVersion = 31
6-
targetSdkVersion = 35
7-
8-
navigationVersion = '2.8.5'
9-
}
10-
}
11-
122
plugins {
133
alias(libs.plugins.android.application) apply false
144
alias(libs.plugins.kotlin.android) apply false

feature/stopdetail/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ plugins {
55

66
android {
77
namespace 'com.chaeny.busoda.stopdetail'
8-
compileSdk rootProject.compileSdkVersion
8+
compileSdk libs.versions.compileSdk.get().toInteger()
99

1010
buildFeatures {
1111
viewBinding = true
1212
}
1313

1414
defaultConfig {
15-
minSdk rootProject.minSdkVersion
15+
minSdk libs.versions.minSdk.get().toInteger()
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
consumerProguardFiles "consumer-rules.pro"
@@ -34,8 +34,8 @@ android {
3434
}
3535

3636
dependencies {
37-
implementation "androidx.navigation:navigation-fragment-ktx:$rootProject.navigationVersion"
38-
implementation "androidx.navigation:navigation-ui-ktx:$rootProject.navigationVersion"
37+
implementation libs.navigation.fragment
38+
implementation libs.navigation.ui
3939

4040
implementation libs.androidx.core.ktx
4141
implementation libs.androidx.appcompat

feature/stoplist/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ plugins {
55

66
android {
77
namespace 'com.chaeny.busoda.stoplist'
8-
compileSdk rootProject.compileSdkVersion
8+
compileSdk libs.versions.compileSdk.get().toInteger()
99

1010
buildFeatures {
1111
viewBinding = true
1212
}
1313

1414
defaultConfig {
15-
minSdk rootProject.minSdkVersion
15+
minSdk libs.versions.minSdk.get().toInteger()
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
consumerProguardFiles "consumer-rules.pro"
@@ -34,8 +34,8 @@ android {
3434
}
3535

3636
dependencies {
37-
implementation "androidx.navigation:navigation-fragment-ktx:$rootProject.navigationVersion"
38-
implementation "androidx.navigation:navigation-ui-ktx:$rootProject.navigationVersion"
37+
implementation libs.navigation.fragment
38+
implementation libs.navigation.ui
3939

4040
implementation libs.androidx.core.ktx
4141
implementation libs.androidx.appcompat

gradle/libs.versions.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ junitVersion = "1.2.1"
77
espressoCore = "3.6.1"
88
appcompat = "1.7.0"
99
material = "1.12.0"
10+
compileSdk = "35"
11+
minSdk = "31"
12+
targetSdk = "35"
13+
navigation = "2.8.5"
1014

1115
[libraries]
1216
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -15,6 +19,8 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j
1519
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
1620
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
1721
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
22+
navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
23+
navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
1824

1925
[plugins]
2026
android-application = { id = "com.android.application", version.ref = "agp" }

0 commit comments

Comments
 (0)