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

@@ -1,5 +1,5 @@
[versions]
agp_version = "8.2.1"
agp_version = "8.2.2"
lifecycle_version = "2.6.2"
paging_version = "3.2.1"

View File

@@ -1,7 +1,7 @@
[versions]
compiler = "1.5.8"
compose-bom = "2023.12.00-alpha04"
accompanist = "0.33.2-alpha"
compose-bom = "2024.01.00-alpha03"
accompanist = "0.34.0"
[libraries]
activity = "androidx.activity:activity-compose:1.8.2"
@@ -23,5 +23,3 @@ glance = "androidx.glance:glance-appwidget:1.0.0"
accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" }
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
lintchecks = { module = "com.slack.lint.compose:compose-lint-checks", version = "1.2.0" }

View File

@@ -8,6 +8,8 @@ shizuku_version = "12.2.0"
sqldelight = "2.0.0"
sqlite = "2.4.0"
voyager = "1.0.0"
detekt = "1.23.1"
detektCompose = "0.3.11"
[libraries]
desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
@@ -95,7 +97,9 @@ voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", vers
voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" }
voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }
ktlint = "org.jlleitschuh.gradle:ktlint-gradle:12.0.3"
detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
detekt-rules-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-rules-compose = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }
[bundles]
okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"]