AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Julian Raufelder 2021-08-25 17:49:07 +02:00
parent 14bcf62cc7
commit b7e9aab2da
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -2,7 +2,7 @@ apply from: 'buildsystem/dependencies.gradle'
apply plugin: "com.vanniktech.android.junit.jacoco" apply plugin: "com.vanniktech.android.junit.jacoco"
buildscript { buildscript {
ext.kotlin_version = '1.5.21' ext.kotlin_version = '1.5.30'
repositories { repositories {
mavenCentral() mavenCentral()
google() google()

14
buildsystem/dependencies.gradle
View File

@ -29,16 +29,16 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.37' daggerVersion = '2.38.1'
gsonVersion = '2.8.7' gsonVersion = '2.8.8'
okHttpVersion = '4.9.1' okHttpVersion = '4.9.1'
okHttpDigestVersion = '2.5' okHttpDigestVersion = '2.5'
velocityVersion = '2.3' velocityVersion = '2.3'
timberVersion = '4.7.1' timberVersion = '5.0.1'
zxcvbnVersion = '1.5.2' zxcvbnVersion = '1.5.2'
@ -50,17 +50,17 @@ ext {
greenDaoVersion = '3.3.0' greenDaoVersion = '3.3.0'
// cloud provider libs // cloud provider libs
cryptolibVersion = '2.0.0-rc7' cryptolibVersion = '2.0.2'
dropboxVersion = '4.0.0' dropboxVersion = '4.0.0'
googleApiServicesVersion = 'v3-rev197-1.25.0' googleApiServicesVersion = 'v3-rev20210725-1.32.1'
googlePlayServicesVersion = '19.0.0' googlePlayServicesVersion = '19.0.0'
googleClientVersion = '1.32.1' googleClientVersion = '1.32.1'
msgraphVersion = '2.10.0' msgraphVersion = '2.10.0'
minIoVersion = '8.2.2' minIoVersion = '8.3.0'
staxVersion = '1.2.0' // needed for minIO staxVersion = '1.2.0' // needed for minIO
commonsCodecVersion = '1.15' commonsCodecVersion = '1.15'
@ -72,7 +72,7 @@ ext {
jUnitVersion = '5.7.1' jUnitVersion = '5.7.1'
jUnit4Version = '4.13.1' jUnit4Version = '4.13.1'
assertJVersion = '1.7.1' assertJVersion = '1.7.1'
mockitoVersion = '3.11.2' mockitoVersion = '3.12.1'
mockitoKotlinVersion = '3.2.0' mockitoKotlinVersion = '3.2.0'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'
dexmakerVersion = '1.0' dexmakerVersion = '1.0'

4
data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveClientFactory.kt
View File

@ -2,7 +2,7 @@ package org.cryptomator.data.cloud.googledrive
import android.content.Context import android.content.Context
import com.google.api.client.http.javanet.NetHttpTransport 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.Drive
import com.google.api.services.drive.DriveScopes import com.google.api.services.drive.DriveScopes
import org.cryptomator.data.BuildConfig 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) } 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) // .setApplicationName("Cryptomator-Android/" + BuildConfig.VERSION_NAME) //
.build() .build()