From 6ca02eb371a18fd39ccd856d9c88f1728fb4ec90 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Wed, 29 Jul 2020 17:10:46 +0530
Subject: Upgrade to Kotlin 1.4 (#978)

* build: uprev to Kotlin 1.4

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Remove explicit type argument

Not required anymore with Kotlin 1.4

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: enable Kotlin 1.4 language features

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* all: add trailing commas where reasonable

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
---
 .../main/java/com/zeapo/pwdstore/git/config/SshjConfig.kt    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/git')

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/SshjConfig.kt b/app/src/main/java/com/zeapo/pwdstore/git/config/SshjConfig.kt
index 7ba246be..1ea0359c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/config/SshjConfig.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/config/SshjConfig.kt
@@ -217,7 +217,7 @@ class SshjConfig : ConfigImpl() {
             ECDHNistP.Factory521(),
             ECDHNistP.Factory384(),
             ECDHNistP.Factory256(),
-            DHGexSHA256.Factory()
+            DHGexSHA256.Factory(),
         )
     }
 
@@ -228,7 +228,7 @@ class SshjConfig : ConfigImpl() {
             SignatureECDSA.Factory384(),
             SignatureECDSA.Factory521(),
             SignatureRSA.Factory(),
-            FactoryCERT()
+            FactoryCERT(),
         )
     }
 
@@ -242,7 +242,7 @@ class SshjConfig : ConfigImpl() {
             PKCS8KeyFile.Factory(),
             PKCS5KeyFile.Factory(),
             OpenSSHKeyFile.Factory(),
-            PuTTYKeyFile.Factory()
+            PuTTYKeyFile.Factory(),
         )
     }
 
@@ -251,7 +251,7 @@ class SshjConfig : ConfigImpl() {
         cipherFactories = listOf(
             BlockCiphers.AES128CTR(),
             BlockCiphers.AES192CTR(),
-            BlockCiphers.AES256CTR()
+            BlockCiphers.AES256CTR(),
         )
     }
 
@@ -260,13 +260,13 @@ class SshjConfig : ConfigImpl() {
             Macs.HMACSHA2256(),
             Macs.HMACSHA2256Etm(),
             Macs.HMACSHA2512(),
-            Macs.HMACSHA2512Etm()
+            Macs.HMACSHA2512Etm(),
         )
     }
 
     private fun initCompressionFactories() {
         compressionFactories = listOf(
-            NoneCompression.Factory()
+            NoneCompression.Factory(),
         )
     }
 }
-- 
cgit v1.2.3