diff --git a/detekt-gradle-plugin/api/detekt-gradle-plugin.api b/detekt-gradle-plugin/api/detekt-gradle-plugin.api index eeb2a59e8553..f0831a05ebde 100644 --- a/detekt-gradle-plugin/api/detekt-gradle-plugin.api +++ b/detekt-gradle-plugin/api/detekt-gradle-plugin.api @@ -130,7 +130,6 @@ public abstract interface class io/gitlab/arturbosch/detekt/extensions/DetektExt public abstract fun getIgnoredVariants ()Lorg/gradle/api/provider/ListProperty; public abstract fun getParallel ()Lorg/gradle/api/provider/Property; public abstract fun getReportsDir ()Lorg/gradle/api/file/DirectoryProperty; - public abstract fun getSource ()Lorg/gradle/api/file/ConfigurableFileCollection; public abstract fun getToolVersion ()Lorg/gradle/api/provider/Property; } diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskGroovyDslSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskGroovyDslSpec.kt index f7998d217621..f5ce1e57f181 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskGroovyDslSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskGroovyDslSpec.kt @@ -14,7 +14,6 @@ class DetektTaskGroovyDslSpec { toolVersion = "1.0.0.RC8" ignoreFailures = true failOnSeverity = io.gitlab.arturbosch.detekt.extensions.FailOnSeverity.Info - source.setFrom(file("src/main/kotlin")) baseline = file("path/to/baseline.xml") basePath = projectDir config.setFrom("config/detekt/detekt.yml") diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskMultiModuleSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskMultiModuleSpec.kt index 7317a5442e81..676f62e46a8e 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskMultiModuleSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektTaskMultiModuleSpec.kt @@ -192,18 +192,8 @@ class DetektTaskMultiModuleSpec { addSubmodule("child2", 4) } - val detektConfig: String = """ - detekt { - source.setFrom( - "${"$"}projectDir/src", - "${"$"}projectDir/child1/src", - "${"$"}projectDir/child2/src" - ) - } - """.trimIndent() val gradleRunner = DslTestBuilder.kotlin() .withProjectLayout(projectLayout) - .withDetektConfig(detektConfig) .build() gradleRunner.runDetektTaskAndCheckResult { result -> diff --git a/detekt-gradle-plugin/src/main/kotlin/dev/detekt/gradle/plugin/DetektBasePlugin.kt b/detekt-gradle-plugin/src/main/kotlin/dev/detekt/gradle/plugin/DetektBasePlugin.kt index 3a05e55af593..d43773bf12bd 100644 --- a/detekt-gradle-plugin/src/main/kotlin/dev/detekt/gradle/plugin/DetektBasePlugin.kt +++ b/detekt-gradle-plugin/src/main/kotlin/dev/detekt/gradle/plugin/DetektBasePlugin.kt @@ -28,12 +28,6 @@ class DetektBasePlugin : Plugin { toolVersion.convention(loadDetektVersion(DetektExtension::class.java.classLoader)) ignoreFailures.convention(DEFAULT_IGNORE_FAILURES) failOnSeverity.convention(DEFAULT_FAIL_ON_SEVERITY) - source.setFrom( - DEFAULT_SRC_DIR_JAVA, - DEFAULT_TEST_SRC_DIR_JAVA, - DEFAULT_SRC_DIR_KOTLIN, - DEFAULT_TEST_SRC_DIR_KOTLIN, - ) baseline.convention(project.layout.projectDirectory.file("detekt-baseline.xml")) enableCompilerPlugin.convention(DEFAULT_COMPILER_PLUGIN_ENABLED) debug.convention(DEFAULT_DEBUG_VALUE) @@ -114,10 +108,6 @@ class DetektBasePlugin : Plugin { internal const val CONFIG_DIR_NAME = "config/detekt" internal const val CONFIG_FILE = "detekt.yml" - private const val DEFAULT_SRC_DIR_JAVA = "src/main/java" - private const val DEFAULT_TEST_SRC_DIR_JAVA = "src/test/java" - private const val DEFAULT_SRC_DIR_KOTLIN = "src/main/kotlin" - private const val DEFAULT_TEST_SRC_DIR_KOTLIN = "src/test/kotlin" private const val DEFAULT_DEBUG_VALUE = false private const val DEFAULT_IGNORE_FAILURES = false private val DEFAULT_FAIL_ON_SEVERITY = FailOnSeverity.Error diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt index 7bbbb8b51b01..1a29ba0decb9 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt @@ -20,8 +20,6 @@ interface DetektExtension { val reportsDir: DirectoryProperty - val source: ConfigurableFileCollection - val baseline: RegularFileProperty val basePath: DirectoryProperty