From 6c903a5ad5824fbd007d40576fe8302927600d1c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 8 Dec 2025 19:58:08 -0800 Subject: [PATCH] Remove markdown files from spotless Markdown files are already checked by markdown lint, so no need to check them with spotless as well. --- .../otel.spotless-conventions.gradle.kts | 7 +------ javaagent/build.gradle.kts | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts b/conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts index 546a426666c4..ff0bebd97c99 100644 --- a/conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts @@ -85,14 +85,9 @@ if (project == rootProject) { ".gitattributes", ".gitconfig", ".editorconfig", - "*.md", "gradle.properties", - ".github/**/*.md", ".github/**/*.sh", - "docs/**/*.md", - "examples/**/*.md", - "examples/**/gradle.properties", - "licenses/**/*.md" + "examples/**/gradle.properties" ) leadingTabsToSpaces() trimTrailingWhitespace() diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 8d459b29fe0c..ea86675d4332 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -303,6 +303,22 @@ tasks { delete(rootProject.file("licenses")) } + val trimLicenseTrailingWhitespace by registering { + val licenseFile = rootDir.toPath().resolve("licenses/licenses.md") + val newline = System.lineSeparator() + doLast { + if (Files.exists(licenseFile)) { + val content = String(Files.readAllBytes(licenseFile), Charsets.UTF_8) + val normalized = content.lineSequence() + .map { it.trimEnd() } + .toList() + .dropLastWhile { it.isEmpty() } + .joinToString(newline) + newline + Files.write(licenseFile, normalized.toByteArray(Charsets.UTF_8)) + } + } + } + val removeLicenseDate by registering { // removing the license report date makes it idempotent val rootDirPath = rootDir.toPath() @@ -328,7 +344,7 @@ tasks { val generateLicenseReportTask = named("generateLicenseReport") generateLicenseReportTask.configure { dependsOn(cleanLicenses) - finalizedBy(":spotlessApply") + finalizedBy(trimLicenseTrailingWhitespace) finalizedBy(removeLicenseDate) // disable licence report generation unless this task is explicitly run // the files produced by this task are used by other tasks without declaring them as dependency