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

Migrate last dependencies to version catalog

This commit is contained in:
Shinokuni 2024-07-05 13:52:59 +02:00
parent 10835b4979
commit e6be6c36fe
4 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/build.gradle.kts
View File

@ -26,11 +26,10 @@ dependencies {
coreLibraryDesugaring(libs.jdk.desugar)
testImplementation("junit:junit:4.13")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test:runner:1.4.0")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
testImplementation(libs.junit4)
implementation(libs.coroutines.core)
testImplementation(libs.coroutines.test)
implementation(libs.bundles.koin)
testImplementation(libs.bundles.kointest)
@ -41,19 +40,12 @@ dependencies {
implementation(libs.okhttp)
testImplementation(libs.okhttp.mockserver)
implementation("com.squareup.retrofit2:retrofit:2.9.0") {
implementation(libs.bundles.retrofit) {
exclude("com.squareup.okhttp3", "okhttp3")
}
implementation("com.squareup.retrofit2:converter-moshi:2.9.0") {
exclude("com.squareup.moshi", "moshi")
}
implementation("com.squareup.moshi:moshi:1.15.1")
api("org.jsoup:jsoup:1.13.1")
debugApi("com.chimerapps.niddler:niddler:1.5.5")
releaseApi("com.chimerapps.niddler:niddler-noop:1.5.5")
testImplementation(libs.coroutines.test)
implementation(libs.moshi)
implementation(libs.jsoup)
implementation(libs.jodatime)
}

27
app/build.gradle.kts
View File

@ -50,18 +50,21 @@ dependencies {
coreLibraryDesugaring(libs.jdk.desugar)
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.8.0")
implementation(libs.corektx)
implementation(libs.appcompat)
implementation(libs.material)
implementation(libs.palette)
implementation(libs.workmanager)
implementation(libs.encrypted.preferences)
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.jsoup)
implementation(libs.jodatime)
testImplementation(libs.junit4)
androidTestImplementation(libs.bundles.test)
implementation(platform(libs.compose.bom))
implementation(libs.bundles.compose)
implementation(libs.compose.activity)
implementation("androidx.palette:palette-ktx:1.0.0")
implementation(libs.bundles.voyager)
implementation(libs.bundles.lifecycle)
@ -76,9 +79,5 @@ dependencies {
implementation(libs.bundles.koin)
androidTestImplementation(libs.bundles.kointest)
androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.9.0")
implementation(libs.encrypted.preferences)
implementation(libs.work.manager)
androidTestImplementation(libs.okhttp.mockserver)
}

18
db/build.gradle.kts
View File

@ -35,25 +35,19 @@ android {
// Needed for kapt starting with kotlin plugin 1.5
kapt {
arguments {
arg("room.schemaLocation", "$projectDir/schemas".toString())
arg("room.schemaLocation", "$projectDir/schemas")
arg("room.incremental", "true")
}
}
dependencies {
coreLibraryDesugaring(libs.jdk.desugar)
api("androidx.core:core-ktx:1.6.0")
api("androidx.appcompat:appcompat:1.3.0")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0")
implementation(libs.corektx)
implementation(libs.appcompat)
testImplementation("junit:junit:4.13")
androidTestImplementation("androidx.test.ext:junit:1.1.3")
androidTestImplementation("androidx.test:runner:1.4.0")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
testImplementation(libs.junit4)
androidTestImplementation(libs.bundles.test)
implementation(libs.bundles.room)
kapt(libs.room.compiler)
@ -61,7 +55,7 @@ dependencies {
implementation(libs.bundles.paging)
api("joda-time:joda-time:2.10.10") //TODO replace with java.time?
implementation(libs.jodatime)
implementation(libs.bundles.koin)
testImplementation(libs.bundles.kointest)

33
gradle/libs.versions.toml
View File

@ -1,5 +1,5 @@
[versions]
compose-bom = "2024.02.02"
compose_bom = "2024.02.02"
voyager = "1.0.0"
lifecycle = "2.7.0"
coil = "2.4.0"
@ -8,9 +8,10 @@ room = "2.6.1"
koin-bom = "3.5.0"
paging = "3.2.1"
okhttp = "4.11.0"
retrofit = "2.9.0"
[libraries]
bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
compose-foundation = { module = "androidx.compose.foundation:foundation" }
compose-runtime = { module = "androidx.compose.runtime:runtime" }
compose-animation = { module = "androidx.compose.animation:animation" }
@ -58,18 +59,36 @@ paging-compose = { module = "androidx.paging:paging-compose", version.ref = "pag
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-mockserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
retrofit-convertermoshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
konsumexml = "com.gitlab.mvysny.konsume-xml:konsume-xml:1.1"
kotlinxmlbuilder = "org.redundent:kotlin-xml-builder:1.7.3" #TODO update this
jdk-desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
jsoup = "org.jsoup:jsoup:1.16.1"
moshi = "com.squareup.moshi:moshi:1.15.1"
jodatime = "joda-time:joda-time:2.10.10" #TODO replace by java.time
# androidx
corektx = "androidx.core:core-ktx:1.13.1"
appcompat = "androidx.appcompat:appcompat:1.7.0"
material = "com.google.android.material:material:1.12.0"
palette = "androidx.palette:palette-ktx:1.0.0"
workmanager = "androidx.work:work-runtime-ktx:2.9.0"
encrypted-preferences = "androidx.security:security-crypto:1.1.0-alpha06"
work-manager = "androidx.work:work-runtime-ktx:2.9.0"
# test
junit4 = "junit:junit:4.13.2"
ext-junit = "androidx.test.ext:junit:1.2.1"
ext-runner = "androidx.test:runner:1.6.1"
ext-rules = "androidx.test:rules:1.6.1"
expressocore = "androidx.test.espresso:espresso-core:3.6.1"
[bundles]
compose = ["bom", "compose-foundation", "compose-runtime", "compose-animation",
"compose-ui", "compose-ui-tooling", "compose-ui-tooling-preview", "compose-material3"]
compose = ["compose-foundation", "compose-runtime", "compose-animation",
"compose-ui", "compose-ui-tooling", "compose-ui-tooling-preview", "compose-material3", "compose-activity"]
voyager = ["voyager-navigator", "voyager-screenmodel", "voyager-tab-navigator", "voyager-koin", "voyager-transitions"]
lifecycle = ["lifecycle-viewmodel-ktx", "lifecycle-viewmodel-compose", "lifecycle-viewmodel-savedstate",
"lifecyle-runtime-compose"]
@ -78,4 +97,6 @@ coroutines = ["coroutines-core", "coroutines-android"]
room = ["room-runtime", "room-ktx", "room-paging"]
koin = ["koin-bom", "koin-core", "koin-android", "koin-androidx-compose"]
kointest = ["koin-test", "koin-test-junit4"]
paging = ["paging-runtime", "paging-compose"]
paging = ["paging-runtime", "paging-compose"]
test = ["junit4", "ext-junit", "ext-runner", "ext-rules", "expressocore"]
retrofit = ["retrofit", "retrofit-convertermoshi"]