From fd3f1f8f90adde4563f248c04f29409d6c0e1e83 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Sun, 31 Jul 2022 17:19:29 +1000
Subject: [PATCH] Remove unused dry run properties

---
 .../io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt  | 5 +----
 .../io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt  | 5 +----
 .../io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt      | 2 +-
 .../io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt   | 0
 4 files changed, 3 insertions(+), 9 deletions(-)
 rename detekt-gradle-plugin/src/{functionalTest => test}/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt (100%)

diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt
index 5795a5751941..fc3c5da3bedd 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt
@@ -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
@@ -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(
@@ -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),
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 df70c644a2a0..417d329ce740 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
@@ -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
@@ -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) {
@@ -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,
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt
index c82fc04c862f..6d2bd88fa943 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/invoke/DetektInvoker.kt
@@ -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 {
diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt
similarity index 100%
rename from detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt
rename to detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt