From 8c3d99889cbdb53950da38402fe990fe5f1a5519 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 26 Jun 2024 20:03:24 -0400 Subject: [PATCH] Move some libs to sylibs (cherry picked from commit f929a4bc26641fa43afcaabfec07cd76cff6f483) # Conflicts: # gradle/libs.versions.toml # gradle/sy.versions.toml --- app/build.gradle.kts | 9 +++++---- core/common/build.gradle.kts | 2 +- gradle/libs.versions.toml | 5 ----- gradle/sy.versions.toml | 9 ++++++++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8ec6c1a72..fd44c1798 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -182,7 +182,7 @@ dependencies { implementation(libs.bundles.sqlite) // SY --> - implementation(libs.sqlcipher) + implementation(sylibs.sqlcipher) // SY <-- implementation(kotlinx.reflect) @@ -262,9 +262,6 @@ dependencies { implementation(libs.material.kolor) implementation(libs.haze) - implementation(libs.google.api.services.drive) - implementation(libs.google.api.client.oauth) - // Logging implementation(libs.timber) implementation(libs.logcat) @@ -298,6 +295,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 e9a600a4e..150793bc5 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/libs.versions.toml b/gradle/libs.versions.toml index 01a1b98e6..9213a660f 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:41c059e540" -exifinterface = "androidx.exifinterface:exifinterface:1.3.7" natural-comparator = "com.github.gpanther:java-nat-sort:natural-comparator-1.1" @@ -110,9 +108,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.36.0" - [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 c98cfade9..c19dfc48f 100644 --- a/gradle/sy.versions.toml +++ b/gradle/sy.versions.toml @@ -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.3.12" -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.36.0" \ No newline at end of file