From eb9d8519dc75d322a515ce3e0c0ed157becc943b Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Thu, 1 Dec 2022 12:33:39 +1100
Subject: [PATCH] Reuse constants where possible

---
 .../main/kotlin/io/github/detekt/gradle/Constants.kt   |  7 -------
 .../github/detekt/gradle/DetektKotlinCompilerPlugin.kt | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/Constants.kt

diff --git a/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/Constants.kt b/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/Constants.kt
deleted file mode 100644
index 0c7222c13e89..000000000000
--- a/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/Constants.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.github.detekt.gradle
-
-const val DETEKT_NAME = "detekt"
-const val CONFIG_DIR_NAME = "config/detekt"
-const val CONFIG_FILE = "detekt.yml"
-const val DETEKT_COMPILER_PLUGIN = "detekt-compiler-plugin"
-const val CONFIGURATION_DETEKT_PLUGINS = "detektPlugins"
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/DetektKotlinCompilerPlugin.kt b/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/DetektKotlinCompilerPlugin.kt
index c81711c9823e..06d96cdcd61f 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/DetektKotlinCompilerPlugin.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/github/detekt/gradle/DetektKotlinCompilerPlugin.kt
@@ -1,7 +1,11 @@
 package io.github.detekt.gradle
 
 import io.github.detekt.gradle.extensions.KotlinCompileTaskDetektExtension
+import io.gitlab.arturbosch.detekt.CONFIGURATION_DETEKT_PLUGINS
 import io.gitlab.arturbosch.detekt.DetektPlugin
+import io.gitlab.arturbosch.detekt.DetektPlugin.Companion.CONFIG_DIR_NAME
+import io.gitlab.arturbosch.detekt.DetektPlugin.Companion.CONFIG_FILE
+import io.gitlab.arturbosch.detekt.DetektPlugin.Companion.DETEKT_EXTENSION
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
@@ -28,7 +32,7 @@ class DetektKotlinCompilerPlugin : KotlinCompilerPluginSupportPlugin {
 
         val extension =
             target.extensions.findByType(DetektExtension::class.java) ?: target.extensions.create(
-                DETEKT_NAME,
+                DETEKT_EXTENSION,
                 DetektExtension::class.java
             )
 
@@ -47,7 +51,7 @@ class DetektKotlinCompilerPlugin : KotlinCompilerPluginSupportPlugin {
         }
 
         target.tasks.withType(KotlinCompile::class.java).configureEach { task ->
-            task.extensions.create(DETEKT_NAME, KotlinCompileTaskDetektExtension::class.java, target).apply {
+            task.extensions.create(DETEKT_EXTENSION, KotlinCompileTaskDetektExtension::class.java, target).apply {
                 isEnabled.convention(extension.enableCompilerPlugin)
                 baseline.convention(target.layout.file(target.provider { extension.baseline }))
                 debug.convention(target.provider { extension.debug })
@@ -112,7 +116,7 @@ class DetektKotlinCompilerPlugin : KotlinCompilerPluginSupportPlugin {
         return options
     }
 
-    override fun getCompilerPluginId(): String = DETEKT_COMPILER_PLUGIN
+    override fun getCompilerPluginId(): String = "detekt-compiler-plugin"
 
     override fun getPluginArtifact(): SubpluginArtifact {
         // Other Gradle plugins can also have a versions.properties.