Merge branch 'master' of github.com:stefan-niedermann/nextcloud-deck

2 files changed, 10 insertions, 10 deletions

diff --git a/app/build.gradle b/app/build.gradle
index e00b0a78b..a8e24461f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     buildToolsVersion "31.0.0"
     defaultConfig {
         applicationId "it.niedermann.nextcloud.deck"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 1020000
         versionName "1.20.0"
         vectorDrawables.useSupportLibrary true
@@ -71,10 +71,10 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     // Android X
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.camera:camera-camera2:1.2.0-alpha01'
-    implementation 'androidx.camera:camera-lifecycle:1.2.0-alpha01'
-    implementation 'androidx.camera:camera-view:1.2.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.camera:camera-camera2:1.2.0-alpha02'
+    implementation 'androidx.camera:camera-lifecycle:1.2.0-alpha02'
+    implementation 'androidx.camera:camera-view:1.2.0-alpha02'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference:1.2.0'
     def roomVersion = "2.4.2"
@@ -126,7 +126,7 @@ dependencies {
     // Tests
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.8.1'
-    testImplementation 'org.mockito:mockito-core:4.5.1'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'androidx.arch.core:core-testing:2.1.0'
 }
diff --git a/build.gradle b/build.gradle
index a4f555d5a..679cf4683 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.materialVersion = "1.6.0"
+    ext.materialVersion = "1.6.1"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         //noinspection DifferentKotlinGradleVersion
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files