Better ktlint integration & update to 0.13.0

src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.groovy

@@ -242,27 +242,18 @@ class CodeQualityToolsPlugin implements Plugin<Project> {
         ktlint "com.github.shyiko:ktlint:${extension.ktlint.toolVersion}"
       }
 
-      subProject.task('ktlint', type: Exec) {
-        commandLine 'java', '-cp', subProject.configurations.ktlint.join(System.getProperty('path.separator')), 'com.github.shyiko.ktlint.Main', '--reporter=checkstyle', 'src/**/*.kt'
-        def outputDirectory = "${subProject.buildDir}/reports/ktlint"
-        def outputFile = "${outputDirectory}/ktlint-checkstyle-report.xml"
-
-        ignoreExitValue = true
-
-        doFirst {
-          new File(outputDirectory).mkdirs()
-          standardOutput = new FileOutputStream(outputFile)
-        }
-
-        doLast {
-          standardOutput.close()
-          if (execResult.exitValue != 0) {
-            throw new GradleException("ktlint finished with non-zero exit value ${execResult.exitValue}. Generated report at $outputFile")
-          }
-        }
+      subProject.task('ktlint', type: JavaExec) {
+        group = 'verification'
+        description = 'Check Kotlin code style.'
+        main = 'com.github.shyiko.ktlint.Main'
+        classpath = subProject.configurations.ktlint
+        def outputFile = "${subProject.buildDir}/reports/ktlint/ktlint-checkstyle-report.xml"
+        args '--reporter=plain', "--reporter=checkstyle,output=${outputFile}", 'src/**/*.kt'
       }
 
       subProject.task('ktlintFormat', type: JavaExec) {
+        group = 'formatting'
+        description = "Fix Kotlin code style deviations."
         main = "com.github.shyiko.ktlint.Main"
         classpath = subProject.configurations.ktlint
         args "-F", "src/**/*.kt"

src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtension.groovy

@@ -180,7 +180,7 @@ class CodeQualityToolsPluginExtension {
     boolean enabled = true
 
     /** @since 0.5.0 */
-    String toolVersion = '0.9.1'
+    String toolVersion = '0.13.0'
   }
 
   static class Detekt {

src/test/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtensionTest.groovy

@@ -14,7 +14,7 @@ class CodeQualityToolsPluginExtensionTest {
     assert extension.errorProne.toolVersion == '2.0.20'
     assert extension.cpd.toolVersion == '5.4.2'
     assert extension.detekt.toolVersion == '1.0.0.M13.2'
-    assert extension.ktlint.toolVersion == '0.9.1'
+    assert extension.ktlint.toolVersion == '0.13.0'
     assert extension.findbugs.toolVersion == '3.0.1'
     assert extension.checkstyle.toolVersion == '7.8.2'
     assert extension.pmd.toolVersion == '5.8.1'

src/test/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.groovy

@@ -27,9 +27,27 @@ public class CodeQualityToolsPluginKtlintTest extends CommonCodeQualityToolsTest
     def ktlint = project.configurations.getByName('ktlint').dependencies[0]
     assert ktlint.group == 'com.github.shyiko'
     assert ktlint.name == 'ktlint'
-    assert ktlint.version == '0.9.1'
+    assert ktlint.version == '0.13.0'
     assert taskDependsOn(project.check, 'ktlint')
+
+    assert project.getTasksByName('ktlint', false).size() == 1
+    def ktlintTask = project.getTasksByName('ktlint', false)[0]
+    assert ktlintTask.group == 'verification'
+    assert ktlintTask.description == 'Check Kotlin code style.'
+    assert ktlintTask.main == 'com.github.shyiko.ktlint.Main'
+    assert ktlintTask.args.size() == 3
+    assert ktlintTask.args[0] == '--reporter=plain'
+    assert ktlintTask.args[1] == "--reporter=checkstyle,output=${project.buildDir}/reports/ktlint/ktlint-checkstyle-report.xml"
+    assert ktlintTask.args[2] == 'src/**/*.kt'
+
     assert project.getTasksByName('ktlintFormat', false).size() == 1
+    def ktlintFormatTask = project.getTasksByName('ktlintFormat', false)[0]
+    assert ktlintFormatTask.group == 'formatting'
+    assert ktlintFormatTask.description == 'Fix Kotlin code style deviations.'
+    assert ktlintFormatTask.main == 'com.github.shyiko.ktlint.Main'
+    assert ktlintFormatTask.args.size() == 2
+    assert ktlintFormatTask.args[0] == '-F'
+    assert ktlintFormatTask.args[1] == 'src/**/*.kt'
   }
 
   @Test public void configurations() {