From c718ea79c52fad8e1390e1965c16cf94984eb058 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Mon, 3 Oct 2022 19:29:06 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle | 12 ++++++------ .../com/beemdevelopment/aegis/PreferencesTest.java | 1 - .../aegis/helpers/QrCodeAnalyzerTest.java | 3 --- .../aegis/importers/DatabaseImporterTest.java | 3 --- .../aegis/otp/GoogleAuthInfoTest.java | 4 ---- build.gradle | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 69c20b06..f3ca416c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -116,13 +116,13 @@ protobuf { dependencies { def cameraxVersion = '1.1.0' - def glideVersion = '4.13.2' + def glideVersion = '4.14.1' def guavaVersion = '31.1' - def hiltVersion = '2.43.2' + def hiltVersion = '2.44' def junitVersion = '4.13.2' def libsuVersion = '5.0.3' - annotationProcessor 'androidx.annotation:annotation:1.4.0' + annotationProcessor 'androidx.annotation:annotation:1.5.0' annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" @@ -166,7 +166,7 @@ dependencies { implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0' implementation 'net.lingala.zip4j:zip4j:2.11.2' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk15to18:1.71' + implementation 'org.bouncycastle:bcprov-jdk15to18:1.72' implementation "org.simpleflatmapper:sfm-csv:8.2.3" androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" @@ -184,8 +184,8 @@ dependencies { testImplementation "androidx.test:core:1.5.0-alpha02" testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" - testImplementation "org.json:json:20220320" - testImplementation 'org.robolectric:robolectric:4.8.2' + testImplementation 'org.json:json:20220924' + testImplementation 'org.robolectric:robolectric:4.9' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java index 64f8e5c3..166d6a47 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java @@ -19,7 +19,6 @@ import org.robolectric.annotation.Config; import java.util.Date; -@Config(sdk = { Build.VERSION_CODES.S_V2 }) @RunWith(RobolectricTestRunner.class) public class PreferencesTest { @Test diff --git a/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java b/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java index 68343a4a..3aeb3faf 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java @@ -7,7 +7,6 @@ import static org.junit.Assert.assertTrue; import android.graphics.Rect; import android.media.Image; -import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -19,7 +18,6 @@ import com.beemdevelopment.aegis.util.IOUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.io.IOException; import java.io.InputStream; @@ -27,7 +25,6 @@ import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; import java.util.zip.GZIPInputStream; -@Config(sdk = { Build.VERSION_CODES.S_V2 }) @RunWith(RobolectricTestRunner.class) public class QrCodeAnalyzerTest { private static final String _expectedUri = "otpauth://totp/neo4j:Charlotte?secret=B33WS2ALPT34K4BNY24AYROE4M&issuer=neo4j&algorithm=SHA1&digits=6&period=30"; diff --git a/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java b/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java index d10fac8e..9feef246 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java @@ -7,7 +7,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.content.Context; -import android.os.Build; import androidx.test.core.app.ApplicationProvider; @@ -26,14 +25,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.List; -@Config(sdk = { Build.VERSION_CODES.S_V2 }) @RunWith(RobolectricTestRunner.class) public class DatabaseImporterTest { private List _vectors; diff --git a/app/src/test/java/com/beemdevelopment/aegis/otp/GoogleAuthInfoTest.java b/app/src/test/java/com/beemdevelopment/aegis/otp/GoogleAuthInfoTest.java index fd010317..75b962af 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/otp/GoogleAuthInfoTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/otp/GoogleAuthInfoTest.java @@ -2,14 +2,10 @@ package com.beemdevelopment.aegis.otp; import static org.junit.Assert.assertThrows; -import android.os.Build; - import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -@Config(sdk = { Build.VERSION_CODES.S_V2 }) @RunWith(RobolectricTestRunner.class) public class GoogleAuthInfoTest { @Test diff --git a/build.gradle b/build.gradle index 388d3685..7662a809 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.2.2' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.43.1' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.19' // NOTE: Do not place your application dependencies here; they belong