FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate more dependencies to version catalog

This commit is contained in:
Shinokuni 2024-04-05 22:41:23 +02:00
parent cbeea6ca0d
commit 8a5c22d144
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/build.gradle
View File

@ -52,15 +52,15 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.0'
implementation(libs.bundles.koin)
testImplementation(libs.bundles.kointest)
implementation 'com.gitlab.mvysny.konsume-xml:konsume-xml:1.0'
implementation 'org.redundent:kotlin-xml-builder:1.7.3'
implementation(libs.konsumexml)
implementation(libs.kotlinxmlbuilder)
api 'com.squareup.okhttp3:okhttp:4.9.1'
implementation(libs.okhttp)
testImplementation(libs.okhttp.mockserver)
implementation('com.squareup.retrofit2:retrofit:2.9.0') {
exclude group: 'com.squareup.okhttp3', module: 'okhttp3'
@ -71,7 +71,7 @@ dependencies {
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
implementation 'com.squareup.moshi:moshi:1.12.0'
implementation 'com.squareup.moshi:moshi:1.15.1'
api 'io.reactivex.rxjava2:rxandroid:2.1.1'
api 'org.jsoup:jsoup:1.13.1'

5
app/build.gradle
View File

@ -89,10 +89,6 @@ dependencies {
implementation(libs.bundles.koin)
testImplementation(libs.bundles.kointest)
/*
testImplementation "io.insert-koin:koin-test:$rootProject.ext.koin_version"
testImplementation "io.insert-koin:koin-test-junit4:$rootProject.ext.koin_version"
*/
implementation 'com.github.bumptech.glide:glide:4.12.0'
kapt 'com.github.bumptech.glide:compiler:4.12.0'
@ -118,4 +114,5 @@ dependencies {
debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.96.1'
implementation(libs.bundles.room)
implementation(libs.bundles.paging)
}

1
appcompose/build.gradle
View File

@ -81,6 +81,7 @@ dependencies {
androidTestImplementation(libs.coroutines.test)
implementation(libs.bundles.room)
implementation(libs.bundles.paging)
implementation(libs.bundles.koin)
androidTestImplementation(libs.bundles.kointest)

2
build.gradle
View File

@ -34,8 +34,6 @@ ext {
minSdkVersion = 21
targetSdkVersion = 34
buildToolsVersion = "34.0.0"
koin_version = "3.3.3"
}
tasks.register('clean', Delete) {

13
db/build.gradle
View File

@ -80,20 +80,15 @@ dependencies {
kapt(libs.room.compiler)
androidTestImplementation(libs.room.testing)
implementation 'com.github.MatrixDev.Roomigrant:RoomigrantLib:0.3.4'
implementation 'com.github.MatrixDev.Roomigrant:RoomigrantLib:0.3.4' //TODO delete
kapt 'com.github.MatrixDev.Roomigrant:RoomigrantCompiler:0.3.4'
api 'androidx.paging:paging-runtime:2.1.2'
api 'androidx.paging:paging-common:2.1.2'
implementation(libs.bundles.paging)
api 'joda-time:joda-time:2.10.10'
api 'joda-time:joda-time:2.10.10' //TODO replace with java.time?
implementation(libs.bundles.koin)
testImplementation(libs.bundles.kointest)
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
api "androidx.paging:paging-runtime-ktx:3.2.1"
api "androidx.paging:paging-compose:3.2.1"
implementation(libs.bundles.coroutines)
}

15
gradle/libs.versions.toml
View File

@ -6,6 +6,8 @@ coil = "2.4.0"
coroutines = "1.8.0"
room = "2.6.1"
koin-bom = "3.5.0"
paging = "3.2.1"
okhttp = "4.11.0"
[libraries]
bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
@ -52,6 +54,16 @@ koin-android-compat = { module = "io.insert-koin:koin-android-compat" } #TODO re
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin-bom" }
koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin-bom" }
paging-runtime = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" }
paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-mockserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
konsumexml = "com.gitlab.mvysny.konsume-xml:konsume-xml:1.1"
kotlinxmlbuilder = "org.redundent:kotlin-xml-builder:1.7.3" #TODO update this
[bundles]
compose = ["bom", "compose-foundation", "compose-runtime", "compose-animation",
"compose-ui", "compose-ui-tooling", "compose-ui-tooling-preview", "compose-material3"]
@ -62,4 +74,5 @@ coil = ["coil-core", "coil-compose"]
coroutines = ["coroutines-core", "coroutines-android"]
room = ["room-runtime", "room-ktx", "room-rxjava2", "room-paging"]
koin = ["koin-bom", "koin-core", "koin-android", "koin-androidx-compose", "koin-android-compat"]
kointest = ["koin-test", "koin-test-junit4"]
kointest = ["koin-test", "koin-test-junit4"]
paging = ["paging-runtime", "paging-compose"]