Update Gradle and dependencies

This commit is contained in:
Alexander Bakker 2020-08-12 12:54:13 +02:00
parent 35b5ce9d17
commit d660fbc6d1
3 changed files with 12 additions and 12 deletions

View file

@ -97,7 +97,7 @@ protobuf {
} }
dependencies { dependencies {
def cameraxVersion = '1.0.0-beta04' def cameraxVersion = '1.0.0-beta07'
def glideVersion = '4.11.0' def glideVersion = '4.11.0'
def guavaVersion = '29.0' def guavaVersion = '29.0'
def junitVersion = '5.6.2' def junitVersion = '5.6.2'
@ -107,11 +107,11 @@ dependencies {
annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "androidx.biometric:biometric:1.0.1" implementation "androidx.biometric:biometric:1.0.1"
implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-camera2:$cameraxVersion"
implementation "androidx.camera:camera-lifecycle:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion"
implementation "androidx.camera:camera-view:1.0.0-alpha11" implementation "androidx.camera:camera-view:1.0.0-alpha14"
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
@ -130,29 +130,29 @@ dependencies {
implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
implementation "com.google.guava:guava:${guavaVersion}-android" implementation "com.google.guava:guava:${guavaVersion}-android"
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.protobuf:protobuf-javalite:3.12.1' implementation 'com.google.protobuf:protobuf-javalite:3.12.4'
implementation 'com.google.zxing:core:3.4.0' implementation 'com.google.zxing:core:3.4.0'
implementation "com.mikepenz:iconics-core:3.2.5" implementation "com.mikepenz:iconics-core:3.2.5"
implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' 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.0'
implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0'
implementation 'net.lingala.zip4j:zip4j:2.6.0' implementation 'net.lingala.zip4j:zip4j:2.6.1'
implementation 'org.bouncycastle:bcprov-jdk15on:1.65' implementation 'org.bouncycastle:bcprov-jdk15on:1.65'
androidTestImplementation 'androidx.test:core:1.3.0-rc01' androidTestImplementation 'androidx.test:core:1.3.0-rc03'
androidTestImplementation 'androidx.test:runner:1.3.0-rc01' androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
androidTestImplementation 'androidx.test:rules:1.3.0-rc01' androidTestImplementation 'androidx.test:rules:1.3.0-rc03'
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
androidTestImplementation 'junit:junit:4.13' androidTestImplementation 'junit:junit:4.13'
androidTestUtil 'androidx.test:orchestrator:1.3.0-rc01' androidTestUtil 'androidx.test:orchestrator:1.3.0-rc03'
testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "com.google.guava:guava:${guavaVersion}-jre"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
} }

View file

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip