From 8a8d790cddb0d543b72919aa0b4f8a5d93c29101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brais=20Gab=C3=ADn?= Date: Tue, 25 May 2021 10:05:25 +0200 Subject: [PATCH] Detekt gradle plugin requires Gradle 6.1 or later (#3830) * Remove unnecesary code * Up minimum gradle version to 6.1 --- README.md | 2 +- .../arturbosch/detekt/extensions/DetektExtension.kt | 10 +--------- .../io/gitlab/arturbosch/detekt/DetektAndroidTest.kt | 1 - .../io/gitlab/arturbosch/detekt/DetektJvmTest.kt | 1 - .../arturbosch/detekt/DetektMultiplatformTest.kt | 1 - .../io/gitlab/arturbosch/detekt/DetektPlainTest.kt | 2 -- .../io/gitlab/arturbosch/detekt/GradleVersionTest.kt | 2 +- .../gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt | 1 - docs/pages/gettingstarted/gradle.md | 2 +- 9 files changed, 4 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 14a5a27ab..dfcdf21ae 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ If you want to use a SNAPSHOT version, you can find more info on [this documenta #### Requirements -Gradle 5.4+ is the minimum requirement. However the recommended versions, together with the other tools recommended versions are: +Gradle 6.1+ is the minimum requirement. However, the recommended versions together with the other tools recommended versions are: | Detekt Version | Gradle | Kotlin | AGP | Java Target Level | JDK Max Version | | -------------- | ------ | ------ | --- | ----------------- | --------------- | diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt index 71328bac4..c9023c252 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt @@ -4,7 +4,6 @@ import org.gradle.api.Action import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.model.ObjectFactory import org.gradle.api.plugins.quality.CodeQualityExtension -import org.gradle.util.GradleVersion import java.io.File import javax.inject.Inject @@ -33,14 +32,7 @@ open class DetektExtension @Inject constructor(objects: ObjectFactory) : CodeQua ) var baseline: File? = objects.fileProperty() - .run { - if (GradleVersion.current() < GradleVersion.version("6.0")) { - set(File("detekt-baseline.xml")) - this - } else { - fileValue(File("detekt-baseline.xml")) - } - } + .fileValue(File("detekt-baseline.xml")) .get().asFile var basePath: String? = null diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt index 5362dcd9a..f75525e78 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt @@ -456,7 +456,6 @@ private fun createGradleRunnerAndSetupProject(projectLayout: ProjectLayout) = Ds mavenCentral() google() mavenLocal() - jcenter() } } """.trimIndent(), diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt index f105d6015..7dcc521c1 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt @@ -22,7 +22,6 @@ object DetektJvmTest : Spek({ repositories { mavenCentral() mavenLocal() - jcenter() } detekt { diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt index f4e678204..4709ccf9e 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt @@ -332,7 +332,6 @@ private fun setupProject(projectLayoutAction: ProjectLayout.() -> Unit): DslGrad mavenCentral() google() mavenLocal() - jcenter() } } """.trimIndent(), diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainTest.kt index 3cc78b67d..5c42026be 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainTest.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainTest.kt @@ -19,7 +19,6 @@ object DetektPlainTest : Spek({ repositories { mavenCentral() - jcenter() mavenLocal() } @@ -50,7 +49,6 @@ object DetektPlainTest : Spek({ repositories { mavenCentral() - jcenter() mavenLocal() } diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/GradleVersionTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/GradleVersionTest.kt index 4a23ab3b5..0e510133c 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/GradleVersionTest.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/GradleVersionTest.kt @@ -10,7 +10,7 @@ import org.spekframework.spek2.style.specification.describe object GradleVersionTest : Spek({ - val gradleVersion = "5.4" + val gradleVersion = "6.1" describe( "detekt plugin running on oldest supported Gradle version", diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt index 9a08a3c9d..5276d92ac 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt @@ -10,7 +10,6 @@ abstract class DslTestBuilder { repositories { mavenLocal() mavenCentral() - jcenter() } """.trimIndent() diff --git a/docs/pages/gettingstarted/gradle.md b/docs/pages/gettingstarted/gradle.md index 40e20e855..f318a0bab 100644 --- a/docs/pages/gettingstarted/gradle.md +++ b/docs/pages/gettingstarted/gradle.md @@ -10,7 +10,7 @@ redirect_from: summary: --- -Detekt requires **Gradle 5.4** or higher. We, however, recommend using the version of Gradle that is [listed in this table](https://detekt.github.io/detekt/compatibility.html). +Detekt requires **Gradle 6.1** or higher. We, however, recommend using the version of Gradle that is [listed in this table](https://detekt.github.io/detekt/compatibility.html). ## Available plugin tasks