copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix(deps): update dependency com.google.apis:google-api-services-drive to v3-rev20240521-2.0.0 (#15)

Browse source 
* 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 <cuongtran.tm@gmail.com>
This commit is contained in:
renovate[bot] 2024-07-07 19:43:22 +07:00 committed by Cuong-Tran
parent 3c58b45a9c
commit 241c6ff4c1
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -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 {

11
app/src/main/java/eu/kanade/tachiyomi/data/sync/service/GoogleDriveSyncService.kt
View file

@ -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(),

3
gradle/sy.versions.toml
View file

@ -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"
google-api-services-drive = "com.google.apis:google-api-services-drive:v3-rev20240521-2.0.0"