From 836c367499180832db533b5179a56bd8480b1385 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 28 Oct 2021 00:57:31 +0530
Subject: [PATCH] gradle: upgrade AndroidX dependencies

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle                                                | 6 +++---
 ui/build.gradle                                             | 2 +-
 .../com/wireguard/android/activity/LogViewerActivity.kt     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 336c4631..a6c091e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
     ext {
-        activityVersion = '1.3.1'
+        activityVersion = '1.4.0'
         annotationsVersion = '1.2.0'
         appcompatVersion = '1.3.1'
         biometricVersion = '1.1.0'
         collectionVersion = '1.1.0'
         constraintLayoutVersion = '2.1.1'
         coordinatorLayoutVersion = '1.1.0'
-        coreKtxVersion = '1.6.0'
+        coreKtxVersion = '1.7.0'
         coroutinesVersion = '1.5.2'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
         fragmentVersion = '1.3.6'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.3.1'
+        lifecycleRuntimeKtxVersion = '2.4.0'
         materialComponentsVersion = '1.4.0'
         preferenceVersion = '1.1.1'
         zxingEmbeddedVersion = '4.3.0'
diff --git a/ui/build.gradle b/ui/build.gradle
index b0b92ba4..f52a557b 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -12,7 +12,7 @@ group groupName
 final def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildFeatures {
         buildConfig = true
         dataBinding = true
diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
index 1b54997f..02d68538 100644
--- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt
@@ -126,9 +126,9 @@ class LogViewerActivity : AppCompatActivity() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.log_viewer, menu)
-        saveButton = menu?.findItem(R.id.save_log)
+        saveButton = menu.findItem(R.id.save_log)
         return true
     }