From f83768ea4a28917288abe26bd2d327c0768799dc Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 20 Jan 2021 14:08:36 +0100
Subject: [PATCH] Update dependencies

---
 buildsystem/dependencies.gradle                           | 8 ++++----
 .../data/cloud/googledrive/GoogleDriveClientFactory.java  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index 8a8ec546..800f7e70 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -27,7 +27,7 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'
 
-	daggerVersion = '2.30.1'
+	daggerVersion = '2.31'
 
 	gsonVersion = '2.8.6'
 
@@ -56,7 +56,7 @@ ext {
 
 	googleApiServicesVersion = 'v3-rev197-1.25.0'
 	googlePlayServicesVersion = '19.0.0'
-	googleClientVersion = '1.31.1'
+	googleClientVersion = '1.31.2'
 
 	msgraphVersion = '2.5.0'
 	msaAuthVersion = '0.10.0'
@@ -70,8 +70,8 @@ ext {
 	jUnitVersion = '5.7.0'
 	jUnit4Version = '4.13.1'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '3.6.28'
-	mockitoInlineVersion = '3.6.28'
+	mockitoVersion = '3.7.7'
+	mockitoInlineVersion = '3.7.7'
 	hamcrestVersion = '1.3'
 	dexmakerVersion = '1.0'
 	espressoVersion = '3.3.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 6775d7e8..02532be4 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
@@ -2,8 +2,8 @@ package org.cryptomator.data.cloud.googledrive;
 
 import android.content.Context;
 
-import com.google.api.client.extensions.android.http.AndroidHttp;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.DriveScopes;
 
@@ -24,7 +24,7 @@ class GoogleDriveClientFactory {
 		try {
 			FixedGoogleAccountCredential credential = FixedGoogleAccountCredential.usingOAuth2(context, Collections.singleton(DriveScopes.DRIVE));
 			credential.setAccountName(accountName);
-			return new Drive.Builder(AndroidHttp.newCompatibleTransport(), JacksonFactory.getDefaultInstance(), credential) //
+			return new Drive.Builder(new NetHttpTransport(), GsonFactory.getDefaultInstance(), credential) //
 					.setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) //
 					.build();
 		} catch (Exception e) {