Skip to content

Commit 27c4724

Browse files
niyajaliniyajali
authored
Fix - Refactoring dependencies to Version Catalog (#2076)
* Migrated all dependencies to Version Catalog * Migrated all dependencies to Version Catalog * chore: Added Coil Dependency On Version Catalog - Applied version catalog references on remaining module.
1 parent 9268400 commit 27c4724

File tree

13 files changed

+665
-302
lines changed

13 files changed

+665
-302
lines changed

‎build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.1.2" apply false
4-
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
5-
id("com.google.dagger.hilt.android") version "2.50" apply false
6-
id("com.android.library") version "8.1.2" apply false
7-
id("org.jetbrains.kotlin.plugin.serialization") version "1.5.21" apply false
8-
id("androidx.navigation.safeargs") version "2.6.0" apply false
9-
id("io.realm.kotlin") version "1.11.0" apply false
3+
alias(libs.plugins.android.application) apply false
4+
alias(libs.plugins.android.library) apply false
5+
alias(libs.plugins.kotlin.android) apply false
6+
alias(libs.plugins.hilt) apply false
7+
alias(libs.plugins.kotlin.serialization) apply false
8+
alias(libs.plugins.androidx.navigation) apply false
109
}

‎core/common/build.gradle.kts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
44
}
55

66
android {
@@ -23,22 +23,27 @@ android {
2323
)
2424
}
2525
}
26+
2627
compileOptions {
2728
sourceCompatibility = JavaVersion.VERSION_17
2829
targetCompatibility = JavaVersion.VERSION_17
2930
}
31+
3032
kotlinOptions {
3133
jvmTarget = "17"
3234
}
3335
}
3436

3537
dependencies {
38+
implementation(libs.androidx.core.ktx)
39+
implementation(libs.androidx.appcompat)
40+
41+
implementation(libs.material)
42+
43+
testImplementation(libs.junit4)
3644

37-
implementation("androidx.core:core-ktx:1.12.0")
38-
implementation("androidx.appcompat:appcompat:1.6.1")
39-
implementation("com.google.android.material:material:1.11.0")
40-
testImplementation("junit:junit:4.13.2")
41-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
42-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
43-
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
45+
androidTestImplementation(libs.androidx.junit)
46+
androidTestImplementation(libs.androidx.test.espresso.core)
47+
48+
implementation(libs.converter.gson)
4449
}

‎core/data/build.gradle.kts

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
4-
id("kotlin-kapt")
5-
id("kotlin-parcelize")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
id(libs.plugins.kotlin.parcelize.get().pluginId)
5+
id(libs.plugins.kotlin.kapt.get().pluginId)
66
}
77

88
android {
@@ -25,37 +25,43 @@ android {
2525
)
2626
}
2727
}
28+
2829
compileOptions {
2930
sourceCompatibility = JavaVersion.VERSION_17
3031
targetCompatibility = JavaVersion.VERSION_17
3132
}
33+
3234
kotlinOptions {
3335
jvmTarget = "17"
3436
}
3537
}
3638

3739
dependencies {
3840

39-
implementation("androidx.core:core-ktx:1.12.0")
40-
implementation("androidx.appcompat:appcompat:1.6.1")
41-
implementation("com.google.android.material:material:1.11.0")
4241
implementation(project(":core:datastore"))
4342
implementation(project(":core:network"))
44-
testImplementation("junit:junit:4.13.2")
45-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
46-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
47-
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
43+
44+
implementation(libs.androidx.core.ktx)
45+
implementation(libs.androidx.appcompat)
46+
47+
implementation(libs.material)
48+
49+
testImplementation(libs.junit4)
50+
androidTestImplementation(libs.androidx.junit)
51+
androidTestImplementation(libs.androidx.test.espresso.core)
4852

4953
//DBFlow dependencies
50-
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
51-
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
52-
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
54+
kapt(libs.dbflow.processor)
55+
implementation(libs.dbflow)
56+
kapt(libs.github.dbflow.processor)
5357

5458
// Hilt dependency
55-
implementation("com.google.dagger:hilt-android:2.50")
56-
kapt("com.google.dagger:hilt-android-compiler:2.50")
59+
implementation(libs.hilt.android)
60+
kapt(libs.hilt.compiler)
5761

5862
//rxjava dependencies
59-
implementation("io.reactivex:rxandroid:1.1.0")
60-
implementation("io.reactivex:rxjava:1.3.8")
63+
implementation(libs.rxandroid)
64+
implementation(libs.rxjava)
65+
66+
implementation(libs.okhttp)
6167
}

