diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c8cb62af..b9d664dc 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,8 +9,5 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 572dbd6e..8110676b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,6 +10,7 @@ + - + diff --git a/pom.xml b/pom.xml index 07c934e5..0ac11aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ 0.8.7 11 11 - 1.8.22 - 0.50.0 + 1.9.10 + 1.0.0 1.20 3.6.4 8 @@ -82,32 +82,32 @@ com.pinterest.ktlint - ktlint-cli-reporter + ktlint-cli-reporter-baseline ${ktlint.version} com.pinterest.ktlint - ktlint-cli-ruleset-core + ktlint-cli-reporter-checkstyle ${ktlint.version} com.pinterest.ktlint - ktlint-reporter-baseline + ktlint-cli-reporter-core ${ktlint.version} com.pinterest.ktlint - ktlint-reporter-checkstyle + ktlint-cli-reporter-json ${ktlint.version} com.pinterest.ktlint - ktlint-reporter-json + ktlint-cli-reporter-plain ${ktlint.version} com.pinterest.ktlint - ktlint-reporter-plain + ktlint-cli-ruleset-core ${ktlint.version} @@ -311,15 +311,15 @@ com.pinterest.ktlint - ktlint-cli-reporter + ktlint-cli-reporter-core com.pinterest.ktlint - ktlint-cli-ruleset-core + ktlint-cli-reporter-plain com.pinterest.ktlint - ktlint-reporter-plain + ktlint-cli-ruleset-core com.pinterest.ktlint @@ -416,17 +416,17 @@ com.pinterest.ktlint - ktlint-reporter-baseline + ktlint-cli-reporter-baseline runtime com.pinterest.ktlint - ktlint-reporter-checkstyle + ktlint-cli-reporter-checkstyle runtime com.pinterest.ktlint - ktlint-reporter-json + ktlint-cli-reporter-json runtime diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporter.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporter.kt index c46ed2a3..080c08c5 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporter.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporter.kt @@ -42,7 +42,10 @@ class MavenLogReporter( private val acc = ConcurrentHashMap>() override fun onLintError(file: String, ktlintCliError: KtlintCliError) { - val (line, col, ruleId, detail) = ktlintCliError + val line = ktlintCliError.line + val col = ktlintCliError.col + val ruleId = ktlintCliError.ruleId + val detail = ktlintCliError.detail if (groupByFile) { acc.getOrPut?>(file, ::ArrayList)!!.add(ktlintCliError) @@ -70,7 +73,11 @@ class MavenLogReporter( log.error(MessageUtils.buffer().a(file.dir()).strong(file.name()).toString()) - for ((line, col, ruleId, detail) in errList) { + for (err in errList) { + val line = err.line + val col = err.col + val ruleId = err.ruleId + val detail = err.detail val buf = MessageUtils.buffer() .a(" ") .strong(line) diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/AbstractCheckSupport.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/AbstractCheckSupport.kt index 5528b350..4b152e30 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/AbstractCheckSupport.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/AbstractCheckSupport.kt @@ -171,7 +171,6 @@ internal abstract class AbstractCheckSupport( editorConfigDefaults = editorConfigDefaults, editorConfigOverride = editorConfigOverride, isInvokedFromCli = false, - enableKotlinCompilerExtensionPoint = true, ) var hasErrors = false diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Format.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Format.kt index b514036a..8aa38825 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Format.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Format.kt @@ -74,7 +74,6 @@ internal class Format( editorConfigDefaults = editorConfigDefaults, editorConfigOverride = editorConfigOverride, isInvokedFromCli = false, - enableKotlinCompilerExtensionPoint = true, ) val checkedFiles = mutableSetOf() diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Functions.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Functions.kt index 0df48837..2d7bb52e 100644 --- a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Functions.kt +++ b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Functions.kt @@ -23,7 +23,7 @@ * THE SOFTWARE. * #L% */ -@file:Suppress("ktlint:filename") +@file:Suppress("ktlint:standard:filename") package com.github.gantsign.maven.plugin.ktlint.internal