From 15e28abecdf1b150d067c31fd9672b12cc820aa6 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 12 Dec 2020 11:10:27 +0100 Subject: [PATCH] Update dependencies This also disables the Jetifier, because we don't need it anymore. --- app/build.gradle | 20 ++++++++++---------- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 920847ea..e50b3dad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,11 +111,11 @@ protobuf { } dependencies { - def cameraxVersion = '1.0.0-beta11' + def cameraxVersion = '1.0.0-rc01' def glideVersion = '4.11.0' - def guavaVersion = '30.0' + def guavaVersion = '30.1' def junitVersion = '5.7.0' - def libsuVersion = '2.5.1' + def libsuVersion = '3.0.2' annotationProcessor 'androidx.annotation:annotation:1.1.0' annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" @@ -125,9 +125,9 @@ dependencies { implementation "androidx.biometric:biometric:1.0.1" implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" - implementation "androidx.camera:camera-view:1.0.0-alpha18" + implementation "androidx.camera:camera-view:1.0.0-alpha20" implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.lifecycle:lifecycle-process:2.2.0" implementation 'androidx.preference:preference:1.1.1' @@ -135,7 +135,7 @@ dependencies { implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.getbase:floatingactionbutton:1.10.1' - implementation 'com.github.avito-tech:krop:0.44' + implementation 'com.github.avito-tech:krop:0.51' implementation "com.github.bumptech.glide:annotations:${glideVersion}" implementation "com.github.bumptech.glide:glide:${glideVersion}" implementation("com.github.bumptech.glide:recyclerview-integration:${glideVersion}") { @@ -145,16 +145,16 @@ dependencies { implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.google.guava:guava:${guavaVersion}-android" implementation 'com.google.android.material:material:1.0.0' - implementation 'com.google.protobuf:protobuf-javalite:3.13.0' + implementation 'com.google.protobuf:protobuf-javalite:3.14.0' implementation 'com.google.zxing:core:3.4.1' implementation "com.mikepenz:iconics-core:3.2.5" implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' - implementation 'com.nulab-inc:zxcvbn:1.3.0' + implementation 'com.nulab-inc:zxcvbn:1.3.1' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0' implementation 'net.lingala.zip4j:zip4j:2.6.4' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk15on:1.65' + implementation 'org.bouncycastle:bcprov-jdk15on:1.68' androidTestImplementation 'androidx.test:core:1.3.0' androidTestImplementation 'androidx.test:runner:1.3.0' @@ -170,5 +170,5 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' } diff --git a/build.gradle b/build.gradle index c031c4b6..de57a1d7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.1' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.13' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 9d7aa3a4..2a4361c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.enableJetifier=true +android.enableJetifier=false android.useAndroidX=true org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m