Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused dry run properties from baseline/config tasks #5158

Merged
merged 1 commit into from Jul 31, 2022
Merged

Remove unused dry run properties from baseline/config tasks #5158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@ import io.gitlab.arturbosch.detekt.invoke.FailFastArgument
import io.gitlab.arturbosch.detekt.invoke.InputArgument
import io.gitlab.arturbosch.detekt.invoke.JvmTargetArgument
import io.gitlab.arturbosch.detekt.invoke.ParallelArgument
import io.gitlab.arturbosch.detekt.invoke.isDryRunEnabled
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.FileTree
import org.gradle.api.file.RegularFileProperty
Expand Down Expand Up @@ -114,8 +113,6 @@ open class DetektCreateBaselineTask : SourceTask() {
get() = jvmTargetProp.get()
set(value) = jvmTargetProp.set(value)

private val isDryRun: Boolean = project.isDryRunEnabled()

@get:Internal
internal val arguments: Provider<List<String>> = project.provider {
listOf(
Expand Down Expand Up @@ -148,7 +145,7 @@ open class DetektCreateBaselineTask : SourceTask() {
logger.warn("'failFast' is deprecated. Please use 'buildUponDefaultConfig' together with 'allRules'.")
}

DetektInvoker.create(task = this, isDryRun = isDryRun).invokeCli(
DetektInvoker.create(task = this).invokeCli(
arguments = arguments.get(),
ignoreFailures = ignoreFailures.getOrElse(false),
classpath = detektClasspath.plus(pluginClasspath),
Expand Down
5 changes: 1 addition & 4 deletions detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ import io.gitlab.arturbosch.detekt.invoke.CliArgument
import io.gitlab.arturbosch.detekt.invoke.ConfigArgument
import io.gitlab.arturbosch.detekt.invoke.DetektInvoker
import io.gitlab.arturbosch.detekt.invoke.GenerateConfigArgument
import io.gitlab.arturbosch.detekt.invoke.isDryRunEnabled
import org.gradle.api.DefaultTask
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.model.ObjectFactory
Expand Down Expand Up @@ -44,8 +43,6 @@ open class DetektGenerateConfigTask @Inject constructor(
@get:PathSensitive(PathSensitivity.RELATIVE)
val config: ConfigurableFileCollection = project.objects.fileCollection()

private val isDryRun: Boolean = project.isDryRunEnabled()

private val defaultConfigPath = project.rootDir.toPath().resolve(CONFIG_DIR_NAME).resolve(CONFIG_FILE)

private val configurationToUse = if (config.isEmpty) {
Expand All @@ -71,7 +68,7 @@ open class DetektGenerateConfigTask @Inject constructor(

Files.createDirectories(configurationToUse.last().parentFile.toPath())

DetektInvoker.create(task = this, isDryRun = isDryRun).invokeCli(
DetektInvoker.create(task = this).invokeCli(
arguments = arguments.get(),
classpath = detektClasspath.plus(pluginClasspath),
taskName = name,
Expand Down
2 changes: 1 addition & 1 deletion detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ internal interface DetektInvoker {

companion object {

fun create(task: Task, isDryRun: Boolean): DetektInvoker =
fun create(task: Task, isDryRun: Boolean = false): DetektInvoker =
if (isDryRun) {
DryRunInvoker(task.logger)
} else {
Expand Down