diff --git a/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt index 3853959..8550e04 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/AndroidLinter.kt @@ -8,7 +8,7 @@ import static_analysis.errors.AndroidLintError import static_analysis.errors.StaticAnalysisError import static_analysis.plugins.StaticAnalysisExtension import static_analysis.utils.typedChildren -import xmlParser +import static_analysis.utils.xmlParser class AndroidLinter : Linter { @@ -52,15 +52,18 @@ class AndroidLinter : Linter { } override fun getTaskNames(project: Project, buildType: String?): List { - if (buildType == null) throw IllegalStateException("build type must not be null in android linter") + if (buildType == null) { + throw IllegalStateException("Build type must not be null in android linter") + } return project .subprojects .filter { it.plugins.hasPlugin(AppPlugin::class.java) } .mapNotNull { subproject: Project -> - subproject.tasks.find { task -> - task.name.contains(buildType, ignoreCase = true) && task.name.contains("lint") - }?.path + subproject + .tasks + .find { task -> task.name.contains(buildType, ignoreCase = true) && task.name.contains("lint") } + ?.path } } diff --git a/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt index 313d250..1e7395a 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/CpdLinter.kt @@ -10,7 +10,7 @@ import static_analysis.errors.StaticAnalysisError import static_analysis.plugins.StaticAnalysisExtension import static_analysis.utils.getSources import static_analysis.utils.typedChildren -import xmlParser +import static_analysis.utils.xmlParser class CpdLinter : Linter { diff --git a/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt b/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt index 3905ce8..0aafb22 100644 --- a/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt +++ b/gradle/plugins/src/main/java/static_analysis/linters/DetektLinter.kt @@ -7,7 +7,7 @@ import static_analysis.errors.StaticAnalysisError import static_analysis.plugins.StaticAnalysisExtension import static_analysis.utils.getSources import static_analysis.utils.typedChildren -import xmlParser +import static_analysis.utils.xmlParser class DetektLinter : Linter { diff --git a/gradle/plugins/src/main/java/static_analysis/utils/XmlUtils.kt b/gradle/plugins/src/main/java/static_analysis/utils/XmlUtils.kt index f335b29..1754f4c 100644 --- a/gradle/plugins/src/main/java/static_analysis/utils/XmlUtils.kt +++ b/gradle/plugins/src/main/java/static_analysis/utils/XmlUtils.kt @@ -1,3 +1,5 @@ +package static_analysis.utils + import groovy.util.XmlParser import java.io.File