From 2ef7efff35403000e6bcbd8b6e240ed77fc1f34e Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Sat, 12 Mar 2022 22:07:24 +0100
Subject: [PATCH] Update dependencies

---
 app/build.gradle                              | 40 +++++++++----------
 .../app/settings/SettingsActivity.kt          |  4 +-
 build.gradle                                  |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd67da16..be5a497e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,9 +34,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
-    lintOptions{
-        disable 'MissingTranslation'
-    }
     sourceSets {
         main.java.srcDirs += 'src/main/java'
         test.java.srcDirs += 'src/test/java'
@@ -96,6 +93,9 @@ android {
     }
 
     apply plugin: 'kotlin-kapt'
+    lint {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
@@ -108,38 +108,38 @@ dependencies {
      */
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
     implementation "androidx.browser:browser:1.4.0"
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-    implementation 'androidx.paging:paging-runtime-ktx:3.1.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0"
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+    implementation 'androidx.paging:paging-runtime-ktx:3.1.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.1'
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.1"
     implementation "androidx.annotation:annotation:1.3.0"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation 'androidx.fragment:fragment-ktx:1.4.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
     implementation 'androidx.work:work-runtime-ktx:2.7.1'
 
     // Use the most recent version of CameraX
-    def cameraX_version = '1.0.2'
-    implementation "androidx.camera:camera-core:${cameraX_version}"
-    implementation "androidx.camera:camera-camera2:${cameraX_version}"
+    def cameraX_version = '1.1.0-beta02'
+    implementation "androidx.camera:camera-core:$cameraX_version"
+    implementation "androidx.camera:camera-camera2:$cameraX_version"
     // CameraX Lifecycle library
     implementation "androidx.camera:camera-lifecycle:$cameraX_version"
 
     // CameraX View class
-    implementation 'androidx.camera:camera-view:1.0.0-alpha32'
+    implementation "androidx.camera:camera-view:$cameraX_version"
 
-    def room_version = "2.4.1"
+    def room_version = "2.4.2"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
diff --git a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
index 53f97023..3ad822a1 100644
--- a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import org.pixeldroid.app.MainActivity
@@ -83,7 +84,8 @@ class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceCha
 
             //Hide Notification setting for Android versions where it doesn't work
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-                preferenceScreen.removePreference(preferenceManager.findPreference("notification"))
+                preferenceManager.findPreference<Preference>("notification")
+                    ?.let { preferenceScreen.removePreference(it) }
             }
         }
     }
diff --git a/build.gradle b/build.gradle
index 5b832a92..8a6b5559 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong