diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluator.groovy index c178d46..d2b7761 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluator.groovy @@ -1,6 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.GradleException import org.gradle.api.logging.Logger diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/EvaluateViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/EvaluateViolationsTask.groovy index b36d2e7..f9a958f 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/EvaluateViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/EvaluateViolationsTask.groovy @@ -1,6 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.DefaultTask import org.gradle.api.tasks.TaskAction diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisExtension.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisExtension.groovy index 99d5bee..8dc233a 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisExtension.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisExtension.groovy @@ -1,6 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.Action import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.NamedDomainObjectFactory diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisPlugin.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisPlugin.groovy index d412e2a..d639148 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisPlugin.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/StaticAnalysisPlugin.groovy @@ -1,7 +1,6 @@ package com.novoda.staticanalysis import com.novoda.staticanalysis.internal.CodeQualityConfigurator -import com.novoda.staticanalysis.internal.Violations import com.novoda.staticanalysis.internal.checkstyle.CheckstyleConfigurator import com.novoda.staticanalysis.internal.detekt.DetektConfigurator import com.novoda.staticanalysis.internal.findbugs.FindbugsConfigurator diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/Violations.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/Violations.groovy similarity index 94% rename from plugin/src/main/groovy/com/novoda/staticanalysis/internal/Violations.groovy rename to plugin/src/main/groovy/com/novoda/staticanalysis/Violations.groovy index 639367f..5f19a9c 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/Violations.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/Violations.groovy @@ -1,4 +1,4 @@ -package com.novoda.staticanalysis.internal; +package com.novoda.staticanalysis; class Violations { private final String toolName diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/ViolationsEvaluator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/ViolationsEvaluator.groovy index 8671150..0f5a77d 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/ViolationsEvaluator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/ViolationsEvaluator.groovy @@ -1,7 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations - interface ViolationsEvaluator { void evaluate(Set allViolations) 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 e8fe42f..f167795 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CodeQualityConfigurator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CodeQualityConfigurator.groovy @@ -1,6 +1,7 @@ package com.novoda.staticanalysis.internal import com.novoda.staticanalysis.StaticAnalysisExtension +import com.novoda.staticanalysis.Violations import org.gradle.api.Action import org.gradle.api.NamedDomainObjectSet import org.gradle.api.Project diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CollectViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CollectViolationsTask.groovy index 987fded..6d1cd91 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CollectViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/CollectViolationsTask.groovy @@ -1,5 +1,6 @@ package com.novoda.staticanalysis.internal +import com.novoda.staticanalysis.Violations import org.gradle.api.DefaultTask import org.gradle.api.tasks.TaskAction 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 b530549..5c158e2 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 @@ -1,8 +1,8 @@ package com.novoda.staticanalysis.internal.checkstyle +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CodeQualityConfigurator import com.novoda.staticanalysis.internal.QuietLogger -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.* import org.gradle.api.plugins.quality.Checkstyle import org.gradle.api.plugins.quality.CheckstyleExtension diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CollectCheckstyleViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CollectCheckstyleViolationsTask.groovy index 90beb29..3d0727b 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CollectCheckstyleViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/checkstyle/CollectCheckstyleViolationsTask.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.checkstyle +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CollectViolationsTask -import com.novoda.staticanalysis.internal.Violations import groovy.util.slurpersupport.GPathResult class CollectCheckstyleViolationsTask extends CollectViolationsTask { diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/CollectDetektViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/CollectDetektViolationsTask.groovy index 326007f..845bc04 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/CollectDetektViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/CollectDetektViolationsTask.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.detekt +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CollectViolationsTask -import com.novoda.staticanalysis.internal.Violations import groovy.util.slurpersupport.GPathResult class CollectDetektViolationsTask extends CollectViolationsTask { diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/DetektConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/DetektConfigurator.groovy index 8e7ef69..1ff7116 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/DetektConfigurator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/detekt/DetektConfigurator.groovy @@ -1,8 +1,8 @@ package com.novoda.staticanalysis.internal.detekt import com.novoda.staticanalysis.StaticAnalysisExtension +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.Configurator -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.GradleException import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Project diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/CollectFindbugsViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/CollectFindbugsViolationsTask.groovy index 0248d15..50e9fcf 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/CollectFindbugsViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/CollectFindbugsViolationsTask.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.findbugs +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CollectViolationsTask -import com.novoda.staticanalysis.internal.Violations class CollectFindbugsViolationsTask extends CollectViolationsTask { diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy index 0250999..bac2ba9 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.findbugs +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CodeQualityConfigurator -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.* import org.gradle.api.file.ConfigurableFileTree import org.gradle.api.file.FileCollection diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTask.groovy index 8f4dccb..ed128e9 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTask.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.lint +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CollectViolationsTask -import com.novoda.staticanalysis.internal.Violations import groovy.util.slurpersupport.GPathResult class CollectLintViolationsTask extends CollectViolationsTask { diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/LintConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/LintConfigurator.groovy index cf58b35..a90b59b 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/LintConfigurator.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/lint/LintConfigurator.groovy @@ -1,8 +1,8 @@ package com.novoda.staticanalysis.internal.lint import com.novoda.staticanalysis.StaticAnalysisExtension +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.Configurator -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Project import org.gradle.api.Task diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/CollectPmdViolationsTask.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/CollectPmdViolationsTask.groovy index 7b9dc35..6186b18 100644 --- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/CollectPmdViolationsTask.groovy +++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/pmd/CollectPmdViolationsTask.groovy @@ -1,7 +1,7 @@ package com.novoda.staticanalysis.internal.pmd +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CollectViolationsTask -import com.novoda.staticanalysis.internal.Violations class CollectPmdViolationsTask extends CollectViolationsTask { 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 4a55822..f01d6f7 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 @@ -1,8 +1,8 @@ package com.novoda.staticanalysis.internal.pmd +import com.novoda.staticanalysis.Violations import com.novoda.staticanalysis.internal.CodeQualityConfigurator import com.novoda.staticanalysis.internal.QuietLogger -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.* import org.gradle.api.plugins.quality.Pmd import org.gradle.api.plugins.quality.PmdExtension diff --git a/plugin/src/test/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluatorTest.groovy b/plugin/src/test/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluatorTest.groovy index 1a5a4be..5093183 100644 --- a/plugin/src/test/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluatorTest.groovy +++ b/plugin/src/test/groovy/com/novoda/staticanalysis/DefaultViolationsEvaluatorTest.groovy @@ -1,6 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.GradleException import org.gradle.api.logging.Logger import org.junit.Before diff --git a/plugin/src/test/groovy/com/novoda/staticanalysis/StaticAnalysisExtensionTest.groovy b/plugin/src/test/groovy/com/novoda/staticanalysis/StaticAnalysisExtensionTest.groovy index b6bf39a..0ddb6d4 100644 --- a/plugin/src/test/groovy/com/novoda/staticanalysis/StaticAnalysisExtensionTest.groovy +++ b/plugin/src/test/groovy/com/novoda/staticanalysis/StaticAnalysisExtensionTest.groovy @@ -1,6 +1,5 @@ package com.novoda.staticanalysis -import com.novoda.staticanalysis.internal.Violations import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/plugin/src/test/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTaskTest.groovy b/plugin/src/test/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTaskTest.groovy index c390487..f970bec 100644 --- a/plugin/src/test/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTaskTest.groovy +++ b/plugin/src/test/groovy/com/novoda/staticanalysis/internal/lint/CollectLintViolationsTaskTest.groovy @@ -1,6 +1,6 @@ package com.novoda.staticanalysis.internal.lint -import com.novoda.staticanalysis.internal.Violations +import com.novoda.staticanalysis.Violations import com.novoda.test.Fixtures import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder