From 9e0e394d8046dd8245cfb6a0b4b5aeeeadc25429 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sun, 10 Mar 2024 19:27:02 +0000 Subject: [PATCH] Upgraded Ktlint to 1.2.1 (#603) Keeping up with the latest version. --- .gitignore | 3 +++ pom.xml | 20 ++++++++++++++++++- .../maven/plugin/ktlint/FormatMojoTest.kt | 4 ++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a923309f..bd0b8c18 100644 --- a/.gitignore +++ b/.gitignore @@ -425,3 +425,6 @@ $RECYCLE.BIN/ # To reduce churn .idea/kotlinc.xml + +# Devpod +.devpod-internal diff --git a/pom.xml b/pom.xml index 548aac51..0ea40945 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 11 11 1.9.22 - 1.1.1 + 1.2.1 1.20 3.6.4 8 @@ -414,6 +414,24 @@ + + org.apache.maven + maven-api-meta + 4.0.0-alpha-9 + provided + + + org.apache.maven + maven-api-xml + 4.0.0-alpha-9 + provided + + + org.apache.maven + maven-xml-impl + 4.0.0-alpha-9 + provided + com.pinterest.ktlint ktlint-cli-reporter-baseline 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 01c19abb..4f87dd24 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,7 +64,7 @@ class FormatMojoTest { verify(atLeast = 1) { log.isDebugEnabled } verify { log.debug("checking format: $source") } - verify { log.debug("Format fixed > $source:1:1: Unnecessary semicolon") } + verify { log.debug("Format fixed > $source:30:39: Unnecessary semicolon") } verify { log.debug( "Format fixed > $source:29:13: Argument should be on a separate line " + @@ -98,7 +98,7 @@ class FormatMojoTest { verify(atLeast = 1) { log.isDebugEnabled } verify { log.debug("checking format: $scriptSource") } - verify { log.debug("Format fixed > $scriptSource:1:1: Unnecessary semicolon") } + verify { log.debug("Format fixed > $scriptSource:30:39: Unnecessary semicolon") } verify { log.debug( "Format fixed > $scriptSource:29:13: Argument should be on a separate line " +