From a066c7fe18dacc37b24560fe5aefe6f158c7e5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brais=20Gab=C3=ADn?= Date: Sun, 22 May 2022 17:56:22 +0200 Subject: [PATCH] detektGenerateConfig adds the configuration of plugins (#4844) --- .../io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt | 5 ++++- .../main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt index 011fdd361f8..df70c644a2a 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt @@ -36,6 +36,9 @@ open class DetektGenerateConfigTask @Inject constructor( @get:Classpath val detektClasspath: ConfigurableFileCollection = project.objects.fileCollection() + @get:Classpath + val pluginClasspath: ConfigurableFileCollection = objects.fileCollection() + @get:InputFiles @get:Optional @get:PathSensitive(PathSensitivity.RELATIVE) @@ -70,7 +73,7 @@ open class DetektGenerateConfigTask @Inject constructor( DetektInvoker.create(task = this, isDryRun = isDryRun).invokeCli( arguments = arguments.get(), - classpath = detektClasspath, + 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 27629298c95..38f02436b12 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 @@ -97,6 +97,7 @@ class DetektPlugin : Plugin { project.tasks.withType(DetektGenerateConfigTask::class.java).configureEach { it.detektClasspath.setFrom(project.configurations.getAt(CONFIGURATION_DETEKT)) + it.pluginClasspath.setFrom(project.configurations.getAt(CONFIGURATION_DETEKT_PLUGINS)) } }