Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ktlint.version from 0.47.1 to 0.48.2 #536

Merged
merged 2 commits into from
Feb 5, 2023
Merged

Bump ktlint.version from 0.47.1 to 0.48.2 #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5332522
Bump ktlint.version from 0.47.1 to 0.48.2
dependabot[bot] Jan 29, 2023
e4c1784
Fixed API changes
freemanjp Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.10</kotlin.version>
<ktlint.version>0.47.1</ktlint.version>
<kotlin.version>1.8.0</kotlin.version>
<ktlint.version>0.48.2</ktlint.version>
<license-maven-plugin.version>1.20</license-maven-plugin.version>
<maven.compiler.release>8</maven.compiler.release>
<maven.version>3.5.4</maven.version>
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/CheckMojo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Report.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions src/test/kotlin/com/github/gantsign/maven/plugin/ktlint/FormatMojoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 " +
Expand Down Expand Up @@ -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 " +
Expand Down
1 change: 1 addition & 0 deletions src/test/scenarios/format-include-scripts/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
Expand Down