Fixed compile issue with ktlint 0.45.0

`ReporterProvider` API change.
gantsign · Mar 28, 2022 · 6cb0cc9 · 6cb0cc9
1 parent e03eee6
commit 6cb0cc9
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/...lugin/ktlint/internal/MavenLogReporter.kt → ...n/maven/plugin/ktlint/MavenLogReporter.kt b/...lugin/ktlint/internal/MavenLogReporter.kt → ...n/maven/plugin/ktlint/MavenLogReporter.kt
@@ -23,17 +23,16 @@
  * THE SOFTWARE.
  * #L%
  */
-package com.github.gantsign.maven.plugin.ktlint.internal
+package com.github.gantsign.maven.plugin.ktlint
 
 import com.pinterest.ktlint.core.LintError
 import com.pinterest.ktlint.core.Reporter
 import java.io.File
-import java.util.ArrayList
 import java.util.concurrent.ConcurrentHashMap
 import org.apache.maven.plugin.logging.Log
 import org.apache.maven.shared.utils.logging.MessageUtils
 
-internal class MavenLogReporter(
+class MavenLogReporter(
     val log: Log,
     val verbose: Boolean,
     val groupByFile: Boolean,

diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporterProvider.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/MavenLogReporterProvider.kt
@@ -25,20 +25,18 @@
  */
 package com.github.gantsign.maven.plugin.ktlint
 
-import com.github.gantsign.maven.plugin.ktlint.internal.MavenLogReporter
-import com.pinterest.ktlint.core.Reporter
 import com.pinterest.ktlint.core.ReporterProvider
 import java.io.PrintStream
 import org.apache.maven.plugin.logging.Log
 
-class MavenLogReporterProvider : ReporterProvider {
+class MavenLogReporterProvider : ReporterProvider<MavenLogReporter> {
 
     override val id: String = "maven"
 
-    override fun get(out: PrintStream, opt: Map<String, String>): Reporter =
+    override fun get(out: PrintStream, opt: Map<String, String>): MavenLogReporter =
         throw UnsupportedOperationException("Use MavenLogReporterProvider.get(Log, Map<String, String>) instead.")
 
-    fun get(log: Log, opt: Map<String, String>): Reporter =
+    fun get(log: Log, opt: Map<String, String>): MavenLogReporter =
         MavenLogReporter(
             log = log,
             verbose = opt["verbose"].emptyOrTrue(),

diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Check.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Check.kt
@@ -25,6 +25,7 @@
  */
 package com.github.gantsign.maven.plugin.ktlint.internal
 
+import com.github.gantsign.maven.plugin.ktlint.MavenLogReporter
 import com.github.gantsign.maven.plugin.ktlint.ReporterConfig
 import java.io.File
 import java.nio.charset.Charset

diff --git a/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Sources.kt b/src/main/kotlin/com/github/gantsign/maven/plugin/ktlint/internal/Sources.kt
@@ -10,10 +10,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE