diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 83883635f099..f67cb8629ff3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -168,7 +168,7 @@ dependencies { implementation(libs.bundles.sqlite) // SY --> - implementation(libs.sqlcipher) + implementation(sylibs.sqlcipher) // SY <-- implementation(kotlinx.reflect) @@ -246,9 +246,6 @@ dependencies { implementation(libs.compose.grid) - implementation(libs.google.api.services.drive) - implementation(libs.google.api.client.oauth) - // Logging implementation(libs.logcat) @@ -281,6 +278,10 @@ dependencies { // RatingBar (SY) implementation(sylibs.ratingbar) implementation(sylibs.composeRatingbar) + + // Google drive + implementation(sylibs.google.api.services.drive) + implementation(sylibs.google.api.client.oauth) } androidComponents { diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index e9a600a4ea81..150793bc5252 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -58,6 +58,6 @@ dependencies { implementation(sylibs.xlog) implementation(libs.zip4j) implementation(libs.injekt.core) - implementation(libs.exifinterface) + implementation(sylibs.exifinterface) // SY <-- } diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml index 0e1086520689..03b23177d498 100644 --- a/gradle/kotlinx.versions.toml +++ b/gradle/kotlinx.versions.toml @@ -10,7 +10,7 @@ compose-compiler-gradle = { module = "org.jetbrains.kotlin:compose-compiler-grad immutables = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" } -coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.8.0" } +coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.8.1" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" } coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a767a72b1266..1342ceefcbfc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,6 @@ zip4j = "net.lingala.zip4j:zip4j:2.11.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.45.0" -sqlcipher = "net.zetetic:sqlcipher-android:4.5.4" preferencektx = "androidx.preference:preference-ktx:1.2.1" @@ -53,7 +52,6 @@ coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp" } subsamplingscaleimageview = "com.github.tachiyomiorg:subsampling-scale-image-view:b8e1b0ed2b" image-decoder = "com.github.tachiyomiorg:image-decoder:e08e9be535" -exifinterface = "androidx.exifinterface:exifinterface:1.3.7" natural-comparator = "com.github.gpanther:java-nat-sort:natural-comparator-1.1" @@ -106,9 +104,6 @@ detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plug 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" } -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" - [bundles] archive = ["common-compress", "junrar"] okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"] diff --git a/gradle/sy.versions.toml b/gradle/sy.versions.toml index f7530f247bbc..06a00fdb6160 100644 --- a/gradle/sy.versions.toml +++ b/gradle/sy.versions.toml @@ -1,9 +1,9 @@ [versions] [libraries] -firebase-analytics = "com.google.firebase:firebase-analytics:22.0.0" -firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics:19.0.0" -firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:2.9.9" +firebase-analytics = "com.google.firebase:firebase-analytics:22.0.2" +firebase-crashlytics-ktx = "com.google.firebase:firebase-crashlytics:19.0.2" +firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:3.0.2" simularity = "info.debatty:java-string-similarity:2.0.0" xlog = "com.elvishew:xlog:1.11.0" @@ -11,4 +11,11 @@ xlog = "com.elvishew:xlog:1.11.0" ratingbar = "me.zhanghai.android.materialratingbar:library:1.4.0" composeRatingbar = "com.github.a914-gowtham:compose-ratingbar:1.2.3" -versionsx = "com.github.ben-manes:gradle-versions-plugin:0.51.0" \ No newline at end of file +versionsx = "com.github.ben-manes:gradle-versions-plugin:0.51.0" + +sqlcipher = "net.zetetic:sqlcipher-android:4.5.4" + +exifinterface = "androidx.exifinterface:exifinterface:1.3.7" + +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" \ No newline at end of file