Improve consumeGeneratedConfig (detekt#6374)

* Use TaskProvider instead of task name * Remove redundant apply
mgroth0 · Feb 11, 2024 · 27afc34 · 27afc34
1 parent db886fb
commit 27afc34
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/build-logic/src/main/kotlin/ConsumeGeneratedConfig.kt b/build-logic/src/main/kotlin/ConsumeGeneratedConfig.kt
@@ -1,11 +1,16 @@
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.dependencies
 
-fun Project.consumeGeneratedConfig(fromProject: ProjectDependency, fromConfiguration: String, forTask: String) {
-    val configurationName = "generatedConfigFor${forTask.replaceFirstChar { it.titlecase() }}"
-    val generatedConfig = configurations.create(configurationName).apply {
+fun Project.consumeGeneratedConfig(
+    fromProject: ProjectDependency,
+    fromConfiguration: String,
+    forTask: TaskProvider<*>,
+) {
+    val configurationName = "generatedConfigFor${forTask.name.replaceFirstChar { it.titlecase() }}"
+    val generatedConfig = configurations.create(configurationName) {
         isCanBeConsumed = false
         isCanBeResolved = true
     }
@@ -16,7 +21,7 @@ fun Project.consumeGeneratedConfig(fromProject: ProjectDependency, fromConfigura
         }
     }
 
-    tasks.named(forTask).configure {
+    forTask.configure {
         inputs.files(generatedConfig)
             .withPropertyName(generatedConfig.name)
             .withPathSensitivity(PathSensitivity.RELATIVE)

diff --git a/detekt-core/build.gradle.kts b/detekt-core/build.gradle.kts
@@ -29,5 +29,5 @@ dependencies {
 consumeGeneratedConfig(
     fromProject = projects.detektGenerator,
     fromConfiguration = "generatedCoreConfig",
-    forTask = "sourcesJar"
+    forTask = tasks.sourcesJar
 )
diff --git a/detekt-formatting/build.gradle.kts b/detekt-formatting/build.gradle.kts
@@ -20,12 +20,12 @@ dependencies {
 consumeGeneratedConfig(
     fromProject = projects.detektGenerator,
     fromConfiguration = "generatedFormattingConfig",
-    forTask = "sourcesJar"
+    forTask = tasks.sourcesJar
 )
 consumeGeneratedConfig(
     fromProject = projects.detektGenerator,
     fromConfiguration = "generatedFormattingConfig",
-    forTask = "processResources"
+    forTask = tasks.processResources
 )
 
 val depsToPackage = setOf(

diff --git a/detekt-rules-libraries/build.gradle.kts b/detekt-rules-libraries/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies {
 consumeGeneratedConfig(
     fromProject = projects.detektGenerator,
     fromConfiguration = "generatedLibrariesConfig",
-    forTask = "processResources"
+    forTask = tasks.processResources
 )
diff --git a/detekt-rules-ruleauthors/build.gradle.kts b/detekt-rules-ruleauthors/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
 consumeGeneratedConfig(
     fromProject = projects.detektGenerator,
     fromConfiguration = "generatedRuleauthorsConfig",
-    forTask = "processResources"
+    forTask = tasks.processResources
 )
 
 kotlin {