Skip to content

Commit

Permalink
Remove unused source parameter from detekt extension
Browse files Browse the repository at this point in the history
  • Loading branch information
3flex committed Mar 7, 2024
1 parent 9d86a78 commit 92f7bf2
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 24 deletions.
1 change: 0 additions & 1 deletion detekt-gradle-plugin/api/detekt-gradle-plugin.api
Expand Up @@ -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;
}

Expand Down
Expand Up @@ -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")
Expand Down
Expand Up @@ -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 ->
Expand Down
Expand Up @@ -28,12 +28,6 @@ class DetektBasePlugin : Plugin<Project> {
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)
Expand Down Expand Up @@ -114,10 +108,6 @@ class DetektBasePlugin : Plugin<Project> {
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
Expand Down
Expand Up @@ -20,8 +20,6 @@ interface DetektExtension {

val reportsDir: DirectoryProperty

val source: ConfigurableFileCollection

val baseline: RegularFileProperty

val basePath: DirectoryProperty
Expand Down

0 comments on commit 92f7bf2

Please sign in to comment.