From 4196e9fd8928479530bfb8824bfe53b7dcca795d Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Mon, 31 Oct 2022 18:44:45 +1100 Subject: [PATCH 1/2] Ensure verifyGeneratorOutput task checks necessary files --- detekt-generator/build.gradle.kts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/detekt-generator/build.gradle.kts b/detekt-generator/build.gradle.kts index 8c04b028340..dd19cb4dd9a 100644 --- a/detekt-generator/build.gradle.kts +++ b/detekt-generator/build.gradle.kts @@ -88,16 +88,25 @@ val generateDocumentation by tasks.registering(JavaExec::class) { val verifyGeneratorOutput by tasks.registering(Exec::class) { dependsOn(generateDocumentation) - description = "Verifies that the default-detekt-config.yml is up-to-date" - commandLine = listOf("git", "diff", "--quiet", defaultConfigFile, deprecationFile) + description = "Verifies that generated config files are up-to-date" + commandLine = listOf( + "git", + "diff", + "--quiet", + defaultConfigFile, + formattingConfigFile, + librariesConfigFile, + ruleauthorsConfigFile, + deprecationFile, + ) isIgnoreExitValue = true doLast { if (executionResult.get().exitValue == 1) { throw GradleException( - "The default-detekt-config.yml is not up-to-date. " + + "At least one generated configuration file is not up-to-date. " + "You can execute the generateDocumentation Gradle task " + - "to update it and commit the changed files." + "to update generated files then commit the changes." ) } } From d1d751a801a2f467b50bd35b7a9b5907cca93b48 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Mon, 31 Oct 2022 18:45:04 +1100 Subject: [PATCH 2/2] Update generated ruleauthors config file --- detekt-rules-ruleauthors/src/main/resources/config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/detekt-rules-ruleauthors/src/main/resources/config/config.yml b/detekt-rules-ruleauthors/src/main/resources/config/config.yml index daa747a5855..f0e508730e6 100644 --- a/detekt-rules-ruleauthors/src/main/resources/config/config.yml +++ b/detekt-rules-ruleauthors/src/main/resources/config/config.yml @@ -1,6 +1,6 @@ ruleauthors: active: true - ViolatesTypeResolutionRequirements: - active: true UseEntityAtName: active: true + ViolatesTypeResolutionRequirements: + active: true