Skip to content

Remove markdown files from spotless #15578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 1 commit into from
Dec 9, 2025
Merged

Remove markdown files from spotless #15578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
18 changes: 17 additions & 1 deletion javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
Loading