Skip to content

Commit

Permalink
Fix - Refactoring dependencies to Version Catalog (#2076)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
niyajali committed May 7, 2024
1 parent 9268400 commit 27c4724
Show file tree
Hide file tree
Showing 13 changed files with 665 additions and 302 deletions.
13 changes: 6 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.1.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
id("com.google.dagger.hilt.android") version "2.50" apply false
id("com.android.library") version "8.1.2" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.5.21" apply false
id("androidx.navigation.safeargs") version "2.6.0" apply false
id("io.realm.kotlin") version "1.11.0" apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.androidx.navigation) apply false
}
23 changes: 14 additions & 9 deletions core/common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand All @@ -23,22 +23,27 @@ android {
)
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}
}

dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)

implementation(libs.material)

testImplementation(libs.junit4)

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.espresso.core)

implementation(libs.converter.gson)
}
42 changes: 24 additions & 18 deletions core/data/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("kotlin-parcelize")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
id(libs.plugins.kotlin.parcelize.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
}

android {
Expand All @@ -25,37 +25,43 @@ android {
)
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}
}

dependencies {

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
implementation(project(":core:datastore"))
implementation(project(":core:network"))
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)

implementation(libs.material)

testImplementation(libs.junit4)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.espresso.core)

//DBFlow dependencies
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
kapt(libs.dbflow.processor)
implementation(libs.dbflow)
kapt(libs.github.dbflow.processor)

// Hilt dependency
implementation("com.google.dagger:hilt-android:2.50")
kapt("com.google.dagger:hilt-android-compiler:2.50")
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)

//rxjava dependencies
implementation("io.reactivex:rxandroid:1.1.0")
implementation("io.reactivex:rxjava:1.3.8")
implementation(libs.rxandroid)
implementation(libs.rxjava)

implementation(libs.okhttp)
}
53 changes: 25 additions & 28 deletions core/datastore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("com.google.dagger.hilt.android")
id("io.realm.kotlin")
id("kotlin-parcelize")
id("org.jetbrains.kotlin.plugin.serialization")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.hilt)
id(libs.plugins.kotlin.parcelize.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
}

android {
Expand Down Expand Up @@ -44,35 +43,33 @@ dependencies {

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

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)

implementation(libs.material)

testImplementation(libs.junit4)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.espresso.core)

implementation(libs.converter.gson)

//rxjava dependencies
implementation("io.reactivex:rxandroid:1.1.0")
implementation("io.reactivex:rxjava:1.3.8")
implementation(libs.rxandroid)
implementation(libs.rxjava)

//DBFlow dependencies
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
kapt(libs.dbflow.processor)
implementation(libs.dbflow)
kapt(libs.github.dbflow.processor)

// Hilt dependency
implementation("com.google.dagger:hilt-android:2.50")
kapt("com.google.dagger:hilt-android-compiler:2.50")

implementation(libs.hilt.android)
kapt(libs.hilt.compiler)

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

// sdk client
implementation("com.github.openMF:fineract-client:2.0.3")

// Mongo Realm
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
implementation("io.realm.kotlin:library-base:1.11.0")
implementation(libs.fineract.client)
}
42 changes: 21 additions & 21 deletions core/designsystem/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
id(libs.plugins.kotlin.kapt.get().pluginId)
}

android {
Expand Down Expand Up @@ -44,28 +44,28 @@ android {

dependencies {

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
implementation(project(":core:datastore"))
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.material)
testImplementation(libs.junit4)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.espresso.core)

// Jetpack Compose
implementation("androidx.compose.material:material:1.6.0")
implementation("androidx.compose.compiler:compiler:1.5.8")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.1")
implementation("androidx.activity:activity-compose:1.8.2")
debugImplementation("androidx.compose.ui:ui-tooling:1.6.1")
implementation("androidx.compose.material3:material3:1.1.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
// implementation(libs.androidx.material)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compiler)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.activity.compose)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.lifecycle.viewModelCompose)
implementation(libs.androidx.material.icons.extended)

// coil
implementation("io.coil-kt:coil-compose:2.5.0")
implementation(libs.coil.kt.compose)

//DBFlow dependencies
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")
kapt(libs.dbflow.processor)
implementation(libs.dbflow)
kapt(libs.github.dbflow.processor)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.Icon
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
Expand Down
67 changes: 32 additions & 35 deletions core/network/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("com.google.dagger.hilt.android")
id("kotlin-parcelize")
id("org.jetbrains.kotlin.plugin.serialization")
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.serialization)
id(libs.plugins.kotlin.parcelize.get().pluginId)
id(libs.plugins.kotlin.kapt.get().pluginId)
}

android {
Expand Down Expand Up @@ -41,53 +41,50 @@ dependencies {
implementation(project(":core:datastore"))
implementation(project(":core:common"))

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.material)
testImplementation(libs.junit4)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.espresso.core)

//rxjava dependencies
implementation("io.reactivex:rxandroid:1.1.0")
implementation("io.reactivex:rxjava:1.3.8")
implementation(libs.rxandroid)
implementation(libs.rxjava)

// Hilt dependency
implementation("com.google.dagger:hilt-android:2.50")
kapt("com.google.dagger:hilt-android-compiler:2.50")
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)

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

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

//DBFlow dependencies
kapt("com.github.raizlabs.dbflow.dbflow:dbflow-processor:3.1.1")
implementation("com.github.raizlabs.dbflow.dbflow:dbflow:3.1.1")
kapt("com.github.raizlabs.dbflow:dbflow-processor:4.2.4")

// Mongo Realm
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
implementation("io.realm.kotlin:library-base:1.11.0")
kapt(libs.dbflow.processor)
implementation(libs.dbflow)
kapt(libs.github.dbflow.processor)


//Square dependencies
implementation("com.squareup.retrofit2:retrofit:2.9.0") {
// exclude Retrofit’s OkHttp peer-dependency module and define your own module import
exclude(module = "okhttp")
}
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
implementation("com.squareup.retrofit2:adapter-rxjava:2.9.0")
implementation("com.squareup.okhttp3:okhttp:4.9.2")
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
implementation("com.jakewharton.fliptables:fliptables:1.0.1")
implementation(libs.converter.gson)
implementation(libs.converter.scalars)
implementation(libs.adapter.rxjava)
implementation(libs.okhttp)
implementation(libs.logging.interceptor)

//stetho dependencies
implementation("com.facebook.stetho:stetho:1.3.1")
implementation("com.facebook.stetho:stetho-okhttp3:1.3.1")
implementation(libs.fliptables)

//stetho dependencies
implementation(libs.stetho)
implementation(libs.stetho.okhttp3)

// coil
implementation("io.coil-kt:coil-compose:2.5.0")
implementation(libs.coil.kt.compose)
}

0 comments on commit 27c4724

Please sign in to comment.