chore: merge upstream.

Signed-off-by: KaiserBh <kaiserbh@proton.me>

gradle/androidx.versions.toml

@@ -1,20 +1,20 @@
 [versions]
-agp_version = "8.1.1"
-lifecycle_version = "2.6.1"
-paging_version = "3.2.0"
+agp_version = "8.1.2"
+lifecycle_version = "2.6.2"
+paging_version = "3.2.1"
 
 [libraries]
 gradle = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
 
-annotation = "androidx.annotation:annotation:1.7.0-rc01"
+annotation = "androidx.annotation:annotation:1.7.0"
 appcompat = "androidx.appcompat:appcompat:1.6.1"
 biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-corektx = "androidx.core:core-ktx:1.12.0-rc01"
+corektx = "androidx.core:core-ktx:1.12.0"
 splashscreen = "androidx.core:core-splashscreen:1.0.1"
 recyclerview = "androidx.recyclerview:recyclerview:1.3.1"
 viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01"
-glance = "androidx.glance:glance-appwidget:1.0.0-rc01"
+glance = "androidx.glance:glance-appwidget:1.0.0"
 profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1"
 
 lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle_version" }
@@ -27,7 +27,7 @@ guava = "com.google.guava:guava:32.1.2-android"
 paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "paging_version" }
 paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging_version" }
 
-benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-beta04"
+benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-rc02"
 test-ext = "androidx.test.ext:junit-ktx:1.2.0-alpha01"
 test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-alpha01"
 test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0-alpha04"

gradle/compose.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-compiler = "1.5.2"
+compiler = "1.5.3"
 compose-bom = "2023.09.00-alpha02"
 accompanist = "0.33.1-alpha"
 
 [libraries]
-activity = "androidx.activity:activity-compose:1.7.2"
+activity = "androidx.activity:activity-compose:1.8.0"
 bom = { group = "dev.chrisbanes.compose", name = "compose-bom", version.ref = "compose-bom" }
 foundation = { module = "androidx.compose.foundation:foundation" }
 animation = { module = "androidx.compose.animation:animation" }

gradle/kotlinx.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-kotlin_version = "1.9.0"
+kotlin_version = "1.9.10"
 serialization_version = "1.6.0"
-xml_serialization_version = "0.86.1"
+xml_serialization_version = "0.86.2"
 
 [libraries]
 reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin_version" }

gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-aboutlib_version = "10.8.3"
+aboutlib_version = "10.9.1"
 okhttp_version = "5.0.0-alpha.11"
 shizuku_version = "12.2.0"
 sqlite = "2.3.1"
 sqldelight = "2.0.0"
 leakcanary = "2.12"
-voyager = "1.0.0-rc06"
+voyager = "1.0.0-rc07"
 richtext = "0.17.0"
 
 [libraries]
 desugar = "com.android.tools:desugar_jdk_libs:2.0.3"
 android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
-google-services-gradle = "com.google.gms:google-services:4.3.15"
+google-services-gradle = "com.google.gms:google-services:4.4.0"
 
 rxjava = "io.reactivex:rxjava:1.3.8"
 flowreactivenetwork = "ru.beryukhov:flowreactivenetwork:1.0.4"
@@ -19,7 +19,7 @@ flowreactivenetwork = "ru.beryukhov:flowreactivenetwork:1.0.4"
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp_version" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp_version" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp_version" }
-okio = "com.squareup.okio:okio:3.5.0"
+okio = "com.squareup.okio:okio:3.6.0"
 
 conscrypt-android = "org.conscrypt:conscrypt-android:2.5.2"
 
@@ -33,7 +33,7 @@ junrar = "com.github.junrar:junrar:7.5.5"
 
 sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqlite" }
 sqlite-ktx = { module = "androidx.sqlite:sqlite-ktx", version.ref = "sqlite" }
-sqlite-android = "com.github.requery:sqlite-android:3.42.0"
+sqlite-android = "com.github.requery:sqlite-android:3.43.0"
 
 preferencektx = "androidx.preference:preference-ktx:1.2.1"
 
@@ -44,27 +44,26 @@ coil-core = { module = "io.coil-kt:coil" }
 coil-gif = { module = "io.coil-kt:coil-gif" }
 coil-compose = { module = "io.coil-kt:coil-compose" }
 
-subsamplingscaleimageview = "com.github.tachiyomiorg:subsampling-scale-image-view:c8e2650"
-image-decoder = "com.github.tachiyomiorg:image-decoder:16eda64574"
+subsamplingscaleimageview = "com.github.tachiyomiorg:subsampling-scale-image-view:7e57335"
+image-decoder = "com.github.tachiyomiorg:image-decoder:fbd6601290"
 
 natural-comparator = "com.github.gpanther:java-nat-sort:natural-comparator-1.1"
 
 richtext-commonmark = { module = "com.halilibo.compose-richtext:richtext-commonmark", version.ref = "richtext" }
 richtext-m3 = { module = "com.halilibo.compose-richtext:richtext-ui-material3", version.ref = "richtext" }
 
-material = "com.google.android.material:material:1.9.0"
+material = "com.google.android.material:material:1.10.0"
 flexible-adapter-core = "com.github.arkon.FlexibleAdapter:flexible-adapter:c8013533"
 photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0"
 insetter = "dev.chrisbanes.insetter:insetter:0.6.1"
-compose-materialmotion = "io.github.fornewid:material-motion-compose-core:1.0.6"
-compose-simpleicons = "br.com.devsrsouza.compose.icons.android:simple-icons:1.0.0"
+compose-materialmotion = "io.github.fornewid:material-motion-compose-core:1.1.0"
 
 swipe = "me.saket.swipe:swipe:1.2.0"
 
 logcat = "com.squareup.logcat:logcat:0.1"
 
-acra-http = "ch.acra:acra-http:5.11.1"
+acra-http = "ch.acra:acra-http:5.11.2"
 firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.3.0"
 
 aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
@@ -83,13 +82,14 @@ sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect",
 sqldelight-gradle = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
 
 junit = "org.junit.jupiter:junit-jupiter:5.10.0"
-kotest-assertions = "io.kotest:kotest-assertions-core:5.6.2"
-mockk = "io.mockk:mockk:1.13.7"
+kotest-assertions = "io.kotest:kotest-assertions-core:5.7.2"
+mockk = "io.mockk:mockk:1.13.8"
 
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
 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:11.6.0"
 google-api-services-drive = "com.google.apis:google-api-services-drive:v3-rev197-1.25.0"
 google-api-client-oauth = "com.google.oauth-client:google-oauth-client:1.34.1"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME