Update dependencies

This also updates the test dependencies to an alpha version. We have to
use a pre-stable version, because these include some fixes for running
on API 33.
This commit is contained in:
Alexander Bakker 2022-09-14 18:04:58 +02:00
parent e19ceb0761
commit 3ec6e35011
3 changed files with 14 additions and 17 deletions

View file

@ -115,26 +115,25 @@ protobuf {
} }
dependencies { dependencies {
def androidTestVersion = '1.4.0'
def cameraxVersion = '1.1.0' def cameraxVersion = '1.1.0'
def glideVersion = '4.13.2' def glideVersion = '4.13.2'
def guavaVersion = '31.1' def guavaVersion = '31.1'
def hiltVersion = '2.43.1' def hiltVersion = '2.43.2'
def junitVersion = '4.13.2' def junitVersion = '4.13.2'
def libsuVersion = '5.0.2' def libsuVersion = '5.0.3'
annotationProcessor 'androidx.annotation:annotation:1.4.0' annotationProcessor 'androidx.annotation:annotation:1.4.0'
annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion"
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.4.2' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.biometric:biometric:1.1.0"
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.1.0" implementation "androidx.camera:camera-view:1.1.0"
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.core:core:1.8.0" implementation "androidx.core:core:1.9.0"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.lifecycle:lifecycle-process:2.5.1" implementation "androidx.lifecycle:lifecycle-process:2.5.1"
@ -165,24 +164,24 @@ dependencies {
implementation 'com.nulab-inc:zxcvbn:1.7.0' implementation 'com.nulab-inc:zxcvbn:1.7.0'
implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
implementation 'net.lingala.zip4j:zip4j:2.11.1' implementation 'net.lingala.zip4j:zip4j:2.11.2'
implementation 'info.guardianproject.trustedintents:trustedintents:0.2' implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.71' implementation 'org.bouncycastle:bcprov-jdk15to18:1.71'
implementation "org.simpleflatmapper:sfm-csv:8.2.3" implementation "org.simpleflatmapper:sfm-csv:8.2.3"
androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion"
androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion" androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
androidTestImplementation "androidx.test:core:${androidTestVersion}" androidTestImplementation "androidx.test:core:1.5.0-alpha02"
androidTestImplementation "androidx.test:runner:${androidTestVersion}" androidTestImplementation "androidx.test:runner:1.5.0-alpha04"
androidTestImplementation "androidx.test:rules:${androidTestVersion}" androidTestImplementation "androidx.test:rules:1.4.1-alpha07"
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.4-alpha07'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0-alpha07'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0-alpha07'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.0-alpha07'
androidTestImplementation "junit:junit:${junitVersion}" androidTestImplementation "junit:junit:${junitVersion}"
androidTestUtil 'androidx.test:orchestrator:1.4.1' androidTestUtil 'androidx.test:orchestrator:1.4.2-alpha04'
testImplementation "androidx.test:core:${androidTestVersion}" testImplementation "androidx.test:core:1.5.0-alpha02"
testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "com.google.guava:guava:${guavaVersion}-jre"
testImplementation "junit:junit:${junitVersion}" testImplementation "junit:junit:${junitVersion}"
testImplementation "org.json:json:20220320" testImplementation "org.json:json:20220320"

View file

@ -148,7 +148,6 @@ public class IconPack {
return IconType.fromFilename(_relFilename); return IconType.fromFilename(_relFilename);
} }
@SuppressWarnings("UnstableApiUsage")
public String getName() { public String getName() {
return Files.getNameWithoutExtension(new File(_relFilename).getName()); return Files.getNameWithoutExtension(new File(_relFilename).getName());
} }

View file

@ -23,7 +23,6 @@ public enum IconType {
} }
} }
@SuppressWarnings("UnstableApiUsage")
public static IconType fromFilename(String filename) { public static IconType fromFilename(String filename) {
switch (Files.getFileExtension(filename).toLowerCase(Locale.ROOT)) { switch (Files.getFileExtension(filename).toLowerCase(Locale.ROOT)) {
case "svg": case "svg":