diff --git a/app/build.gradle b/app/build.gradle index 8565d1d1..3e47279d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,12 +19,12 @@ def fileProviderAuthority = "${packageName}.fileprovider" def fileProviderAuthorityDebug = "${packageName}.debug.fileprovider" android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "${packageName}" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 51 versionName "2.0.3" multiDexEnabled true @@ -186,7 +186,7 @@ dependencies { testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" testImplementation "org.json:json:20220320" - testImplementation 'org.robolectric:robolectric:4.8' + testImplementation 'org.robolectric:robolectric:4.8.2' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 00000000..e90cc3f3 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher_debug.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher_debug.xml new file mode 100644 index 00000000..13f0b283 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v33/ic_launcher_debug.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..457d9c28 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..965bba74 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..59c82d10 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..5585f0a2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..e954c132 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java index fa1db2e3..64f8e5c3 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/PreferencesTest.java @@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.preference.PreferenceManager; import androidx.test.core.app.ApplicationProvider; @@ -14,9 +15,11 @@ 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; +@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 3aeb3faf..68343a4a 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/helpers/QrCodeAnalyzerTest.java @@ -7,6 +7,7 @@ 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; @@ -18,6 +19,7 @@ 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; @@ -25,6 +27,7 @@ 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 f3f5df7b..c6e8701b 100644 --- a/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java +++ b/app/src/test/java/com/beemdevelopment/aegis/importers/DatabaseImporterTest.java @@ -33,7 +33,7 @@ import java.io.InputStream; import java.util.Arrays; import java.util.List; -@Config(sdk = { Build.VERSION_CODES.P }) +@Config(sdk = { Build.VERSION_CODES.S_V2 }) @RunWith(RobolectricTestRunner.class) public class DatabaseImporterTest { private List _vectors;