From b09945530513a6bf4edf7c5f45524609c74b26ce Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Sun, 9 Jun 2019 17:25:33 +0200
Subject: [PATCH] Update picoli dependency to 3.9.6 version. (#467)

* Update picoli to latest stable 3.9.6 release.

Changelog: https://github.com/remkop/picocli/blob/master/RELEASE-NOTES.md#-picocli-396
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>

* Replace shyiko with pinterest in command line messages.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 build.gradle                                        | 2 +-
 ktlint/src/main/kotlin/com/pinterest/ktlint/Main.kt | 8 ++++----
 pom.xml                                             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 694cd710d9..9ed2d47ddb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ ext.deps = [
   // Used to silence aether-transport-http
   'slf4j'          : 'org.slf4j:slf4j-nop:1.6.2',
   'aetherProvider': 'org.apache.maven:maven-aether-provider:3.2.5',
-  'picocli'       : 'info.picocli:picocli:2.3.0',
+  'picocli'       : 'info.picocli:picocli:3.9.6',
   // Testing libraries
   'junit'         : 'junit:junit:4.12',
   'assertj'       : 'org.assertj:assertj-core:3.9.0',
diff --git a/ktlint/src/main/kotlin/com/pinterest/ktlint/Main.kt b/ktlint/src/main/kotlin/com/pinterest/ktlint/Main.kt
index b24d2cf198..6984719b4a 100644
--- a/ktlint/src/main/kotlin/com/pinterest/ktlint/Main.kt
+++ b/ktlint/src/main/kotlin/com/pinterest/ktlint/Main.kt
@@ -55,7 +55,7 @@ import picocli.CommandLine.Parameters
 @Command(
     headerHeading =
 """An anti-bikeshedding Kotlin linter with built-in formatter
-(https://github.com/shyiko/ktlint).
+(https://github.com/pinterest/ktlint).
 
 Usage:
   ktlint <flags> [patterns]
@@ -565,7 +565,7 @@ object Main {
                 LintError(
                     e.line, e.col, "",
                     "Internal Error (${e.ruleId}). " +
-                        "Please create a ticket at https://github.com/shyiko/ktlint/issue " +
+                        "Please create a ticket at https://github.com/pinterest/ktlint/issue " +
                         "(if possible, provide the source code that triggered an error)"
                 )
             }
@@ -695,7 +695,7 @@ object Main {
         }
         System.err.println("(updated)")
         System.err.println("\nPlease restart your IDE")
-        System.err.println("(if you experience any issues please report them at https://github.com/shyiko/ktlint)")
+        System.err.println("(if you experience any issues please report them at https://github.com/pinterest/ktlint)")
     }
 
     private fun hex(input: ByteArray) = BigInteger(MessageDigest.getInstance("SHA-256").digest(input)).toString(16)
@@ -788,7 +788,7 @@ object Main {
                         if (result.any { it.toString().substringAfterLast("/").startsWith("ktlint-core-") }) {
                             System.err.println(
                                 "\"$artifact\" appears to have a runtime/compile dependency on \"ktlint-core\".\n" +
-                                    "Please inform the author that \"com.github.shyiko:ktlint*\" should be marked " +
+                                    "Please inform the author that \"com.pinterest:ktlint*\" should be marked " +
                                     "compileOnly (Gradle) / provided (Maven).\n" +
                                     "(to suppress this warning use --skip-classpath-check)"
                             )
diff --git a/pom.xml b/pom.xml
index d423e05599..6466c1b3cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <klob.version>0.2.1</klob.version>
         <aether.version>1.1.0</aether.version>
         <aether.maven.provider.version>3.3.9</aether.maven.provider.version>
-        <picocli.version>2.3.0</picocli.version>
+        <picocli.version>3.9.6</picocli.version>
         <junit.version>4.12</junit.version>
         <assertj.version>3.9.0</assertj.version>
         <jimfs.version>1.1</jimfs.version>