From 9751a38ebdea7bc5a3f58d04e1bc9a0bf075c737 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Fri, 15 Nov 2024 12:36:18 +0100 Subject: [PATCH] Update dependencies --- app/build.gradle | 18 +++++++++--------- .../beemdevelopment/aegis/PreferencesTest.java | 3 --- .../aegis/helpers/QrCodeAnalyzerTest.java | 3 --- .../aegis/importers/DatabaseImporterTest.java | 3 --- .../aegis/otp/GoogleAuthInfoTest.java | 4 ---- build.gradle | 2 +- 6 files changed, 10 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4f5fba7f..08998209 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -141,7 +141,7 @@ aboutLibraries { } dependencies { - def cameraxVersion = '1.3.4' + def cameraxVersion = '1.4.0' def glideVersion = '4.16.0' def guavaVersion = '33.3.1' def hiltVersion = '2.52' @@ -149,7 +149,7 @@ dependencies { def libsuVersion = '6.0.0' def roomVersion = "2.6.1" - annotationProcessor 'androidx.annotation:annotation:1.9.0' + annotationProcessor 'androidx.annotation:annotation:1.9.1' annotationProcessor "androidx.room:room-compiler:$roomVersion" annotationProcessor "com.google.dagger:hilt-compiler:$hiltVersion" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" @@ -161,10 +161,10 @@ dependencies { implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" implementation "androidx.camera:camera-view:$cameraxVersion" - implementation 'androidx.core:core:1.13.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core:1.15.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' implementation 'androidx.documentfile:documentfile:1.0.1' - implementation 'androidx.lifecycle:lifecycle-process:2.8.6' + implementation 'androidx.lifecycle:lifecycle-process:2.8.7' implementation "androidx.preference:preference:1.2.1" implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation "androidx.room:room-runtime:$roomVersion" @@ -181,7 +181,7 @@ dependencies { implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.google.guava:guava:${guavaVersion}-android" implementation 'com.google.android.material:material:1.12.0' - implementation 'com.google.protobuf:protobuf-javalite:4.28.2' + implementation 'com.google.protobuf:protobuf-javalite:4.28.3' implementation 'com.google.zxing:core:3.5.3' implementation('com.mikepenz:aboutlibraries:11.2.3') { exclude group: 'com.mikepenz', module: 'aboutlibraries-core' @@ -189,7 +189,7 @@ dependencies { implementation 'com.mikepenz:aboutlibraries-core-android:11.2.3' implementation 'com.nulab-inc:zxcvbn:1.9.0' implementation 'net.lingala.zip4j:zip4j:2.11.5' - implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' + implementation 'org.bouncycastle:bcprov-jdk18on:1.79' implementation 'org.simpleflatmapper:sfm-csv:8.2.3' androidTestAnnotationProcessor "com.google.dagger:hilt-android-compiler:$hiltVersion" @@ -208,7 +208,7 @@ dependencies { testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" testImplementation 'org.json:json:20240303' - testImplementation 'org.robolectric:robolectric:4.13' + testImplementation 'org.robolectric:robolectric:4.14' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3' } diff --git a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java index 85bd31f0..5a487aea 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java @@ -7,7 +7,6 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.SharedPreferences; -import android.os.Build; import androidx.preference.PreferenceManager; import androidx.test.core.app.ApplicationProvider; @@ -15,12 +14,10 @@ import androidx.test.core.app.ApplicationProvider; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.util.Date; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public class PreferencesTest { @Test public void testIsPasswordReminderNeeded() { 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 f1cd0429..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; @@ -28,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.zip.GZIPInputStream; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) 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 09fa4fb4..959252c6 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,7 +25,6 @@ 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; @@ -34,7 +32,6 @@ import java.util.Arrays; import java.util.List; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) 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 60b8536f..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,15 +2,11 @@ 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; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) public class GoogleAuthInfoTest { @Test public void testGoogleAuthInfoEmptySecret() throws GoogleAuthInfoException { diff --git a/build.gradle b/build.gradle index 95cb83d0..08d3c330 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.1' + classpath 'com.android.tools.build:gradle:8.7.2' classpath 'com.google.dagger:hilt-android-gradle-plugin:2.52' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'