Bump dependencies for Kotlin 1.5.30 (#1497)

7 files changed, 20 insertions, 24 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
index 650c65de..10298dca 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
@@ -81,15 +81,13 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound {
     }
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler, menu)
     passwordEntry?.let { entry ->
-      if (menu != null) {
-        menu.findItem(R.id.edit_password).isVisible = true
-        if (!entry.password.isNullOrBlank()) {
-          menu.findItem(R.id.share_password_as_plaintext).isVisible = true
-          menu.findItem(R.id.copy_password).isVisible = true
-        }
+      menu.findItem(R.id.edit_password).isVisible = true
+      if (!entry.password.isNullOrBlank()) {
+        menu.findItem(R.id.share_password_as_plaintext).isVisible = true
+        menu.findItem(R.id.copy_password).isVisible = true
       }
     }
     return true
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
index b2e710f8..159354d2 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
@@ -56,15 +56,13 @@ class GopenpgpDecryptActivity : BasePgpActivity() {
     decrypt()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler, menu)
     passwordEntry?.let { entry ->
-      if (menu != null) {
-        menu.findItem(R.id.edit_password).isVisible = true
-        if (!entry.password.isNullOrBlank()) {
-          menu.findItem(R.id.share_password_as_plaintext).isVisible = true
-          menu.findItem(R.id.copy_password).isVisible = true
-        }
+      menu.findItem(R.id.edit_password).isVisible = true
+      if (!entry.password.isNullOrBlank()) {
+        menu.findItem(R.id.share_password_as_plaintext).isVisible = true
+        menu.findItem(R.id.copy_password).isVisible = true
       }
     }
     return true
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
index 2228a758..bbce67f3 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
@@ -207,7 +207,7 @@ class GopenpgpPasswordCreationActivity : BasePgpActivity() {
     updateViewState()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler_new_password, menu)
     return true
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
index 91e375aa..cf34ac36 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
@@ -278,7 +278,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB
     updateViewState()
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     menuInflater.inflate(R.menu.pgp_handler_new_password, menu)
     return true
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
index a009b701..cd720d3c 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
@@ -241,7 +241,7 @@ class PasswordStore : BaseGitActivity() {
     }
   }
 
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+  override fun onCreateOptionsMenu(menu: Menu): Boolean {
     val menuRes =
       when {
         gitSettings.authMode == AuthMode.None -> R.menu.main_menu_no_auth
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e9d8587d..361a3efe 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -45,7 +45,7 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.0.0")
+  implementation("com.android.tools.build:gradle:7.0.2")
   implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.2")
   implementation("com.google.dagger:hilt-android-gradle-plugin:2.38.1")
   implementation("com.squareup.okhttp3:okhttp:4.9.0")
@@ -53,6 +53,6 @@ dependencies {
   implementation("com.vdurmont:semver4j:3.1.0")
   implementation("de.undercouch:gradle-download-task:4.1.2")
   implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30")
   implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index de95b69a..c25183e5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 # Centralized versions for dependencies that share versions
 [versions]
-androidx_activity = "1.3.1"
+androidx_activity = "1.4.0-alpha01"
 androidx_test = "1.4.1-alpha01"
-compose = "1.0.1"
+compose = "1.1.0-alpha03"
 composeSnapshot = "-"
 coroutines = "1.5.1"
 flowbinding = "1.2.0"
 hilt = "2.38.1"
-kotlin = "1.5.21"
+kotlin = "1.5.30"
 lifecycle = "2.4.0-alpha03"
 
 [libraries]
@@ -23,9 +23,9 @@ androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
 androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-alpha03"
 androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0"
-androidx-core-ktx = "androidx.core:core-ktx:1.7.0-alpha01"
+androidx-core-ktx = "androidx.core:core-ktx:1.7.0-alpha02"
 androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha07"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha08"
 androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" }
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }