Upgraded ktlint.version from 0.50.0 to 1.0.0 (#574)

Bumps `ktlint.version` from 0.50.0 to 1.0.0.
gantsign · Oct 1, 2023 · 9818f1b · 9818f1b
1 parent d9e7474
commit 9818f1b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git 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.8.22</kotlin.version>
-    <ktlint.version>0.50.0</ktlint.version>
+    <kotlin.version>1.9.10</kotlin.version>
+    <ktlint.version>1.0.0</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>
@@ -82,32 +82,32 @@
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-cli-reporter</artifactId>
+        <artifactId>ktlint-cli-reporter-baseline</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-cli-ruleset-core</artifactId>
+        <artifactId>ktlint-cli-reporter-checkstyle</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-reporter-baseline</artifactId>
+        <artifactId>ktlint-cli-reporter-core</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-reporter-checkstyle</artifactId>
+        <artifactId>ktlint-cli-reporter-json</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-reporter-json</artifactId>
+        <artifactId>ktlint-cli-reporter-plain</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
         <groupId>com.pinterest.ktlint</groupId>
-        <artifactId>ktlint-reporter-plain</artifactId>
+        <artifactId>ktlint-cli-ruleset-core</artifactId>
         <version>${ktlint.version}</version>
       </dependency>
       <dependency>
@@ -311,15 +311,15 @@
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-cli-reporter</artifactId>
+      <artifactId>ktlint-cli-reporter-core</artifactId>
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-cli-ruleset-core</artifactId>
+      <artifactId>ktlint-cli-reporter-plain</artifactId>
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-reporter-plain</artifactId>
+      <artifactId>ktlint-cli-ruleset-core</artifactId>
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
@@ -416,17 +416,17 @@
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-reporter-baseline</artifactId>
+      <artifactId>ktlint-cli-reporter-baseline</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-reporter-checkstyle</artifactId>
+      <artifactId>ktlint-cli-reporter-checkstyle</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.pinterest.ktlint</groupId>
-      <artifactId>ktlint-reporter-json</artifactId>
+      <artifactId>ktlint-cli-reporter-json</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

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
@@ -42,7 +42,10 @@ class MavenLogReporter(
     private val acc = ConcurrentHashMap<String, MutableList<KtlintCliError>>()
 
     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<String?, MutableList<KtlintCliError>?>(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
@@ -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
@@ -74,7 +74,6 @@ internal class Format(
                 editorConfigDefaults = editorConfigDefaults,
                 editorConfigOverride = editorConfigOverride,
                 isInvokedFromCli = false,
-                enableKotlinCompilerExtensionPoint = true,
             )
 
         val checkedFiles = mutableSetOf<File>()

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
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  * #L%
  */
-@file:Suppress("ktlint:filename")
+@file:Suppress("ktlint:standard:filename")
 
 package com.github.gantsign.maven.plugin.ktlint.internal