Update dependencies

This commit is contained in:
Julian Raufelder 2021-07-06 12:00:29 +02:00
parent 7deebbd919
commit d82bcaa3e8
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 17 additions and 19 deletions

View File

@ -17,10 +17,10 @@ ext {
// support lib // support lib
androidSupportAnnotationsVersion = '1.2.0' androidSupportAnnotationsVersion = '1.2.0'
androidSupportAppcompatVersion = '1.2.0' androidSupportAppcompatVersion = '1.3.0'
androidSupportDesignVersion = '1.3.0' androidSupportDesignVersion = '1.4.0'
coreDesugaringVersion = '1.0.9' coreDesugaringVersion = '1.1.5'
// app frameworks and utilities // app frameworks and utilities
@ -28,7 +28,7 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.36' daggerVersion = '2.37'
gsonVersion = '2.8.7' gsonVersion = '2.8.7'
@ -39,7 +39,7 @@ ext {
timberVersion = '4.7.1' timberVersion = '4.7.1'
zxcvbnVersion = '1.5.0' zxcvbnVersion = '1.5.2'
scaleImageViewVersion = '3.10.0' scaleImageViewVersion = '3.10.0'
@ -49,19 +49,17 @@ ext {
greenDaoVersion = '3.3.0' greenDaoVersion = '3.3.0'
// cloud provider libs // cloud provider libs
// do not update to 1.4.0 until minsdk is 7.x (or desugaring works better) otherwise it will crash on 6.x
cryptolibVersion = '2.0.0-rc6' cryptolibVersion = '2.0.0-rc6'
dropboxVersion = '4.0.0' dropboxVersion = '4.0.0'
googleApiServicesVersion = 'v3-rev197-1.25.0' googleApiServicesVersion = 'v3-rev197-1.25.0'
googlePlayServicesVersion = '19.0.0' googlePlayServicesVersion = '19.0.0'
googleClientVersion = '1.31.5' googleClientVersion = '1.32.1'
msgraphVersion = '2.10.0' msgraphVersion = '2.10.0'
minIoVersion = '8.2.1' minIoVersion = '8.2.2'
staxVersion = '1.2.0' // needed for minIO staxVersion = '1.2.0' // needed for minIO
commonsCodecVersion = '1.15' commonsCodecVersion = '1.15'
@ -73,26 +71,26 @@ 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.10.0' mockitoVersion = '3.11.2'
mockitoKotlinVersion = '3.2.0' mockitoKotlinVersion = '3.2.0'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'
dexmakerVersion = '1.0' dexmakerVersion = '1.0'
espressoVersion = '3.3.0' espressoVersion = '3.4.0'
testingSupportLibVersion = '0.1' testingSupportLibVersion = '0.1'
runnerVersion = '1.3.0' runnerVersion = '1.4.0'
rulesVersion = '1.3.0' rulesVersion = '1.4.0'
contributionVersion = '3.3.0' contributionVersion = '3.4.0'
uiautomatorVersion = '2.2.0' uiautomatorVersion = '2.2.0'
androidxCoreVersion = '1.3.2' androidxCoreVersion = '1.6.0'
androidxFragmentVersion = '1.3.3' androidxFragmentVersion = '1.3.5'
androidxViewpagerVersion = '1.0.0' androidxViewpagerVersion = '1.0.0'
androidxSwiperefreshVersion = '1.1.0' androidxSwiperefreshVersion = '1.1.0'
androidxPreferenceVersion = '1.1.1' androidxPreferenceVersion = '1.1.1'
androidxRecyclerViewVersion = '1.2.0' androidxRecyclerViewVersion = '1.2.1'
androidxDocumentfileVersion = '1.0.1' androidxDocumentfileVersion = '1.0.1'
androidxBiometricVersion = '1.1.0' androidxBiometricVersion = '1.1.0'
androidxTestCoreVersion = '1.3.0' androidxTestCoreVersion = '1.4.0'
jsonWebTokenApiVersion = '0.11.2' jsonWebTokenApiVersion = '0.11.2'

View File

@ -11,7 +11,7 @@ internal object SSLSocketFactories {
fun from(trustManager: X509TrustManager): SSLSocketFactory { fun from(trustManager: X509TrustManager): SSLSocketFactory {
return try { return try {
val sslContext = SSLContext.getInstance("TLS") val sslContext = SSLContext.getInstance("TLSv1.2")
sslContext.init(null, arrayOf<TrustManager>(trustManager), null) sslContext.init(null, arrayOf<TrustManager>(trustManager), null)
sslContext.socketFactory sslContext.socketFactory
} catch (e: GeneralSecurityException) { } catch (e: GeneralSecurityException) {