From 75afdf6c56d0abbfc0dff7ffbd366c4aed6c8951 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Fri, 19 Nov 2021 03:45:17 +1100 Subject: [PATCH] Set source with SourceDirectorySet instead of file list (#4151) Fixes #4127 --- .../kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt index 72f67ea0a..5c5472e82 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektJvm.kt @@ -23,7 +23,7 @@ internal class DetektJvm(private val project: Project) { val kotlinSourceSet = (sourceSet as HasConvention).convention.plugins["kotlin"] as? KotlinSourceSet ?: throw GradleException("Kotlin source set not found. Please report on detekt's issue tracker") registerDetektTask(DetektPlugin.DETEKT_TASK_NAME + sourceSet.name.capitalize(), extension) { - setSource(kotlinSourceSet.kotlin.files) + source = kotlinSourceSet.kotlin classpath.setFrom(sourceSet.compileClasspath.existingFiles(), sourceSet.output.classesDirs.existingFiles()) // If a baseline file is configured as input file, it must exist to be configured, otherwise the task fails. // We try to find the configured baseline or alternatively a specific variant matching this task. @@ -68,7 +68,7 @@ internal class DetektJvm(private val project: Project) { val kotlinSourceSet = (sourceSet as HasConvention).convention.plugins["kotlin"] as? KotlinSourceSet ?: throw GradleException("Kotlin source set not found. Please report on detekt's issue tracker") registerCreateBaselineTask(DetektPlugin.BASELINE_TASK_NAME + sourceSet.name.capitalize(), extension) { - setSource(kotlinSourceSet.kotlin.files) + source = kotlinSourceSet.kotlin classpath.setFrom(sourceSet.compileClasspath.existingFiles(), sourceSet.output.classesDirs.existingFiles()) val variantBaselineFile = extension.baseline?.addVariantName(sourceSet.name) baseline.set(project.layout.file(project.provider { variantBaselineFile }))