From e88c3ea6dbd44e13e0d5cb8f1afca8127ac61b30 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Mon, 31 Jan 2022 21:59:02 +0100 Subject: [PATCH] Update dependencies --- app/build.gradle | 24 ++++++------- .../beemdevelopment/aegis/OverallTest.java | 34 +++++++++---------- build.gradle | 4 +-- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index edba9d00..67bc8002 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,25 +124,25 @@ dependencies { def androidTestVersion = '1.4.0' def cameraxVersion = '1.0.2' def glideVersion = '4.12.0' - def guavaVersion = '30.1.1' + def guavaVersion = '31.0.1' def junitVersion = '4.13.2' - def libsuVersion = '3.1.2' + def libsuVersion = '3.2.1' annotationProcessor 'androidx.annotation:annotation:1.3.0' annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" - implementation "androidx.camera:camera-view:1.0.0-alpha31" + implementation "androidx.camera:camera-view:1.1.0-beta01" implementation 'androidx.cardview:cardview:1.0.0' implementation "androidx.core:core:1.7.0" - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.lifecycle:lifecycle-process:2.4.0" - implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' @@ -156,8 +156,8 @@ dependencies { implementation "com.github.topjohnwu.libsu:core:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.google.guava:guava:${guavaVersion}-android" - implementation 'com.google.android.material:material:1.4.0' - implementation 'com.google.protobuf:protobuf-javalite:3.17.3' + implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.protobuf:protobuf-javalite:3.19.4' 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' @@ -167,7 +167,7 @@ dependencies { // NOTE: this is kept at an old version on purpose (something in newer versions breaks the Authenticator Plus importer) implementation 'net.lingala.zip4j:zip4j:2.6.0' implementation 'info.guardianproject.trustedintents:trustedintents:0.2' - implementation 'org.bouncycastle:bcprov-jdk15on:1.69' + implementation 'org.bouncycastle:bcprov-jdk15on:1.70' androidTestImplementation "androidx.test:core:${androidTestVersion}" androidTestImplementation "androidx.test:runner:${androidTestVersion}" @@ -177,13 +177,13 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' androidTestImplementation "junit:junit:${junitVersion}" - androidTestUtil 'androidx.test:orchestrator:1.4.0' + androidTestUtil 'androidx.test:orchestrator:1.4.1' testImplementation "androidx.test:core:${androidTestVersion}" testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" - testImplementation "org.json:json:20210307" - testImplementation 'org.robolectric:robolectric:4.6.1' + testImplementation "org.json:json:20211205" + testImplementation 'org.robolectric:robolectric:4.7.3' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java index 4db3a94c..09ff1577 100644 --- a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java +++ b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java @@ -1,5 +1,21 @@ package com.beemdevelopment.aegis; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu; +import static androidx.test.espresso.action.ViewActions.clearText; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; +import static androidx.test.espresso.action.ViewActions.longClick; +import static androidx.test.espresso.action.ViewActions.pressBack; +import static androidx.test.espresso.action.ViewActions.typeText; +import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertNull; +import static junit.framework.TestCase.assertTrue; + import androidx.annotation.IdRes; import androidx.test.espresso.ViewInteraction; import androidx.test.espresso.contrib.RecyclerViewActions; @@ -25,22 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu; -import static androidx.test.espresso.action.ViewActions.clearText; -import static androidx.test.espresso.action.ViewActions.click; -import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; -import static androidx.test.espresso.action.ViewActions.longClick; -import static androidx.test.espresso.action.ViewActions.pressBack; -import static androidx.test.espresso.action.ViewActions.typeText; -import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; -import static androidx.test.espresso.matcher.ViewMatchers.isRoot; -import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static androidx.test.espresso.matcher.ViewMatchers.withText; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertNull; -import static junit.framework.TestCase.assertTrue; - @RunWith(AndroidJUnit4.class) @LargeTest public class OverallTest extends AegisTest { @@ -55,7 +55,7 @@ public class OverallTest extends AegisTest { next.perform(click()); onView(withId(R.id.rb_password)).perform(click()); next.perform(click()); - onView(withId(R.id.text_password)).perform(typeText(VAULT_PASSWORD), closeSoftKeyboard()); + onView(withId(R.id.text_password)).perform(click()).perform(typeText(VAULT_PASSWORD), closeSoftKeyboard()); onView(withId(R.id.text_password_confirm)).perform(typeText(VAULT_PASSWORD), closeSoftKeyboard()); next.perform(click()); onView(withId(R.id.btnNext)).perform(click()); diff --git a/build.gradle b/build.gradle index 6ff58500..8ddcc852 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' + classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files