Skip to content

Commit cc97820

Browse files
jonathankleejonathanklee
committed
Migrate to version catalogs
1 parent a78f545 commit cc97820

File tree

2 files changed

+101
-35
lines changed

2 files changed

+101
-35
lines changed

‎app/build.gradle‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -46,58 +46,57 @@ android {
4646

4747
dependencies {
4848

49-
implementation 'androidx.core:core-ktx:1.15.0'
50-
implementation 'androidx.appcompat:appcompat:1.7.0'
51-
implementation 'com.google.android.material:material:1.9.0'
52-
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
49+
implementation libs.androidx.core.ktx
50+
implementation libs.androidx.appcompat
51+
implementation libs.material
52+
implementation libs.androidx.constraintlayout
5353

54-
implementation 'com.github.bumptech.glide:glide:4.13.1'
54+
implementation libs.glide
5555

56-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1'
57-
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5'
58-
implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
59-
implementation 'androidx.recyclerview:recyclerview:1.3.0'
56+
implementation libs.kotlinx.coroutines.android
57+
implementation libs.androidx.navigation.fragment.ktx
58+
implementation libs.androidx.navigation.ui.ktx
59+
implementation libs.androidx.recyclerview
6060

6161
// hilt
62-
implementation 'com.google.dagger:hilt-android:2.54'
63-
implementation 'androidx.test:runner:1.6.2'
64-
kapt 'com.google.dagger:hilt-compiler:2.54'
65-
testImplementation 'com.google.dagger:hilt-android-testing:2.38.1'
62+
implementation libs.hilt.android
63+
implementation libs.androidx.runner
64+
kapt libs.hilt.compiler
65+
testImplementation libs.hilt.android.testing
6666

67-
def emoji2_version = "1.2.0-alpha04"
68-
implementation "androidx.emoji2:emoji2:$emoji2_version"
69-
implementation "androidx.emoji2:emoji2-views:$emoji2_version"
70-
implementation "androidx.emoji2:emoji2-views-helper:$emoji2_version"
67+
implementation libs.androidx.emoji2
68+
implementation libs.androidx.emoji2.views
69+
implementation libs.androidx.emoji2.views.helper
7170

72-
implementation 'com.scottyab:rootbeer-lib:0.1.0'
71+
implementation libs.rootbeer.lib
7372

74-
testImplementation 'junit:junit:4.13.2'
75-
testImplementation 'org.mockito:mockito-core:4.3.1'
76-
testImplementation 'org.robolectric:robolectric:4.14.1'
77-
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1'
73+
testImplementation libs.junit
74+
testImplementation libs.mockito.core
75+
testImplementation libs.robolectric
76+
testImplementation libs.kotlinx.coroutines.test
7877

79-
androidTestImplementation 'org.mockito:mockito-android:2.24.5'
80-
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
81-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
78+
androidTestImplementation libs.mockito.android
79+
androidTestImplementation libs.androidx.junit
80+
androidTestImplementation libs.androidx.espresso.core
8281

8382
// retrofit
84-
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
85-
implementation 'com.squareup.retrofit2:converter-jackson:2.11.0'
86-
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
87-
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
83+
implementation libs.retrofit
84+
implementation libs.converter.jackson
85+
implementation libs.logging.interceptor
86+
implementation libs.retrofit2.kotlin.coroutines.adapter
8887

89-
implementation 'de.hdodenhof:circleimageview:3.1.0'
88+
implementation libs.circleimageview
9089

91-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
90+
implementation libs.androidx.swiperefreshlayout
9291

9392
// splashscreen
94-
implementation 'androidx.core:core-splashscreen:1.0.1'
93+
implementation libs.androidx.core.splashscreen
9594

9695
// ktor
97-
implementation "io.ktor:ktor-client-core:3.0.3"
98-
implementation "io.ktor:ktor-client-android:3.0.3"
96+
implementation libs.ktor.client.core
97+
implementation libs.ktor.client.android
9998

10099
// preferences
101-
implementation 'androidx.preference:preference-ktx:1.2.1'
100+
implementation libs.androidx.preference.ktx
102101
}
103102

‎gradle/libs.versions.toml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[versions]
2+
appcompat = "1.7.0"
3+
circleimageview = "3.1.0"
4+
constraintlayout = "2.2.0"
5+
coreKtx = "1.15.0"
6+
coreSplashscreen = "1.0.1"
7+
emoji2 = "1.3.0"
8+
espressoCore = "3.6.1"
9+
glide = "4.13.1"
10+
hiltAndroid = "2.54"
11+
hiltAndroidTesting = "2.38.1"
12+
junit = "4.13.2"
13+
junitVersion = "1.2.1"
14+
kotlinxCoroutinesAndroid = "1.10.1"
15+
ktorClientCore = "3.0.3"
16+
loggingInterceptor = "4.11.0"
17+
material = "1.9.0"
18+
mockitoAndroid = "2.24.5"
19+
mockitoCore = "4.3.1"
20+
navigationFragmentKtx = "2.8.5"
21+
navigationUiKtx = "2.5.3"
22+
preferenceKtx = "1.2.1"
23+
recyclerview = "1.3.0"
24+
retrofit = "2.11.0"
25+
retrofit2KotlinCoroutinesAdapter = "0.9.2"
26+
robolectric = "4.14.1"
27+
rootbeerLib = "0.1.0"
28+
runner = "1.6.2"
29+
swiperefreshlayout = "1.1.0"
30+
31+
[libraries]
32+
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
33+
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
34+
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
35+
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
36+
androidx-emoji2 = { module = "androidx.emoji2:emoji2", version.ref = "emoji2" }
37+
androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref = "emoji2" }
38+
androidx-emoji2-views-helper = { module = "androidx.emoji2:emoji2-views-helper", version.ref = "emoji2" }
39+
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
40+
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
41+
androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
42+
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationUiKtx" }
43+
androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
44+
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
45+
androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
46+
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
47+
circleimageview = { module = "de.hdodenhof:circleimageview", version.ref = "circleimageview" }
48+
converter-jackson = { module = "com.squareup.retrofit2:converter-jackson", version.ref = "retrofit" }
49+
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
50+
hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }
51+
hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hiltAndroidTesting" }
52+
hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hiltAndroid" }
53+
junit = { module = "junit:junit", version.ref = "junit" }
54+
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
55+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesAndroid" }
56+
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorClientCore" }
57+
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorClientCore" }
58+
logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" }
59+
material = { module = "com.google.android.material:material", version.ref = "material" }
60+
mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockitoAndroid" }
61+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
62+
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
63+
retrofit2-kotlin-coroutines-adapter = { module = "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter", version.ref = "retrofit2KotlinCoroutinesAdapter" }
64+
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
65+
rootbeer-lib = { module = "com.scottyab:rootbeer-lib", version.ref = "rootbeerLib" }
66+
67+
[plugins]

0 commit comments

Comments
 (0)