Skip to content

Commit d9e776c

Browse files
committed
Move library deps to version catalog
1 parent 0cb58eb commit d9e776c

File tree

2 files changed

+47
-16
lines changed

2 files changed

+47
-16
lines changed

AdaptiveUiCodelab/app/build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ android {
6565
dependencies {
6666

6767

68-
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
68+
def composeBom = libs.androidx.compose.bom
6969
implementation(composeBom)
7070
androidTestImplementation(composeBom)
7171

72-
implementation 'androidx.compose.material3:material3'
73-
implementation "androidx.compose.material:material-icons-extended"
74-
implementation "androidx.compose.ui:ui-tooling-preview"
75-
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
76-
debugImplementation "androidx.compose.ui:ui-tooling"
77-
debugImplementation "androidx.compose.ui:ui-test-manifest"
72+
implementation libs.androidx.material3
73+
implementation libs.androidx.material.icons.extended
74+
implementation libs.androidx.ui.tooling.preview
75+
androidTestImplementation libs.androidx.ui.test.junit4
76+
debugImplementation libs.androidx.ui.tooling
77+
debugImplementation libs.androidx.ui.test.manifest
7878

79-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
80-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
81-
implementation 'androidx.activity:activity-compose:1.9.0'
82-
implementation 'androidx.core:core-ktx:1.13.1'
83-
implementation "androidx.window:window:1.2.0"
84-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
79+
implementation libs.androidx.lifecycle.viewmodel.compose
80+
implementation libs.androidx.lifecycle.runtime.ktx
81+
implementation libs.androidx.activity.compose
82+
implementation libs.androidx.core.ktx
83+
implementation libs.androidx.window
84+
implementation libs.kotlinx.coroutines.android
8585

86-
testImplementation 'junit:junit:4.13.2'
87-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
88-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
86+
testImplementation libs.junit
87+
androidTestImplementation libs.androidx.junit
88+
androidTestImplementation libs.androidx.espresso.core
8989
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[versions]
2+
composeBom = "2024.05.00"
3+
coreKtx = "1.13.1"
4+
activityCompose = "1.9.0"
5+
espressoCore = "3.5.1"
6+
junit = "4.13.2"
7+
junitVersion = "1.1.5"
8+
kotlinxCoroutinesAndroid = "1.8.0"
9+
lifecycleViewmodelCompose = "2.7.0"
10+
lifecycleRuntimeKtx = "2.7.0"
11+
window = "1.2.0"
12+
13+
[libraries]
14+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
15+
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
16+
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
17+
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
18+
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
19+
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
20+
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
21+
androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
22+
androidx-material3 = { module = "androidx.compose.material3:material3" }
23+
androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
24+
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
25+
androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
26+
androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
27+
androidx-window = { module = "androidx.window:window", version.ref = "window" }
28+
junit = { module = "junit:junit", version.ref = "junit" }
29+
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
30+
31+
[plugins]

0 commit comments

Comments
 (0)