From 33ecfff44305914723425496e85405f795c0e714 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Sun, 31 Jul 2022 15:26:34 +1000 Subject: [PATCH 1/2] Apply Gradle plugin-specific Kotlin compilation flags only to plugin build --- build-logic/src/main/kotlin/module.gradle.kts | 11 ++--------- detekt-gradle-plugin/build.gradle.kts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts index d466c2dca02..d50783d7d01 100644 --- a/build-logic/src/main/kotlin/module.gradle.kts +++ b/build-logic/src/main/kotlin/module.gradle.kts @@ -51,17 +51,10 @@ tasks.withType().configureEach { tasks.withType().configureEach { kotlinOptions { jvmTarget = Versions.JVM_TARGET - apiVersion = "1.4" - freeCompilerArgs = listOf( + freeCompilerArgs += listOf( "-progressive", - "-Xsuppress-version-warnings", ) - // Note: Currently there are warnings for detekt-gradle-plugin that seemingly can't be fixed - // until Gradle releases an update (https://github.com/gradle/gradle/issues/16345) - allWarningsAsErrors = when (project.name) { - "detekt-gradle-plugin" -> false - else -> project.findProperty("warningsAsErrors") == "true" - } + allWarningsAsErrors = project.findProperty("warningsAsErrors") == "true" } } diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts index 572276d8fe0..a9ce2d993f2 100644 --- a/detekt-gradle-plugin/build.gradle.kts +++ b/detekt-gradle-plugin/build.gradle.kts @@ -154,6 +154,18 @@ tasks.withType().configureEach { notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/13470") } +tasks.withType().configureEach { + kotlinOptions { + apiVersion = "1.4" + freeCompilerArgs += listOf( + "-Xsuppress-version-warnings", + ) + // Note: Currently there are warnings for detekt-gradle-plugin that seemingly can't be fixed + // until Gradle releases an update (https://github.com/gradle/gradle/issues/16345) + allWarningsAsErrors = false + } +} + afterEvaluate { publishing { publications.filterIsInstance().forEach { From d69bfe0fa9a25a68a1ef4d3910476c194fd681c2 Mon Sep 17 00:00:00 2001 From: Matthew Haughton <3flex@users.noreply.github.com> Date: Sun, 31 Jul 2022 15:31:32 +1000 Subject: [PATCH 2/2] Update code to Kotlin API 1.7 --- .../src/main/kotlin/io/gitlab/arturbosch/detekt/api/Rule.kt | 2 +- .../io/gitlab/arturbosch/detekt/generator/DetektPrinter.kt | 2 +- .../kotlin/io/github/detekt/report/html/HtmlOutputReport.kt | 2 +- .../main/kotlin/io/github/detekt/report/md/MdOutputReport.kt | 2 +- .../kotlin/io/github/detekt/report/sarif/RuleDescriptors.kt | 4 ++-- .../src/main/kotlin/io/github/detekt/report/xml/XmlEscape.kt | 2 +- .../kotlin/io/github/detekt/report/xml/XmlOutputReport.kt | 2 +- .../kotlin/io/github/detekt/report/xml/XmlOutputFormatSpec.kt | 2 +- .../io/gitlab/arturbosch/detekt/rules/style/MagicNumber.kt | 2 +- .../detekt/rules/style/UnderscoresInNumericLiterals.kt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Rule.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Rule.kt index 22a32cd51dc..0783904c49a 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Rule.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Rule.kt @@ -72,7 +72,7 @@ abstract class Rule( private fun computeSeverity(): SeverityLevel { val configValue: String = valueOrNull(SEVERITY_KEY) ?: ruleSetConfig.valueOrDefault(SEVERITY_KEY, "warning") - return enumValueOf(configValue.toUpperCase(Locale.US)) + return enumValueOf(configValue.uppercase(Locale.US)) } /** diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/DetektPrinter.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/DetektPrinter.kt index a9dbb1e11f8..c257551d4ec 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/DetektPrinter.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/DetektPrinter.kt @@ -42,7 +42,7 @@ class DetektPrinter(private val arguments: GeneratorArgs) { check(ruleSet.length > 1) { "Rule set name must be not empty or less than two symbols." } return """ |--- - |title: ${ruleSet[0].toUpperCase()}${ruleSet.substring(1)} Rule Set + |title: ${ruleSet[0].uppercaseChar()}${ruleSet.substring(1)} Rule Set |sidebar: home_sidebar |keywords: [rules, $ruleSet] |permalink: $ruleSet.html diff --git a/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt b/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt index 930c97001bf..26b093f44d6 100644 --- a/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt +++ b/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt @@ -123,7 +123,7 @@ class HtmlOutputReport : OutputReport() { span("description") { text(findings.first().issue.description) } } - a("$DETEKT_WEBSITE_BASE_URL/docs/rules/${group.toLowerCase(Locale.US)}#${rule.toLowerCase(Locale.US)}") { + a("$DETEKT_WEBSITE_BASE_URL/docs/rules/${group.lowercase(Locale.US)}#${rule.lowercase(Locale.US)}") { +"Documentation" } diff --git a/detekt-report-md/src/main/kotlin/io/github/detekt/report/md/MdOutputReport.kt b/detekt-report-md/src/main/kotlin/io/github/detekt/report/md/MdOutputReport.kt index 45fed53e3c0..fbbad99188c 100644 --- a/detekt-report-md/src/main/kotlin/io/github/detekt/report/md/MdOutputReport.kt +++ b/detekt-report-md/src/main/kotlin/io/github/detekt/report/md/MdOutputReport.kt @@ -97,7 +97,7 @@ private fun MarkdownContent.renderRule(rule: String, group: String, findings: Li paragraph { link( "Documentation", - "$DETEKT_WEBSITE_BASE_URL/docs/rules/${group.toLowerCase(Locale.US)}#${rule.toLowerCase(Locale.US)}" + "$DETEKT_WEBSITE_BASE_URL/docs/rules/${group.lowercase(Locale.US)}#${rule.lowercase(Locale.US)}" ) } diff --git a/detekt-report-sarif/src/main/kotlin/io/github/detekt/report/sarif/RuleDescriptors.kt b/detekt-report-sarif/src/main/kotlin/io/github/detekt/report/sarif/RuleDescriptors.kt index 90a5348494a..8cb40605522 100644 --- a/detekt-report-sarif/src/main/kotlin/io/github/detekt/report/sarif/RuleDescriptors.kt +++ b/detekt-report-sarif/src/main/kotlin/io/github/detekt/report/sarif/RuleDescriptors.kt @@ -36,8 +36,8 @@ private fun MultiRule.toDescriptors(ruleSetId: RuleSetId): List