diff --git a/build.gradle.kts b/build.gradle.kts index 2df9861d3..9abbf179a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -321,7 +321,6 @@ val detektFormat by tasks.registering(Detekt::class) { buildUponDefaultConfig = true autoCorrect = true setSource(files(projectDir)) - ignoreFailures = false include("**/*.kt") include("**/*.kts") exclude("**/resources/**") @@ -340,7 +339,6 @@ val detektAll by tasks.registering(Detekt::class) { buildUponDefaultConfig = true setSource(files(projectDir)) config = files(project.rootDir.resolve("reports/failfast.yml")) - ignoreFailures = false include("**/*.kt") include("**/*.kts") exclude("**/resources/**") diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt index 0c9198524..6472364b6 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt @@ -136,12 +136,10 @@ open class Detekt : SourceTask(), VerificationTask { get() = failFastProp.get() set(value) = failFastProp.set(value) - private val ignoreFailuresProp: Property = project.objects.property(Boolean::class.javaObjectType) + internal val ignoreFailuresProp: Property = project.objects.property(Boolean::class.javaObjectType) @Input - @Optional - override fun getIgnoreFailures(): Boolean = ignoreFailuresProp.get() + override fun getIgnoreFailures(): Boolean = ignoreFailuresProp.getOrElse(false) override fun setIgnoreFailures(value: Boolean) = ignoreFailuresProp.set(value) - fun setIgnoreFailures(value: Provider) = ignoreFailuresProp.set(value) @Optional @Input @@ -231,7 +229,7 @@ open class Detekt : SourceTask(), VerificationTask { DetektInvoker.invokeCli( project = project, arguments = arguments.toList(), - ignoreFailures = ignoreFailuresProp.getOrElse(false), + ignoreFailures = ignoreFailuresProp.get(), classpath = detektClasspath.plus(pluginClasspath), taskName = name ) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt index 795a5a101..178c2feb1 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt @@ -59,7 +59,7 @@ class DetektPlugin : Plugin { it.setExcludes(defaultExcludes) it.reportsDir.set(project.provider { extension.customReportsDir }) it.reports = extension.reports - it.setIgnoreFailures(project.provider { extension.ignoreFailures }) + it.ignoreFailuresProp.set(project.provider { extension.ignoreFailures }) project.subprojects.forEach { subProject -> subProject.tasks.firstOrNull { t -> t is Detekt && t.name == DETEKT_TASK_NAME }?.let { subprojectTask -> @@ -90,7 +90,7 @@ class DetektPlugin : Plugin { it.reports.xml.destination = File(extension.reportsDir, sourceSet.name + ".xml") it.reports.html.destination = File(extension.reportsDir, sourceSet.name + ".html") it.reports.txt.destination = File(extension.reportsDir, sourceSet.name + ".txt") - it.setIgnoreFailures(project.provider { extension.ignoreFailures }) + it.ignoreFailuresProp.set(project.provider { extension.ignoreFailures }) it.description = "EXPERIMENTAL & SLOW: Run detekt analysis for ${sourceSet.name} classes with type resolution" }