chore: merge upstream.

This commit is contained in:
KaiserBh
2023-11-09 23:37:56 +11:00
275 changed files with 4294 additions and 2587 deletions

View File

@@ -29,7 +29,7 @@ paging-compose = { module = "androidx.paging:paging-compose", version.ref = "pag
benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0"
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"
test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0-alpha05"
[bundles]
lifecycle = ["lifecycle-common", "lifecycle-process", "lifecycle-runtimektx"]

View File

@@ -1,7 +1,7 @@
[versions]
compiler = "1.5.3"
compose-bom = "2023.11.00-alpha02"
accompanist = "0.33.2-alpha"
compiler = "1.5.4"
compose-bom = "2023.09.00-alpha02"
accompanist = "0.33.1-alpha"
[libraries]
activity = "androidx.activity:activity-compose:1.8.0"

View File

@@ -1,5 +1,5 @@
[versions]
kotlin_version = "1.9.10"
kotlin_version = "1.9.20"
serialization_version = "1.6.0"
xml_serialization_version = "0.86.2"

View File

@@ -1,15 +1,15 @@
[versions]
aboutlib_version = "10.9.1"
aboutlib_version = "10.9.2"
okhttp_version = "5.0.0-alpha.11"
shizuku_version = "12.2.0"
sqlite = "2.4.0"
sqldelight = "2.0.0"
leakcanary = "2.12"
voyager = "1.0.0-rc08"
voyager = "1.0.0-rc09"
richtext = "0.17.0"
[libraries]
desugar = "com.android.tools:desugar_jdk_libs:2.0.3"
desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
google-services-gradle = "com.google.gms:google-services:4.4.0"
@@ -18,6 +18,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-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp_version" }
okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp_version" }
okio = "com.squareup.okio:okio:3.6.0"
@@ -64,7 +65,7 @@ swipe = "me.saket.swipe:swipe:1.2.0"
logcat = "com.squareup.logcat:logcat:0.1"
acra-http = "ch.acra:acra-http:5.11.3"
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.4.0"
firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.5.0"
aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutlib_version" }
@@ -81,8 +82,8 @@ sqldelight-android-paging = { module = "app.cash.sqldelight:androidx-paging3-ext
sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect", version.ref = "sqldelight" }
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.7.2"
junit = "org.junit.jupiter:junit-jupiter:5.10.1"
kotest-assertions = "io.kotest:kotest-assertions-core:5.8.0"
mockk = "io.mockk:mockk:1.13.8"
voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
@@ -96,7 +97,7 @@ google-api-client-oauth = "com.google.oauth-client:google-oauth-client:1.34.1"
kotlinter = "org.jmailen.gradle:kotlinter-gradle:3.13.0"
[bundles]
okhttp = ["okhttp-core", "okhttp-logging", "okhttp-dnsoverhttps"]
okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"]
js-engine = ["quickjs-android"]
sqlite = ["sqlite-framework", "sqlite-ktx", "sqlite-android"]
coil = ["coil-core", "coil-gif", "coil-compose"]