‎core/datastore/build.gradle.kts

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
4-
id("kotlin-kapt")
5-
id("com.google.dagger.hilt.android")
6-
id("io.realm.kotlin")
7-
id("kotlin-parcelize")
8-
id("org.jetbrains.kotlin.plugin.serialization")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.serialization)
5+
alias(libs.plugins.hilt)
6+
id(libs.plugins.kotlin.parcelize.get().pluginId)
7+
id(libs.plugins.kotlin.kapt.get().pluginId)
98
}
109

1110
android {
@@ -44,35 +43,33 @@ dependencies {
4443

4544
implementation(project(":core:common"))
4645

47-
implementation("androidx.core:core-ktx:1.12.0")
48-
implementation("androidx.appcompat:appcompat:1.6.1")
49-
implementation("com.google.android.material:material:1.11.0")
50-
testImplementation("junit:junit:4.13.2")
51-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
52-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
53-
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
46+
implementation(libs.androidx.core.ktx)
47+
implementation(libs.androidx.appcompat)
48+
49+
implementation(libs.material)
50+
51+
testImplementation(libs.junit4)
52+
androidTestImplementation(libs.androidx.junit)
53+
androidTestImplementation(libs.androidx.test.espresso.core)
54+
55+
implementation(libs.converter.gson)
5456

5557
//rxjava dependencies
56-
implementation("io.reactivex:rxandroid:1.1.0")
57-
implementation("io.reactivex:rxjava:1.3.8")
58+
implementation(libs.rxandroid)
59+
implementation(libs.rxjava)
5860

5961
//DBFlow dependencies
60-
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
61-
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
62-
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
62+
kapt(libs.dbflow.processor)
63+
implementation(libs.dbflow)
64+
kapt(libs.github.dbflow.processor)
6365

6466
// Hilt dependency
65-
implementation("com.google.dagger:hilt-android:2.50")
66-
kapt("com.google.dagger:hilt-android-compiler:2.50")
67-
67+
implementation(libs.hilt.android)
68+
kapt(libs.hilt.compiler)
6869

6970
// fineract sdk dependencies
70-
implementation("com.github.openMF:mifos-android-sdk-arch:1.06")
71+
implementation(libs.mifos.android.sdk.arch)
7172

7273
// sdk client
73-
implementation("com.github.openMF:fineract-client:2.0.3")
74-
75-
// Mongo Realm
76-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
77-
implementation("io.realm.kotlin:library-base:1.11.0")
74+
implementation(libs.fineract.client)
7875
}

‎core/designsystem/build.gradle.kts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
4-
id("kotlin-kapt")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
id(libs.plugins.kotlin.kapt.get().pluginId)
55
}
66

77
android {
@@ -44,28 +44,28 @@ android {
4444

4545
dependencies {
4646

47-
implementation("androidx.core:core-ktx:1.12.0")
48-
implementation("androidx.appcompat:appcompat:1.6.1")
49-
implementation("com.google.android.material:material:1.11.0")
50-
implementation(project(":core:datastore"))
51-
testImplementation("junit:junit:4.13.2")
52-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
53-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
47+
implementation(libs.androidx.core.ktx)
48+
implementation(libs.androidx.appcompat)
49+
implementation(libs.androidx.material)
50+
testImplementation(libs.junit4)
51+
androidTestImplementation(libs.androidx.junit)
52+
androidTestImplementation(libs.androidx.test.espresso.core)
5453

5554
// Jetpack Compose
56-
implementation("androidx.compose.material:material:1.6.0")
57-
implementation("androidx.compose.compiler:compiler:1.5.8")
58-
implementation("androidx.compose.ui:ui-tooling-preview:1.6.1")
59-
implementation("androidx.activity:activity-compose:1.8.2")
60-
debugImplementation("androidx.compose.ui:ui-tooling:1.6.1")
61-
implementation("androidx.compose.material3:material3:1.1.2")
62-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
55+
// implementation(libs.androidx.material)
56+
implementation(libs.androidx.compose.material3)
57+
implementation(libs.androidx.compiler)
58+
implementation(libs.androidx.compose.ui.tooling.preview)
59+
implementation(libs.androidx.activity.compose)
60+
debugImplementation(libs.androidx.compose.ui.tooling)
61+
implementation(libs.androidx.lifecycle.viewModelCompose)
62+
implementation(libs.androidx.material.icons.extended)
6363

6464
// coil
65-
implementation("io.coil-kt:coil-compose:2.5.0")
65+
implementation(libs.coil.kt.compose)
6666

6767
//DBFlow dependencies
68-
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
69-
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
70-
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
68+
kapt(libs.dbflow.processor)
69+
implementation(libs.dbflow)
70+
kapt(libs.github.dbflow.processor)
7171
}

‎core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosEditTextField.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.foundation.layout.fillMaxWidth
55
import androidx.compose.foundation.layout.padding
66
import androidx.compose.foundation.text.KeyboardOptions
7-
import androidx.compose.material.Icon
7+
import androidx.compose.material3.Icon
88
import androidx.compose.material3.MaterialTheme
99
import androidx.compose.material3.OutlinedTextField
1010
import androidx.compose.material3.OutlinedTextFieldDefaults

‎core/network/build.gradle.kts

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
4-
id("kotlin-kapt")
5-
id("com.google.dagger.hilt.android")
6-
id("kotlin-parcelize")
7-
id("org.jetbrains.kotlin.plugin.serialization")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.hilt)
5+
alias(libs.plugins.kotlin.serialization)
6+
id(libs.plugins.kotlin.parcelize.get().pluginId)
7+
id(libs.plugins.kotlin.kapt.get().pluginId)
88
}
99

1010
android {
@@ -41,53 +41,50 @@ dependencies {
4141
implementation(project(":core:datastore"))
4242
implementation(project(":core:common"))
4343

44-
implementation("androidx.core:core-ktx:1.12.0")
45-
implementation("androidx.appcompat:appcompat:1.6.1")
46-
implementation("com.google.android.material:material:1.11.0")
47-
testImplementation("junit:junit:4.13.2")
48-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
49-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
44+
implementation(libs.androidx.core.ktx)
45+
implementation(libs.androidx.appcompat)
46+
implementation(libs.material)
47+
testImplementation(libs.junit4)
48+
androidTestImplementation(libs.androidx.junit)
49+
androidTestImplementation(libs.androidx.test.espresso.core)
5050

5151
//rxjava dependencies
52-
implementation("io.reactivex:rxandroid:1.1.0")
53-
implementation("io.reactivex:rxjava:1.3.8")
52+
implementation(libs.rxandroid)
53+
implementation(libs.rxjava)
5454

5555
// Hilt dependency
56-
implementation("com.google.dagger:hilt-android:2.50")
57-
kapt("com.google.dagger:hilt-android-compiler:2.50")
56+
implementation(libs.hilt.android)
57+
kapt(libs.hilt.compiler)
5858

5959
// fineract sdk dependencies
60-
implementation("com.github.openMF:mifos-android-sdk-arch:1.06")
60+
implementation(libs.mifos.android.sdk.arch)
6161

6262
// sdk client
63-
implementation("com.github.openMF:fineract-client:2.0.3")
63+
implementation(libs.fineract.client)
6464

6565
//DBFlow dependencies
66-
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
67-
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
68-
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
69-
70-
// Mongo Realm
71-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
72-
implementation("io.realm.kotlin:library-base:1.11.0")
66+
kapt(libs.dbflow.processor)
67+
implementation(libs.dbflow)
68+
kapt(libs.github.dbflow.processor)
7369

7470

7571
//Square dependencies
7672
implementation("com.squareup.retrofit2:retrofit:2.9.0") {
7773
// exclude Retrofit’s OkHttp peer-dependency module and define your own module import
7874
exclude(module = "okhttp")
7975
}
80-
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
81-
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
82-
implementation("com.squareup.retrofit2:adapter-rxjava:2.9.0")
83-
implementation("com.squareup.okhttp3:okhttp:4.9.2")
84-
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
85-
implementation("com.jakewharton.fliptables:fliptables:1.0.1")
76+
implementation(libs.converter.gson)
77+
implementation(libs.converter.scalars)
78+
implementation(libs.adapter.rxjava)
79+
implementation(libs.okhttp)
80+
implementation(libs.logging.interceptor)
8681

87-
//stetho dependencies
88-
implementation("com.facebook.stetho:stetho:1.3.1")
89-
implementation("com.facebook.stetho:stetho-okhttp3:1.3.1")
82+
implementation(libs.fliptables)
9083

84+
//stetho dependencies
85+
implementation(libs.stetho)
86+
implementation(libs.stetho.okhttp3)
87+
9188
// coil
92-
implementation("io.coil-kt:coil-compose:2.5.0")
89+
implementation(libs.coil.kt.compose)
9390
}

0 commit comments

Comments
 (0)