Upgrade to ktlint 0.29.0 and fix warnings on incremental build proper…

…ties (#75)
jeremymailen · Oct 4, 2018 · 48f45a3 · 48f45a3
1 parent 8b9155a
commit 48f45a3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 #### Single module
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version '1.19.0'
+    id 'org.jmailen.kotlinter' version '1.20.0'
 }
 ```
 
@@ -26,7 +26,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'org.jmailen.gradle:kotlinter-gradle:1.19.0'
+        classpath 'org.jmailen.gradle:kotlinter-gradle:1.20.0'
     }
 }
 ```

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'com.gradle.plugin-publish' version '0.10.0'
     id 'java-gradle-plugin'
     id 'maven-publish'
-    id 'org.jmailen.kotlinter' version '1.18.0'
+    id 'org.jmailen.kotlinter' version '1.19.0'
     id 'idea'
 }
 
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.shyiko:ktlint:0.28.0'
+    compile 'com.github.shyiko:ktlint:0.29.0'
     compile 'me.cassiano:ktlint-html-reporter:0.2.0'
     compileOnly 'org.jetbrains.kotlin:kotlin-gradle-plugin'
     compileOnly 'com.android.tools.build:gradle:3.0.1'
@@ -22,7 +22,7 @@ dependencies {
     testRuntime 'com.android.tools.build:gradle:3.1.3'
 }
 
-version = '1.19.0'
+version = '1.20.0'
 group = 'org.jmailen.gradle'
 def pluginId = 'org.jmailen.kotlinter'
 

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/FormatTask.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/FormatTask.kt
@@ -4,6 +4,7 @@ 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.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
 import org.jmailen.gradle.kotlinter.KotlinterExtension
@@ -13,6 +14,7 @@ import java.io.File
 
 open class FormatTask : SourceTask() {
 
+    @Internal
     lateinit var report: File
 
     @Input

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/LintTask.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/LintTask.kt
@@ -7,6 +7,7 @@ import org.gradle.api.GradleException
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFiles
 import org.gradle.api.tasks.PathSensitive
@@ -26,6 +27,10 @@ open class LintTask : SourceTask() {
     @PathSensitive(PathSensitivity.RELATIVE)
     lateinit var reports: Map<String, File>
 
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    override fun getSource() = super.getSource()
+
     @Input
     var ignoreFailures = KotlinterExtension.DEFAULT_IGNORE_FAILURES