Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/SevenZUtil.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
This commit is contained in:
AbdallahMehiz
2024-02-03 17:00:15 +01:00
359 changed files with 2984 additions and 1147 deletions

View File

@ -8,8 +8,8 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation(project(":source-api"))
api(project(":i18n"))
implementation(projects.sourceApi)
api(projects.i18n)
implementation(libs.unifile)
implementation(libs.junrar)
@ -18,11 +18,11 @@ kotlin {
}
val androidMain by getting {
dependencies {
implementation(project(":core"))
implementation(project(":core-metadata"))
implementation(projects.core.common)
implementation(projects.coreMetadata)
// Move ChapterRecognition to separate module?
implementation(project(":domain"))
implementation(projects.domain)
implementation(kotlinx.bundles.serialization)
}