update detekt and Ktlint versions

Author: nidi3

code-assert/pom.xml

@@ -16,9 +16,9 @@
         <findbugs.version>3.1.12</findbugs.version>
         <findsecbugs.version>1.9.0</findsecbugs.version>
         <pmd.version>5.8.1</pmd.version>
-        <kotlin.version>1.3.41</kotlin.version>
-        <detekt.version>1.0.0-RC14</detekt.version>
-        <ktlint.version>0.31.0</ktlint.version>
+        <kotlin.version>1.3.71</kotlin.version>
+        <detekt.version>1.9.1</detekt.version>
+        <ktlint.version>0.36.0</ktlint.version>
     </properties>
 
     <build>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>guru.nidi</groupId>
             <artifactId>graphviz-java</artifactId>
-            <version>0.15.1</version>
+            <version>0.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -137,6 +137,11 @@
             <version>${kotlin.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-compiler-embeddable</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>io.gitlab.arturbosch.detekt</groupId>
@@ -150,12 +155,12 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.shyiko.ktlint</groupId>
+            <groupId>com.pinterest.ktlint</groupId>
             <artifactId>ktlint-core</artifactId>
             <version>${ktlint.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.github.shyiko.ktlint</groupId>
+            <groupId>com.pinterest.ktlint</groupId>
             <artifactId>ktlint-ruleset-standard</artifactId>
             <version>${ktlint.version}</version>
         </dependency>

code-assert/src/main/java/guru/nidi/codeassert/detekt/DetektAnalyzer.java

@@ -19,7 +19,10 @@
 import guru.nidi.codeassert.config.AnalyzerConfig;
 import guru.nidi.codeassert.config.UsageCounter;
 import io.gitlab.arturbosch.detekt.api.*;
+import io.gitlab.arturbosch.detekt.api.internal.YamlConfig;
 import io.gitlab.arturbosch.detekt.core.*;
+import org.jetbrains.kotlin.config.JvmTarget;
+import org.jetbrains.kotlin.config.LanguageVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +36,7 @@
 import static io.gitlab.arturbosch.detekt.api.Severity.*;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 
 public class DetektAnalyzer implements Analyzer<List<TypedDetektFinding>> {
@@ -75,8 +79,9 @@ public DetektResult analyze() {
         try {
             final PrintStream printStream = new PrintStream(new LoggingOutputStream(), true, "utf-8");
             final ProcessingSettings settings = new ProcessingSettings(
-                    baseDir.toPath(), calcDetektConfig(), emptyList(), false, false, emptyList(),
-                    Executors.newSingleThreadExecutor(), printStream, printStream);
+                    singletonList(baseDir.toPath()), calcDetektConfig(), null, false, false, emptyList(), emptyList(),
+                    LanguageVersion.KOTLIN_1_3, JvmTarget.JVM_1_8, Executors.newSingleThreadExecutor(),
+                    printStream, printStream, false, false, emptyList());
             final DetektFacade df = DetektFacade.Companion.create(settings, ruleSetProviders(settings), emptyList());
             return createResult(baseDir, df.run());
         } catch (UnsupportedEncodingException e) {
@@ -130,6 +135,11 @@ public <T> T valueOrDefault(String s, T t) {
         public <T> T valueOrNull(String s) {
             return "autoCorrect".equals(s) ? (T) Boolean.FALSE : delegate.valueOrNull(s);
         }
+
+        @Override
+        public String getParentPath() {
+            return delegate.getParentPath();
+        }
     }
 
     private static class LoggingOutputStream extends OutputStream {

code-assert/src/main/java/guru/nidi/codeassert/ktlint/KtlintAnalyzer.java

@@ -15,12 +15,12 @@
  */
 package guru.nidi.codeassert.ktlint;
 
-import com.github.shyiko.ktlint.core.*;
+import com.pinterest.ktlint.core.*;
 import guru.nidi.codeassert.Analyzer;
 import guru.nidi.codeassert.config.AnalyzerConfig;
 import guru.nidi.codeassert.config.UsageCounter;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +31,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
 import static java.util.stream.Collectors.toList;
 
 public class KtlintAnalyzer implements Analyzer<List<LocatedLintError>> {
@@ -61,7 +62,9 @@ public KtlintResult analyze() {
         for (final File src : config.getSources(KOTLIN)) {
             try {
                 listener.currentFile = src;
-                KtLint.INSTANCE.lint(readFile(src), findRuleSets(), listener);
+                KtLint.INSTANCE.lint(new KtLint.Params(
+                        src.getAbsolutePath(), readFile(src), findRuleSets(),
+                        emptyMap(), listener, false, null, false));
             } catch (IOException e) {
                 LOG.error("Could not read file {}", src, e);
             }
@@ -106,12 +109,12 @@ private KtlintResult createResult(ErrorListener listener) {
         return new KtlintResult(this, errors, collector.unusedActions(counter));
     }
 
-    private static class ErrorListener implements Function1<LintError, Unit> {
+    private static class ErrorListener implements Function2<LintError, Boolean, Unit> {
         final List<LocatedLintError> errors = new ArrayList<>();
         File currentFile;
 
         @Override
-        public Unit invoke(LintError e) {
+        public Unit invoke(LintError e, Boolean corrected) {
             errors.add(new LocatedLintError(currentFile, e.getLine(), e.getRuleId(), e.getDetail()));
             return null;
         }

code-assert/src/test/java/guru/nidi/codeassert/EatYourOwnDogfoodTest.java

@@ -61,7 +61,7 @@ class GuruNidiCodeassert extends DependencyRuler {
             DependencyRule checkstyleLib = denyRule("com.puppycrawl.tools.checkstyle").andAllSub();
             DependencyRule detektLib = denyRule("io.gitlab.arturbosch.detekt").andAllSub();
             DependencyRule findBugsLib = denyRule("edu.umd.cs.findbugs").andAllSub();
-            DependencyRule ktlintLib = denyRule("com.github.shyiko.ktlint").andAllSub();
+            DependencyRule ktlintLib = denyRule("com.pinterest.ktlint").andAllSub();
             DependencyRule pmdLib = denyRule("net.sourceforge.pmd").andAllSub();
             DependencyRule graphvizLib = denyRule("guru.nidi.graphviz").andAllSub();
             DependencyRule config, dependency, findbugs, checkstyle, detekt, io, model, pmd, ktlint, util, junit, junitKotlin, jacoco;

code-assert/src/test/java/guru/nidi/codeassert/detekt/DetektAnalyzerTest.java

@@ -39,8 +39,7 @@ void analyze() {
                 .just(In.classes("Linker").ignore("MaxLineLength")))
                 .analyze();
         assertMatcher(""
-                        + line(Style, "style", "NewLineAtEndOfFile", "Linker", 59, "Checks whether files end with a line separator.")
-                        + line(Style, "style", "WildcardImport", "Linker", 19, "Wildcard imports should be replaced with imports using fully qualified class names. Wildcard imports can lead to naming conflicts. A library update can introduce naming clashes with your classes which results in compilation errors."),
+                        + line(Style, "style", "NewLineAtEndOfFile", "Linker", 59, "Checks whether files end with a line separator."),
                 result, hasNoDetektIssues());
     }
 

code-assert/src/test/java/guru/nidi/codeassert/ktlint/KtlintAnalyzerTest.java

@@ -36,6 +36,7 @@ void analyze() {
         final KtlintResult result = new KtlintAnalyzer(AnalyzerConfig.maven(KOTLIN).test(), new KtlintCollector()
                 .just(In.classes("Linker").ignore("no-semi"))).analyze();
         assertMatcher(""
+                        + line("import-ordering", "Linker", 18, "Imports must be ordered in lexicographic order without any empty lines in-between")
                         + line("no-consecutive-blank-lines", "Linker", 34, "Needless blank line(s)")
                         + line("no-unused-imports", "Linker", 18, "Unused import")
                         + line("no-wildcard-imports", "Linker", 19, "Wildcard import"),

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>guru.nidi</groupId>
         <artifactId>guru-nidi-parent-pom</artifactId>
-        <version>1.1.28</version>
+        <version>1.1.30</version>
         <relativePath />
     </parent>