From c8527f04a3ee4b5e7a5501f27dd2795b8655dce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@iteratec.com>
Date: Mon, 2 Sep 2024 16:27:37 +0200
Subject: [PATCH] Upgraded Ktlint to 1.3.1 (#629)

Keeping up with the latest release.
---
 pom.xml                                       |  4 +--
 .../maven/plugin/ktlint/FormatMojoTest.kt     | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0499167..55811e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,8 @@
     <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
     <java.require.version>11</java.require.version>
     <jdeps.multiRelease>11</jdeps.multiRelease>
-    <kotlin.version>1.9.22</kotlin.version>
-    <ktlint.version>1.2.1</ktlint.version>
+    <kotlin.version>1.9.24</kotlin.version>
+    <ktlint.version>1.3.1</ktlint.version>
     <license-maven-plugin.version>1.20</license-maven-plugin.version>
     <maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
     <maven.compiler.release>8</maven.compiler.release>
diff --git a/src/test/kotlin/com/github/gantsign/maven/plugin/ktlint/FormatMojoTest.kt b/src/test/kotlin/com/github/gantsign/maven/plugin/ktlint/FormatMojoTest.kt
index 4f87dd2..018fac6 100644
--- a/src/test/kotlin/com/github/gantsign/maven/plugin/ktlint/FormatMojoTest.kt
+++ b/src/test/kotlin/com/github/gantsign/maven/plugin/ktlint/FormatMojoTest.kt
@@ -64,16 +64,20 @@ class FormatMojoTest {
 
         verify(atLeast = 1) { log.isDebugEnabled }
         verify { log.debug("checking format: $source") }
-        verify { log.debug("Format fixed > $source:30:39: Unnecessary semicolon") }
+        verify { log.debug("Format fixed > $source:1:1: Unnecessary semicolon") }
         verify {
             log.debug(
-                "Format fixed > $source:29:13: Argument should be on a separate line " +
-                    "(unless all arguments can fit a single line)",
+                "Format fixed > $source:29:13: Line is exceeding max line length. Break line before expression",
             )
         }
-        verify { log.debug("Format fixed > $source:30:8: Missing newline before \")\"") }
-        verify { log.debug("Format fixed > $source:30:8: Missing trailing comma before \")\"") }
-        verify { log.debug("Format could not fix > $source:29:94: Exceeded max line length (80)") }
+        verify {
+            log.debug(
+                "Format fixed > $source:29:47: Line is exceeding max line length. Break line after '+' " +
+                    "in binary expression",
+            )
+        }
+        verify { log.debug("Format fixed > $source:30:19: Missing newline before \")\"") }
+        verify { log.debug("Format fixed > $source:30:20: Missing trailing comma before \")\"") }
         verify { log.debug("Format fixed > $source") }
         verify { log.warn("Source root doesn't exist: $testRoot") }
         verify { log.info("1 file(s) formatted.") }
@@ -98,15 +102,19 @@ class FormatMojoTest {
 
         verify(atLeast = 1) { log.isDebugEnabled }
         verify { log.debug("checking format: $scriptSource") }
-        verify { log.debug("Format fixed > $scriptSource:30:39: Unnecessary semicolon") }
+        verify { log.debug("Format fixed > $scriptSource:1:1: Unnecessary semicolon") }
+        verify {
+            log.debug(
+                "Format fixed > $scriptSource:29:13: Line is exceeding max line length. Break line before expression",
+            )
+        }
         verify {
             log.debug(
-                "Format fixed > $scriptSource:29:13: Argument should be on a separate line " +
-                    "(unless all arguments can fit a single line)",
+                "Format fixed > $scriptSource:29:47: Line is exceeding max line length. Break line after '+' " +
+                    "in binary expression",
             )
         }
-        verify { log.debug("Format fixed > $scriptSource:30:8: Missing newline before \")\"") }
-        verify { log.debug("Format could not fix > $scriptSource:29:94: Exceeded max line length (80)") }
+        verify { log.debug("Format fixed > $scriptSource:30:19: Missing newline before \")\"") }
         verify { log.debug("Format fixed > $scriptSource") }
         verify { log.warn("Source root doesn't exist: $testRoot") }
         verify { log.info("1 file(s) formatted.") }