From c977b9a064fab4e7d5d96df6f41e1362d823f12b Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 3 Apr 2021 11:24:13 +0200
Subject: [PATCH] Update dependencies

---
 app/build.gradle              | 10 +++++-----
 app/src/main/res/raw/keep.xml |  3 +++
 build.gradle                  |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/raw/keep.xml

diff --git a/app/build.gradle b/app/build.gradle
index df4f0bf8..908d381c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -121,13 +121,13 @@ protobuf {
 
 dependencies {
     def androidTestVersion = '1.3.0'
-    def cameraxVersion = '1.0.0-rc03'
+    def cameraxVersion = '1.0.0-rc04'
     def glideVersion = '4.12.0'
     def guavaVersion = '30.1.1'
     def junitVersion = '4.13.2'
     def libsuVersion = '3.0.2'
 
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor 'androidx.annotation:annotation:1.2.0'
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -135,12 +135,12 @@ dependencies {
     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-alpha22"
+    implementation "androidx.camera:camera-view:1.0.0-alpha23"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation "androidx.core:core:1.3.2"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation "androidx.lifecycle:lifecycle-process:2.3.0"
+    implementation "androidx.lifecycle:lifecycle-process:2.3.1"
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
@@ -155,7 +155,7 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
     implementation "com.google.guava:guava:${guavaVersion}-android"
     implementation 'com.google.android.material:material:1.3.0'
-    implementation 'com.google.protobuf:protobuf-javalite:3.15.6'
+    implementation 'com.google.protobuf:protobuf-javalite:3.15.7'
     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'
diff --git a/app/src/main/res/raw/keep.xml b/app/src/main/res/raw/keep.xml
new file mode 100644
index 00000000..2e374396
--- /dev/null
+++ b/app/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@layout/dialog_*,@layout/card_importer" />
diff --git a/build.gradle b/build.gradle
index 9c54cd57..438d8fb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15'
 
         // NOTE: Do not place your application dependencies here; they belong