Merge pull request #109 from tasomaniac/ignore-kotlin-in-java-tools

Exclude kotlin files by default on java code quality tools.
novoda · Jul 9, 2018 · 569f13e · 569f13e
2 parents 75de67e + ee34ef0
commit 569f13e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CodeQualityConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CodeQualityConfigurator.groovy
@@ -83,7 +83,10 @@ abstract class CodeQualityConfigurator<T extends SourceTask, E extends CodeQuali
     protected abstract void configureAndroidVariant(variant)
 
     protected void configureJavaProject() {
-        project.tasks.withType(taskClass) { task -> sourceFilter.applyTo(task) }
+        project.tasks.withType(taskClass) { task ->
+            sourceFilter.applyTo(task)
+            task.exclude '**/*.kt'
+        }
     }
 
     protected abstract Class<T> getTaskClass()

diff --git a/...c/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy b/...c/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy
@@ -59,6 +59,7 @@ class CheckstyleConfigurator extends CodeQualityConfigurator<Checkstyle, Checkst
                         description = "Run Checkstyle analysis for ${sourceSet.name} classes"
                         source = sourceSet.java.srcDirs
                         classpath = files("$buildDir/intermediates/classes/")
+                        exclude '**/*.kt'
                     }
                 }
                 sourceFilter.applyTo(task)

diff --git a/...n/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy b/...n/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy
@@ -64,6 +64,7 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
             description = "Run FindBugs analysis for ${variant.name} classes"
             source = androidSourceDirs
             classpath = variant.javaCompile.classpath
+            exclude '**/*.kt'
         }
         sourceFilter.applyTo(task)
         task.conventionMapping.map("classes") {
@@ -90,6 +91,7 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
                         List<String> includes = createIncludePatterns(task.source, sourceDirs)
                         getJavaClasses(sourceSet, includes)
                     })
+                    task.exclude '**/*.kt'
                 }
             }
         }

diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/PmdConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/PmdConfigurator.groovy
@@ -62,6 +62,7 @@ class PmdConfigurator extends CodeQualityConfigurator<Pmd, PmdExtension> {
                     task.with {
                         description = "Run PMD analysis for ${sourceSet.name} classes"
                         source = sourceSet.java.srcDirs
+                        exclude '**/*.kt'
                     }
                 }
                 sourceFilter.applyTo(task)