diff --git a/build.gradle b/build.gradle index eb91790..0f47add 100755 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.12.0' classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.12.0' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.4.0' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.5.0' } } diff --git a/src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.groovy b/src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.groovy index a6d3fed..45bdcdf 100755 --- a/src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.groovy +++ b/src/main/groovy/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.groovy @@ -328,29 +328,29 @@ class CodeQualityToolsPlugin implements Plugin { return false } - protected static boolean addDetekt(final Project project, final Project rootProject, final CodeQualityToolsPluginExtension extension) { - def isNotIgnored = !shouldIgnore(project, extension) + protected static boolean addDetekt(final Project subProject, final Project rootProject, final CodeQualityToolsPluginExtension extension) { + def isNotIgnored = !shouldIgnore(subProject, extension) def isEnabled = extension.detekt.enabled - def isDetektSupported = isKotlinProject(project) + def isDetektSupported = isKotlinProject(subProject) if (isNotIgnored && isEnabled && isDetektSupported) { - def task = project.tasks.create("detektCheck", DetektCheckTask) + def task = subProject.tasks.create("detektCheck", DetektCheckTask) task.version = extension.detekt.toolVersion task.group = GROUP_VERIFICATION task.description = "Runs detekt." - task.outputDirectory = new File(project.buildDir, "reports/detekt/") + task.outputDirectory = new File(subProject.buildDir, "reports/detekt/") task.configFile = rootProject.file(extension.detekt.config) - task.inputs.files(project.fileTree(dir: ".", include: "**/*.kt")) + task.inputs.files(subProject.fileTree(dir: ".", includes: ["**/*.kt", "**/*.kts"])) task.inputs.property("baseline-file-exists", false) if (extension.detekt.baselineFileName != null) { - def file = project.file(extension.detekt.baselineFileName) + def file = subProject.file(extension.detekt.baselineFileName) task.baselineFilePath = file.toString() task.inputs.property("baseline-file-exists", file.exists()) } - project.check.dependsOn 'detektCheck' + subProject.check.dependsOn 'detektCheck' return true } diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt index 4492ff4..f6d0f04 100755 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt @@ -18,6 +18,12 @@ class CodeQualityToolsPluginDetektTest { .succeeds() } + @Test fun noSrcFolder() { + Roboter(testProjectDir) + .withConfiguration("failFast: true") + .succeeds() + } + @Test fun differentConfigFile() { Roboter(testProjectDir, config = "code_quality_tools/config-detekt.yml") .withConfiguration("failFast: true") @@ -32,6 +38,13 @@ class CodeQualityToolsPluginDetektTest { .fails() } + @Test fun failsOnKotlinScript() { + Roboter(testProjectDir) + .withConfiguration("failFast: true") + .withKotlinFile("build.gradle.kts", "fun foo() = Unit") + .fails() + } + @Test fun disabled() { Roboter(testProjectDir, enabled = false) .withConfiguration("failFast: true")