mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 13:57:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump dependencies for Kotlin 1.5.30 (#1497)

Browse Source
This commit is contained in:
Harsh Shandilya
2021-09-03 17:49:05 +05:30
committed by GitHub
parent a6b8e79d36
commit f00a53c29b
7 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt
View File

@@ -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

12
app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpDecryptActivity.kt
View File

@@ -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

2
app/src/main/java/dev/msfjarvis/aps/ui/crypto/GopenpgpPasswordCreationActivity.kt
View File

@@ -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
}

2
app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
View File

@@ -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
}

2
app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
View File

@@ -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

4
buildSrc/build.gradle.kts
View File

@@ -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")
}

10
gradle/libs.versions.toml
View File

@@ -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" }