Upgrade to ktfmt 0.37 (#1897)

6 files changed, 11 insertions, 8 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
index a918a076..17005b6a 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt
@@ -41,7 +41,8 @@ class LaunchActivity : AppCompatActivity() {
             prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH) }
             startTargetActivity(false)
           }
-          is Result.Failure, Result.Cancelled -> {
+          is Result.Failure,
+          Result.Cancelled -> {
             finish()
           }
           is Result.Retry -> {}
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
index 90d0ecc1..349e70e5 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt
@@ -183,8 +183,8 @@ class OpenKeychainKeyProvider private constructor(val activity: ContinuationCont
             "Request ${request::class.simpleName} failed: ${error?.message}"
           )
         when (error?.error) {
-          SshAuthenticationApiError.NO_AUTH_KEY, SshAuthenticationApiError.NO_SUCH_KEY ->
-            ApiResponse.NoSuchKey(exception)
+          SshAuthenticationApiError.NO_AUTH_KEY,
+          SshAuthenticationApiError.NO_SUCH_KEY -> ApiResponse.NoSuchKey(exception)
           else -> ApiResponse.GeneralError(exception)
         }
       }
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
index 56831b1d..c5cb6eaa 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt
@@ -35,7 +35,8 @@ class OpenKeychainWrappedKeyAlgorithm(private val keyAlgorithm: KeyAlgorithm) :
     when (keyAlgorithm.keyAlgorithm) {
       "rsa-sha2-512" -> SshAuthenticationApi.SHA512
       "rsa-sha2-256" -> SshAuthenticationApi.SHA256
-      "ssh-rsa", "ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1
+      "ssh-rsa",
+      "ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1
       // Other algorithms don't use this value, but it has to be valid.
       else -> SshAuthenticationApi.SHA512
     }
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
index d5aaff33..d2dda45f 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt
@@ -306,8 +306,8 @@ object SshKey {
 
   fun provide(client: SSHClient, passphraseFinder: InteractivePasswordFinder): KeyProvider? =
     when (type) {
-      Type.LegacyGenerated, Type.Imported ->
-        client.loadKeys(privateKeyFile.absolutePath, passphraseFinder)
+      Type.LegacyGenerated,
+      Type.Imported -> client.loadKeys(privateKeyFile.absolutePath, passphraseFinder)
       Type.KeystoreNative -> KeystoreNativeKeyProvider
       Type.KeystoreWrappedEd25519 -> KeystoreWrappedEd25519KeyProvider
       null -> null
diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
index 66205bbc..e7b04f56 100644
--- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
+++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
@@ -166,7 +166,8 @@ private class AutofillFormParser(
         // reported web origin if no other web origin appears on the page.
         webOriginToFormOrigin(context, webOrigins.singleOrNull() ?: return null)
       }
-      BrowserMultiOriginMethod.WebView, BrowserMultiOriginMethod.Field -> {
+      BrowserMultiOriginMethod.WebView,
+      BrowserMultiOriginMethod.Field -> {
         // Security assumption: For browsers with full autofill support (the `Field` case),
         // every form field is annotated with its origin. For browsers based on WebView,
         // this is true after the web origins of WebViews are passed down to their children.
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
index 48ed6d62..2c01542a 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.spotless.gradle.kts
@@ -5,7 +5,7 @@
 
 plugins { id("com.diffplug.spotless") }
 
-val KTFMT_VERSION = "0.36"
+val KTFMT_VERSION = "0.37"
 
 spotless {
   kotlin {