Upgrade to ktlint 0.8.1 (#6)

Author: jeremymailen

README.md

@@ -2,15 +2,15 @@
 
 [![Build Status](https://api.travis-ci.org/jeremymailen/kotlinter-gradle.svg?branch=master)](https://travis-ci.org/jeremymailen/kotlinter-gradle)
 
-Gradle plugin for linting and formatting Kotlin source files using the awesome [ktlint](https://github.com/shyiko/ktlint) engine.
+Gradle plugin for linting and formatting Kotlin source files using the awesome [ktlint](https://ktlint.github.io) engine.
 
 ### Installation
 
 Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jmailen.kotlinter
 
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version '0.9.0'
+    id 'org.jmailen.kotlinter' version '0.9.1'
 }
 ```
 

build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.shyiko:ktlint:0.6.2'
+    compile 'com.github.shyiko:ktlint:0.8.1'
     compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-2'
     compileOnly 'com.android.tools.build:gradle:2.3.2'
     testCompile 'junit:junit:4.12'
@@ -21,7 +21,7 @@ dependencies {
 }
 
 
-version = '0.9.0'
+version = '0.9.1'
 group = 'org.jmailen.gradle'
 def pluginId = 'org.jmailen.kotlinter'
 

src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/FormatTask.kt

@@ -1,6 +1,7 @@
 package org.jmailen.gradle.kotlinter.tasks
 
 import com.github.shyiko.ktlint.core.KtLint
+import com.github.shyiko.ktlint.core.RuleSet
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.SourceTask
@@ -24,16 +25,16 @@ open class FormatTask : SourceTask() {
             logger.log(LogLevel.DEBUG, "checking format: $relativePath")
 
             val formatFunc = when (file.extension) {
-                "kt" -> KtLint::format
-                "kts" -> KtLint::formatScript
+                "kt" -> this::formatKt
+                "kts" -> this::formatKts
                 else -> {
                     logger.log(LogLevel.DEBUG, "ignoring non Kotlin file: $relativePath")
                     null
                 }
             }
 
             var wasFormatted = false
-            val formattedText = formatFunc?.invoke(file.readText(), ruleSets) { (line, col, detail), corrected ->
+            val formattedText = formatFunc?.invoke(file, ruleSets) { line, col, detail, corrected ->
                 val errorStr = "$relativePath:$line:$col: $detail"
                 val msg = when (corrected) {
                     true -> "Format fixed > $errorStr"
@@ -56,4 +57,16 @@ open class FormatTask : SourceTask() {
             report.writeText("ok")
         }
     }
+
+    private fun formatKt(file: File, ruleSets: List<RuleSet>, onError: (line: Int, col: Int, detail: String, corrected: Boolean) -> Unit): String {
+        return KtLint.format(file.readText(), ruleSets) { error, corrected ->
+            onError(error.line, error.col, error.detail, corrected)
+        }
+    }
+
+    private fun formatKts(file: File, ruleSets: List<RuleSet>, onError: (line: Int, col: Int, detail: String, corrected: Boolean) -> Unit): String {
+        return KtLint.formatScript(file.readText(), ruleSets) { error, corrected ->
+            onError(error.line, error.col, error.detail, corrected)
+        }
+    }
 }

src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/LintTask.kt

@@ -1,14 +1,14 @@
 package org.jmailen.gradle.kotlinter.tasks
 
 import com.github.shyiko.ktlint.core.KtLint
+import com.github.shyiko.ktlint.core.RuleSet
 import org.gradle.api.GradleException
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.ParallelizableTask
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
-import org.jmailen.gradle.kotlinter.KotlinterExtension
 import org.jmailen.gradle.kotlinter.support.resolveRuleSets
 import java.io.File
 
@@ -32,15 +32,15 @@ open class LintTask : SourceTask() {
             logger.log(LogLevel.DEBUG, "linting: $relativePath")
 
             val lintFunc = when (file.extension) {
-                "kt" -> KtLint::lint
-                "kts" -> KtLint::lintScript
+                "kt" -> this::lintKt
+                "kts" -> this::lintKts
                 else -> {
                     logger.log(LogLevel.DEBUG, "ignoring non Kotlin file: $relativePath")
                     null
                 }
             }
 
-            lintFunc?.invoke(file.readText(), ruleSets) { (line, col, detail) ->
+            lintFunc?.invoke(file, ruleSets) { line, col, detail ->
                 val errorStr = "$relativePath:$line:$col: $detail"
                 logger.log(LogLevel.QUIET, "Lint error > $errorStr")
                 errors += "$errorStr\n"
@@ -56,4 +56,16 @@ open class LintTask : SourceTask() {
             report.writeText("ok")
         }
     }
+
+    private fun lintKt(file: File, ruleSets: List<RuleSet>, onError: (line: Int, col: Int, detail: String) -> Unit) {
+        KtLint.lint(file.readText(), ruleSets) { error ->
+            onError(error.line, error.col, error.detail)
+        }
+    }
+
+    private fun lintKts(file: File, ruleSets: List<RuleSet>, onError: (line: Int, col: Int, detail: String) -> Unit) {
+        KtLint.lintScript(file.readText(), ruleSets) { error ->
+            onError(error.line, error.col, error.detail)
+        }
+    }
 }