From a17a6e91314c152f3979c5b957e90e0630e4cf6d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 22 Dec 2022 15:50:26 +0100
Subject: [PATCH] update parts of toolchain and dependencies

---
 OpenKeychain/build.gradle | 13 ++++++-------
 build.gradle              |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 2a6300e15..17bc2d66a 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -4,11 +4,13 @@ apply plugin: 'com.squareup.sqldelight'
 dependencies {
     // from local Android SDK
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.sqlite:sqlite-framework:2.2.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
     // JCenter etc.
     implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
@@ -79,9 +81,6 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
 
-    implementation 'androidx.sqlite:sqlite-framework:2.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
     // for debugging the db. don't enable by default, this will expose the database no the network!
     // debugImplementation 'com.amitshekhar.android:debug-db:1.0.3'
 }
diff --git a/build.gradle b/build.gradle
index c258b48da..8d75412ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0'
     }
 }
@@ -23,5 +23,5 @@ allprojects {
 // SDK Version and Build Tools used by all subprojects
 // See http://tools.android.com/tech-docs/new-build-system/tips#TOC-Controlling-Android-properties-of-all-your-modules-from-the-main-project.
 ext {
-    compileSdkVersion = 29
+    compileSdkVersion = 33
 }