From 6e295653d0e026d87ab672d65237668ab95df724 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 20:56:27 +0000 Subject: [PATCH 1/6] Update Detekt monorepo from 1.21.0-RC1 to 1.21.0-RC2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ee58247e..5e9cc2c3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ androidx-test = "1.4.0" # Changelog: https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md kotlin = "1.7.10" -detekt = "1.21.0-RC1" +detekt = "1.21.0-RC2" dagger = "2.42" From 37b99dfe6c6d88340e3dbfe0749e6a5cba959ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 11 Jul 2022 22:45:54 +0100 Subject: [PATCH 2/6] Use snapshot detekt (https://github.com/detekt/detekt/issues/5066) --- .../sun/plugins/internal/commonJavaConfig.kt | 46 ++++++++++++++++++- settings.gradle.kts | 11 +++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt index 0fe4df09..60a91817 100644 --- a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt +++ b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt @@ -6,6 +6,7 @@ import io.gitlab.arturbosch.detekt.report.ReportMergeTask import net.twisterrob.sun.plugins.isCI import org.gradle.api.JavaVersion import org.gradle.api.Project +import org.gradle.api.artifacts.DependencyResolveDetails import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.getByName @@ -42,8 +43,49 @@ internal fun Project.commonJavaConfig() { } plugins.apply("io.gitlab.arturbosch.detekt") plugins.withId("io.gitlab.arturbosch.detekt") { - val detekt = this@commonJavaConfig.extensions.getByName("detekt") + val project = this@commonJavaConfig + val detekt = project.extensions.getByName("detekt") detekt.apply { + toolVersion = "main-SNAPSHOT" + project.configurations.configureEach { + if (name == "detekt") { + resolutionStrategy { + failOnNonReproducibleResolution() + eachDependency { + if (requested.group == "io.gitlab.arturbosch.detekt" && requested.version == "main-SNAPSHOT") { + useVersion( + when (requested.name) { + "detekt-cli" -> "main-20220711.191117-734" + "detekt-parser" -> "main-20220711.191117-733" + "detekt-tooling" -> "main-20220711.191117-731" + "detekt-api" -> "main-20220711.191117-737" + "detekt-psi-utils" -> "main-20220711.191117-733" + "detekt-core" -> "main-20220711.191117-737" + "detekt-utils" -> "main-20220711.191117-391" + "detekt-metrics" -> "main-20220711.191117-734" + "detekt-report-html", + "detekt-report-txt", + "detekt-report-xml", + "detekt-report-sarif" -> "main-20220711.191117-731" + "detekt-report-md" -> "main-20220711.191117-60" + "detekt-rules", + "detekt-rules-complexity", + "detekt-rules-coroutines", + "detekt-rules-documentation", + "detekt-rules-empty", + "detekt-rules-errorprone", + "detekt-rules-exceptions", + "detekt-rules-naming", + "detekt-rules-performance", + "detekt-rules-style" -> "main-20220711.191117-731" + else -> error("Unpinned module: ${requested}") + } + ) + } + } + } + } + } ignoreFailures = true // TODEL https://github.com/detekt/detekt/issues/4926 buildUponDefaultConfig = false @@ -82,7 +124,7 @@ internal fun Project.commonJavaConfig() { tasks.withType { detektReportMergeXml.configure { mustRunAfter(this@withType) - input.from(this@withType.xmlReportFile) + input.from(this@withType.xmlReportFile) } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 350f153a..525281f5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,6 +21,17 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven("https://oss.sonatype.org/content/repositories/snapshots/") { + name = "Sonatype: SNAPSHOTs" + content { + includeVersionByRegex("""^io\.gitlab\.arturbosch\.detekt$""", ".*", """.*-SNAPSHOT$""") + includeVersionByRegex("""^io\.gitlab\.arturbosch\.detekt$""", ".*", """.*-\d{8}\.\d{6}-\d+$""") + } + mavenContent { + // This doesn't allow using specific snapshot, so using versionRegex above. + //snapshotsOnly() + } + } } } From a56f51a521352007265a50e814173670f74c0d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sat, 16 Jul 2022 21:58:31 +0200 Subject: [PATCH 3/6] Remove hack --- .../sun/plugins/internal/commonJavaConfig.kt | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt index 60a91817..972dba8c 100644 --- a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt +++ b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt @@ -46,46 +46,6 @@ internal fun Project.commonJavaConfig() { val project = this@commonJavaConfig val detekt = project.extensions.getByName("detekt") detekt.apply { - toolVersion = "main-SNAPSHOT" - project.configurations.configureEach { - if (name == "detekt") { - resolutionStrategy { - failOnNonReproducibleResolution() - eachDependency { - if (requested.group == "io.gitlab.arturbosch.detekt" && requested.version == "main-SNAPSHOT") { - useVersion( - when (requested.name) { - "detekt-cli" -> "main-20220711.191117-734" - "detekt-parser" -> "main-20220711.191117-733" - "detekt-tooling" -> "main-20220711.191117-731" - "detekt-api" -> "main-20220711.191117-737" - "detekt-psi-utils" -> "main-20220711.191117-733" - "detekt-core" -> "main-20220711.191117-737" - "detekt-utils" -> "main-20220711.191117-391" - "detekt-metrics" -> "main-20220711.191117-734" - "detekt-report-html", - "detekt-report-txt", - "detekt-report-xml", - "detekt-report-sarif" -> "main-20220711.191117-731" - "detekt-report-md" -> "main-20220711.191117-60" - "detekt-rules", - "detekt-rules-complexity", - "detekt-rules-coroutines", - "detekt-rules-documentation", - "detekt-rules-empty", - "detekt-rules-errorprone", - "detekt-rules-exceptions", - "detekt-rules-naming", - "detekt-rules-performance", - "detekt-rules-style" -> "main-20220711.191117-731" - else -> error("Unpinned module: ${requested}") - } - ) - } - } - } - } - } ignoreFailures = true // TODEL https://github.com/detekt/detekt/issues/4926 buildUponDefaultConfig = false From d23a7909f9c67c56594e685d74688ca5eccc3025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sat, 16 Jul 2022 21:59:43 +0200 Subject: [PATCH 4/6] Remove unused import --- .../net/twisterrob/sun/plugins/internal/commonJavaConfig.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt index 972dba8c..b9a3662b 100644 --- a/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt +++ b/gradle/plugins/src/main/kotlin/net/twisterrob/sun/plugins/internal/commonJavaConfig.kt @@ -6,7 +6,6 @@ import io.gitlab.arturbosch.detekt.report.ReportMergeTask import net.twisterrob.sun.plugins.isCI import org.gradle.api.JavaVersion import org.gradle.api.Project -import org.gradle.api.artifacts.DependencyResolveDetails import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.getByName From 2005448f322258433a42da2161bb5970432e3aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sat, 16 Jul 2022 22:00:46 +0200 Subject: [PATCH 5/6] Remove unused deps --- settings.gradle.kts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 525281f5..350f153a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,17 +21,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven("https://oss.sonatype.org/content/repositories/snapshots/") { - name = "Sonatype: SNAPSHOTs" - content { - includeVersionByRegex("""^io\.gitlab\.arturbosch\.detekt$""", ".*", """.*-SNAPSHOT$""") - includeVersionByRegex("""^io\.gitlab\.arturbosch\.detekt$""", ".*", """.*-\d{8}\.\d{6}-\d+$""") - } - mavenContent { - // This doesn't allow using specific snapshot, so using versionRegex above. - //snapshotsOnly() - } - } } } From 337dca6d533c8da5480aeb66105822f4e73d9708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sat, 16 Jul 2022 22:01:21 +0200 Subject: [PATCH 6/6] Update to stable release --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e9cc2c3..03ca761d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ androidx-test = "1.4.0" # Changelog: https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md kotlin = "1.7.10" -detekt = "1.21.0-RC2" +detekt = "1.21.0" dagger = "2.42"