From 241c6ff4c1fe0975e8f05b7ef3a2d29b09b90ff2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 19:43:22 +0700 Subject: [PATCH] fix(deps): update dependency com.google.apis:google-api-services-drive to v3-rev20240521-2.0.0 (#15) * fix(deps): update dependency com.google.apis:google-api-services-drive to v3-rev20240521-2.0.0 * Migrate from deprecated Jackson to Gson & fix "2 files found with path 'META-INF/INDEX.LIST'" --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Cuong-Tran --- app/build.gradle.kts | 2 +- .../data/sync/service/GoogleDriveSyncService.kt | 11 +++++------ gradle/sy.versions.toml | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fd44c1798..4c6bea113 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -124,6 +124,7 @@ android { "META-INF/README.md", "META-INF/NOTICE", "META-INF/*.kotlin_module", + "META-INF/INDEX.LIST", ), ) } @@ -298,7 +299,6 @@ dependencies { // Google drive implementation(sylibs.google.api.services.drive) - implementation(sylibs.google.api.client.oauth) } androidComponents { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt index 7f890d477..6c0a4afba 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt @@ -12,8 +12,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential import com.google.api.client.googleapis.auth.oauth2.GoogleTokenResponse import com.google.api.client.http.InputStreamContent import com.google.api.client.http.javanet.NetHttpTransport -import com.google.api.client.json.JsonFactory -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.drive.Drive import com.google.api.services.drive.DriveScopes import com.google.api.services.drive.model.File @@ -290,7 +289,7 @@ class GoogleDriveService(private val context: Context) { * @return The authorization URL. */ private fun generateAuthorizationUrl(): String { - val jsonFactory: JsonFactory = JacksonFactory.getDefaultInstance() + val jsonFactory: GsonFactory = GsonFactory.getDefaultInstance() val secrets = GoogleClientSecrets.load( jsonFactory, context.assets.open("client_secrets.json").reader(), @@ -311,7 +310,7 @@ class GoogleDriveService(private val context: Context) { internal suspend fun refreshToken() = withIOContext { val refreshToken = syncPreferences.googleDriveRefreshToken().get() - val jsonFactory: JsonFactory = JacksonFactory.getDefaultInstance() + val jsonFactory: GsonFactory = GsonFactory.getDefaultInstance() val secrets = GoogleClientSecrets.load( jsonFactory, context.assets.open("client_secrets.json").reader(), @@ -362,7 +361,7 @@ class GoogleDriveService(private val context: Context) { * @param refreshToken The refresh token obtained from the SyncPreferences. */ private fun setupGoogleDriveService(accessToken: String, refreshToken: String) { - val jsonFactory: JsonFactory = JacksonFactory.getDefaultInstance() + val jsonFactory: GsonFactory = GsonFactory.getDefaultInstance() val secrets = GoogleClientSecrets.load( jsonFactory, context.assets.open("client_secrets.json").reader(), @@ -401,7 +400,7 @@ class GoogleDriveService(private val context: Context) { onSuccess: () -> Unit, onFailure: (String) -> Unit, ) { - val jsonFactory: JsonFactory = JacksonFactory.getDefaultInstance() + val jsonFactory: GsonFactory = GsonFactory.getDefaultInstance() val secrets = GoogleClientSecrets.load( jsonFactory, context.assets.open("client_secrets.json").reader(), diff --git a/gradle/sy.versions.toml b/gradle/sy.versions.toml index 61a4d0142..156a660f3 100644 --- a/gradle/sy.versions.toml +++ b/gradle/sy.versions.toml @@ -17,5 +17,4 @@ sqlcipher = "net.zetetic:sqlcipher-android:4.6.0" 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 +google-api-services-drive = "com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0" \ No newline at end of file