diff --git a/build.gradle b/build.gradle index e02d44a7..3b39b2bd 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply from: 'buildsystem/dependencies.gradle' apply plugin: "com.vanniktech.android.junit.jacoco" buildscript { - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.5.30' repositories { mavenCentral() google() diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 184a185d..b10eb245 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -29,16 +29,16 @@ ext { rxAndroidVersion = '2.1.1' rxBindingVersion = '2.2.0' - daggerVersion = '2.37' + daggerVersion = '2.38.1' - gsonVersion = '2.8.7' + gsonVersion = '2.8.8' okHttpVersion = '4.9.1' okHttpDigestVersion = '2.5' velocityVersion = '2.3' - timberVersion = '4.7.1' + timberVersion = '5.0.1' zxcvbnVersion = '1.5.2' @@ -50,17 +50,17 @@ ext { greenDaoVersion = '3.3.0' // cloud provider libs - cryptolibVersion = '2.0.0-rc7' + cryptolibVersion = '2.0.2' dropboxVersion = '4.0.0' - googleApiServicesVersion = 'v3-rev197-1.25.0' + googleApiServicesVersion = 'v3-rev20210725-1.32.1' googlePlayServicesVersion = '19.0.0' googleClientVersion = '1.32.1' msgraphVersion = '2.10.0' - minIoVersion = '8.2.2' + minIoVersion = '8.3.0' staxVersion = '1.2.0' // needed for minIO commonsCodecVersion = '1.15' @@ -72,7 +72,7 @@ ext { jUnitVersion = '5.7.1' jUnit4Version = '4.13.1' assertJVersion = '1.7.1' - mockitoVersion = '3.11.2' + mockitoVersion = '3.12.1' mockitoKotlinVersion = '3.2.0' hamcrestVersion = '1.3' dexmakerVersion = '1.0' diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt index 8cdb15f1..9e2c89c4 100644 --- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt +++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt @@ -2,7 +2,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.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 org.cryptomator.data.BuildConfig @@ -46,7 +46,7 @@ class GoogleDriveClientFactory internal constructor() { }) } val credential = FixedGoogleAccountCredential.usingOAuth2(context, setOf(DriveScopes.DRIVE)).also { it.setAccountName(accountName) } - return Drive.Builder(NetHttpTransport(), JacksonFactory.getDefaultInstance(), credential) // + return Drive.Builder(NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) // .setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) // .build()