From 1d7cd7df77fc9401189f8b7e5aadfdbb2912904b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Feb 2023 21:04:19 +0000 Subject: [PATCH] Upgraded ktlint.version from 0.47.1 to 0.48.2 (#536) Bumps `ktlint.version` from 0.47.1 to 0.48.2. Updates `ktlint` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-core` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-reporter-checkstyle` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-reporter-json` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-reporter-plain` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-ruleset-experimental` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) Updates `ktlint-ruleset-standard` from 0.47.1 to 0.48.2 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/0.47.1...0.48.2) --- updated-dependencies: - dependency-name: com.pinterest:ktlint dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-reporter-checkstyle dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-reporter-json dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-reporter-plain dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-ruleset-experimental dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.pinterest.ktlint:ktlint-ruleset-standard dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: John Freeman --- pom.xml | 4 ++-- .../github/gantsign/maven/plugin/ktlint/CheckMojo.kt | 2 +- .../gantsign/maven/plugin/ktlint/internal/Report.kt | 2 +- .../gantsign/maven/plugin/ktlint/FormatMojoTest.kt | 10 ++++++++-- .../scenarios/format-include-scripts/.editorconfig | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d4ff5f8a..ec270c64 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 0.8.7 11 11 - 1.7.10 - 0.47.1 + 1.8.0 + 0.48.2 1.20 8 3.5.4 diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/CheckMojo.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/CheckMojo.kt index d2d44a5a..b89b74da 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/CheckMojo.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/CheckMojo.kt @@ -27,7 +27,7 @@ package com.github.gantsign.maven.plugin.ktlint import com.github.gantsign.maven.plugin.ktlint.internal.Check import com.github.gantsign.maven.plugin.ktlint.internal.Sources -import com.pinterest.ktlint.reporter.plain.internal.Color +import com.pinterest.ktlint.reporter.plain.Color import java.nio.charset.Charset import java.nio.charset.StandardCharsets.UTF_8 import org.apache.maven.plugins.annotations.LifecyclePhase diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Report.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Report.kt index 33f42bf0..9df72c03 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Report.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Report.kt @@ -27,7 +27,7 @@ package com.github.gantsign.maven.plugin.ktlint.internal import com.github.gantsign.maven.plugin.ktlint.ReporterConfig import com.pinterest.ktlint.core.Reporter -import com.pinterest.ktlint.reporter.plain.internal.Color +import com.pinterest.ktlint.reporter.plain.Color import java.io.File import java.nio.charset.Charset import org.apache.maven.plugin.logging.Log 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 4159bfa2..bcbdf9ff 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 @@ -65,7 +65,13 @@ class FormatMojoTest { verify(atLeast = 1) { log.isDebugEnabled } verify { log.debug("Disabled RuleSetProviderV2 'experimental'") } verify { log.debug("checking format: $source") } - verify { log.debug("Format fixed > $source:1:1: Unnecessary semicolon") } + verify { + log.debug( + "Format could not fix > src/main/kotlin/example/Example.kt:30:8: " + + "Missing trailing comma before \")\"" + ) + } + 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 " + @@ -99,7 +105,7 @@ class FormatMojoTest { verify(atLeast = 1) { log.isDebugEnabled } verify { log.debug("Disabled RuleSetProviderV2 'experimental'") } 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 " + diff --git a/src/test/scenarios/format-include-scripts/.editorconfig b/src/test/scenarios/format-include-scripts/.editorconfig index abfc3517..a16f2dc1 100644 --- a/src/test/scenarios/format-include-scripts/.editorconfig +++ b/src/test/scenarios/format-include-scripts/.editorconfig @@ -55,6 +55,7 @@ trim_trailing_whitespaces = false indent_size=4 continuation_indent_size=4 charset = utf-8 +ktlint_standard_trailing-comma-on-call-site = disabled # Files with a smaller indent [*.{java,xml}]