From ee34ef03c851e3f20f6b8ec91afb681c8dcd9225 Mon Sep 17 00:00:00 2001 From: Said Tahsin Dane Date: Tue, 3 Jul 2018 23:49:58 +0200 Subject: [PATCH] Exclude kotlin files by default on java code quality tools. --- .../staticanalysis/internal/CodeQualityConfigurator.groovy | 5 ++++- .../internal/checkstyle/CheckstyleConfigurator.groovy | 1 + .../internal/findbugs/FindbugsConfigurator.groovy | 2 ++ .../staticanalysis/internal/pmd/PmdConfigurator.groovy | 1 + 4 files changed, 8 insertions(+), 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 index 1c19473..94b7d86 100644 --- 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 sourceFilter.applyTo(task) } + project.tasks.withType(taskClass) { task -> + sourceFilter.applyTo(task) + task.exclude '**/*.kt' + } } protected abstract Class getTaskClass() diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy index 93a2fb2..534e0ba 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CheckstyleConfigurator.groovy @@ -59,6 +59,7 @@ class CheckstyleConfigurator extends CodeQualityConfigurator 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 index c00913a..d47a7eb 100644 --- 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 { task.with { description = "Run PMD analysis for ${sourceSet.name} classes" source = sourceSet.java.srcDirs + exclude '**/*.kt' } } sourceFilter.applyTo(task)