diff --git a/build.gradle b/build.gradle index a042107b..afb3fdb4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply from: 'buildsystem/dependencies.gradle' apply plugin: "com.vanniktech.android.junit.jacoco" buildscript { - ext.kotlin_version = '1.4.30' + ext.kotlin_version = '1.4.31' repositories { jcenter() mavenCentral() diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 6e690241..58e43f2f 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -26,7 +26,7 @@ ext { rxAndroidVersion = '2.1.1' rxBindingVersion = '2.2.0' - daggerVersion = '2.32' + daggerVersion = '2.33' gsonVersion = '2.8.6' @@ -55,7 +55,7 @@ ext { googleApiServicesVersion = 'v3-rev197-1.25.0' googlePlayServicesVersion = '19.0.0' - googleClientVersion = '1.31.2' + googleClientVersion = '1.31.3' msgraphVersion = '2.8.1' msaAuthVersion = '0.10.0' diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java index 6dc79510..c4a41c62 100644 --- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java +++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.java @@ -3,7 +3,7 @@ package org.cryptomator.data.cloud.googledrive; import android.content.Context; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.gson.GsonFactory; +import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.services.drive.Drive; import com.google.api.services.drive.DriveScopes; @@ -35,7 +35,9 @@ class GoogleDriveClientFactory { Logger.getLogger("com.google.api.client").addHandler(new Handler() { @Override public void publish(LogRecord record) { - if (record.getMessage().startsWith("-------------- RESPONSE --------------") || record.getMessage().startsWith("-------------- REQUEST --------------") || record.getMessage().startsWith("{\n \"files\": [\n")) { + if (record.getMessage().startsWith("-------------- RESPONSE --------------") // + || record.getMessage().startsWith("-------------- REQUEST --------------") // + || record.getMessage().startsWith("{\n \"files\": [\n")) { Timber.tag("GoogleDriveClient").d(record.getMessage()); } } @@ -53,7 +55,7 @@ class GoogleDriveClientFactory { try { FixedGoogleAccountCredential credential = FixedGoogleAccountCredential.usingOAuth2(context, Collections.singleton(DriveScopes.DRIVE)); credential.setAccountName(accountName); - return new Drive.Builder(new NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) // + return new Drive.Builder(new NetHttpTransport(), JacksonFactory.getDefaultInstance(), credential) // .setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) // .build(); } catch (Exception e) {