From 9065dd952c22e2346679feb6ebc0cc3094bb23f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brais=20Gab=C3=ADn?= Date: Fri, 8 Mar 2024 11:51:51 +0100 Subject: [PATCH] Enable only for gradle version after 7.6 --- .../src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt | 3 ++- .../io/gitlab/arturbosch/detekt/DetektCreateBaselineTask.kt | 3 ++- .../io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt index 27e1fbd5afb9..261928b1e363 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/Detekt.kt @@ -49,6 +49,7 @@ import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.options.Option import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.workers.WorkerExecutor +import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import javax.inject.Inject @CacheableTask @@ -175,7 +176,7 @@ abstract class Detekt @Inject constructor( @TaskAction fun check() { - if (providers.gradleProperty(USE_WORKER_API).getOrElse("true").toBoolean()) { + if (providers.gradleProperty(USE_WORKER_API).getOrElse(isGradleVersionAtLeast(7, 6).toString()).toBoolean()) { logger.info("Executing $name using Worker API") val workQueue = workerExecutor.processIsolation { workerSpec -> workerSpec.classpath.from(detektClasspath) 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 6eda315a1ec5..cad832cbf230 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 @@ -40,6 +40,7 @@ import org.gradle.api.tasks.SourceTask import org.gradle.api.tasks.TaskAction import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.workers.WorkerExecutor +import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import javax.inject.Inject @CacheableTask @@ -143,7 +144,7 @@ abstract class DetektCreateBaselineTask @Inject constructor( @TaskAction fun baseline() { - if (providers.gradleProperty(USE_WORKER_API).getOrElse("true").toBoolean()) { + if (providers.gradleProperty(USE_WORKER_API).getOrElse(isGradleVersionAtLeast(7, 6).toString()).toBoolean()) { logger.info("Executing $name using Worker API") val workQueue = workerExecutor.processIsolation { workerSpec -> workerSpec.classpath.from(detektClasspath) 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 0040a6a19455..31c66d9c0e90 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 @@ -17,6 +17,7 @@ import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.workers.WorkerExecutor +import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast import java.nio.file.Files import javax.inject.Inject @@ -55,7 +56,7 @@ abstract class DetektGenerateConfigTask @Inject constructor( Files.createDirectories(configFile.get().asFile.parentFile.toPath()) - if (providers.gradleProperty(USE_WORKER_API).getOrElse("true").toBoolean()) { + if (providers.gradleProperty(USE_WORKER_API).getOrElse(isGradleVersionAtLeast(7, 6).toString()).toBoolean()) { logger.info("Executing $name using Worker API") val workQueue = workerExecutor.processIsolation { workerSpec -> workerSpec.classpath.from(detektClasspath)