Skip to content

Commit 6aa1f8f

Browse files
android10android10
committed
ref: build system, move libraries to gradle libraries catalog
1 parent adfa876 commit 6aa1f8f

File tree

2 files changed

+85
-46
lines changed

2 files changed

+85
-46
lines changed

‎app/build.gradle.kts

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -62,49 +62,40 @@ android {
6262

6363
dependencies {
6464
//Compile time dependencies
65-
kapt("androidx.lifecycle:lifecycle-compiler:2.6.1")
65+
kapt(libs.androidx.lifecycle.compiler)
6666

6767
// Application dependencies
68-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
69-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
70-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2")
71-
implementation("androidx.appcompat:appcompat:1.6.1")
72-
implementation("androidx.core:core-ktx:1.10.1")
73-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
74-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
75-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
76-
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
77-
78-
79-
//koin
80-
implementation("io.insert-koin:koin-android:3.4.3")
81-
// implementation("io.insert-koin:koin-android-viewmodel:3.4")
82-
83-
// Update from here
84-
implementation("androidx.cardview:cardview:1.0.0")
85-
implementation("androidx.recyclerview:recyclerview:1.3.0")
86-
implementation("com.google.android.material:material:1.9.0")
87-
implementation("androidx.annotation:annotation:1.6.0")
88-
implementation("com.github.bumptech.glide:glide:4.15.1")
89-
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
90-
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11")
91-
92-
//TODO: change this
93-
implementation("androidx.fragment:fragment-ktx:1.6.0")
94-
95-
// Unit/Android tests dependencies
96-
testImplementation("junit:junit:4.13.2")
97-
testImplementation("io.mockk:mockk:1.13.5")
98-
testImplementation("org.amshove.kluent:kluent-android:1.73")
99-
testImplementation("org.robolectric:robolectric:4.10.3")
100-
101-
// Acceptance tests dependencies
102-
androidTestImplementation("androidx.test:runner:1.5.2")
103-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
104-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
105-
androidTestImplementation("androidx.test:rules:1.5.0")
106-
androidTestImplementation("androidx.test.espresso:espresso-intents:3.5.1")
107-
108-
// Development dependencies
109-
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
68+
implementation(libs.kotlin.stdlib.jdk8)
69+
implementation(libs.kotlinx.coroutines.core)
70+
implementation(libs.kotlinx.coroutines.android)
71+
implementation(libs.koin.android)
72+
implementation(libs.android.appcompat)
73+
implementation(libs.android.core.ktx)
74+
implementation(libs.androidx.fragment.ktx)
75+
implementation(libs.androidx.constraintlayout)
76+
implementation(libs.androidx.lifecycle.viewmodel.ktx)
77+
implementation(libs.androidx.lifecycle.livedata.ktx)
78+
implementation(libs.androidx.lifecycle.extensions)
79+
implementation(libs.androidx.cardview)
80+
implementation(libs.androidx.recyclerview)
81+
implementation(libs.material)
82+
implementation(libs.androidx.annotation)
83+
implementation(libs.glide)
84+
implementation(libs.converter.gson)
85+
86+
// Unit/Integration tests dependencies
87+
testImplementation(libs.junit)
88+
testImplementation(libs.mockk)
89+
testImplementation(libs.kluent.android)
90+
testImplementation(libs.robolectric)
91+
92+
// UI tests dependencies
93+
androidTestImplementation(libs.androidx.runner)
94+
androidTestImplementation(libs.androidx.espresso.core)
95+
androidTestImplementation(libs.androidx.junit)
96+
androidTestImplementation(libs.androidx.rules)
97+
androidTestImplementation(libs.androidx.espresso.intents)
98+
99+
// Development/Tooling dependencies
100+
debugImplementation(libs.leakcanary.android)
110101
}

‎gradle/libs.versions.toml

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,36 @@ materialDesign = "1.1.1"
1313
composeBom = "2023.05.01"
1414
activityCompose = "1.7.2"
1515
liveData = "1.4.3"
16+
lifecycleCompiler = "2.6.1"
17+
constraintlayout = "2.1.4"
18+
lifecycleViewmodelKtx = "2.6.1"
19+
lifecycleLivedataKtx = "2.6.1"
20+
lifecycleExtensions = "2.2.0"
21+
koinAndroid = "3.4.3"
22+
recyclerview = "1.3.1"
23+
cardview = "1.0.0"
24+
materialDesignLegacy = "1.9.0"
25+
annotation = "1.6.0"
26+
glide = "4.15.1"
27+
converterGson = "2.9.0"
28+
fragmentKtx = "1.6.1"
29+
# testing
30+
junit = "4.13.2"
31+
mockk = "1.13.5"
32+
kluentAndroid = "1.73"
33+
robolectric = "4.10.3"
34+
runner = "1.5.2"
35+
espressoCore = "3.5.1"
36+
junitVersion = "1.1.5"
37+
rules = "1.5.0"
38+
# tooling -------
39+
leakcanaryAndroid = "2.12"
1640
# plugings -------
1741
androidGradlePlugin = "8.0.2"
1842

1943

2044
[libraries]
21-
# dependencies ---
45+
# main module dependencies ---
2246
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
2347
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
2448
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinCoroutines" }
@@ -29,10 +53,34 @@ androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime
2953
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "materialDesign" }
3054
androidx-compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "materialDesign" }
3155
androidx-activty-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
32-
33-
# tooling --------
56+
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
57+
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
58+
androidx-lifecycle-compiler = { module = "androidx.lifecycle:lifecycle-compiler", version.ref = "lifecycleCompiler" }
59+
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
60+
androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycleExtensions" }
61+
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
62+
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" }
63+
androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
64+
material = { module = "com.google.android.material:material", version.ref = "materialDesignLegacy" }
65+
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
66+
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
67+
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
68+
androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
69+
# main module unit/integration test dependencies ---
70+
junit = { module = "junit:junit", version.ref = "junit" }
71+
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
72+
kluent-android = { module = "org.amshove.kluent:kluent-android", version.ref = "kluentAndroid" }
73+
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
74+
# main module ui test dependencies ---
75+
androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
76+
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
77+
androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoCore" }
78+
androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
79+
androidx-rules = { module = "androidx.test:rules", version.ref = "rules" }
80+
# main module tooling dependencies --------
3481
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
3582
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
83+
leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" }
3684

3785

3886
[plugins]

0 commit comments

Comments
 (0)