More spotless
MODIFY
conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts
conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts
@@ -35,28 +35,27 @@ spotless {
// not sure why it's not using the indent settings from .editorconfig
ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
}
+}
+
+// Use root declared tool deps to avoid issues with high concurrency.
+// see https://github.com/diffplug/spotless/tree/main/plugin-gradle#dependency-resolution-modes
+if (project == rootProject) {
+ spotless {
format("misc") {
- // not using "**/..." to help keep spotless fast
target(
".gitignore",
".gitattributes",
".gitconfig",
".editorconfig",
- "*.md",
- "src/**/*.md",
- "docs/**/*.md",
- "*.sh",
- "src/**/*.properties"
+ "**/*.md",
+ "**/*.sh",
+ "**/*.dockerfile",
+ "**/gradle.properties"
)
indentWithSpaces()
trimTrailingWhitespace()
endWithNewline()
}
-}
-
-// Use root declared tool deps to avoid issues with high concurrency.
-if (project == rootProject) {
- spotless {
predeclareDeps()
}

MODIFY
javaagent/build.gradle.kts
javaagent/build.gradle.kts
@@ -234,6 +234,7 @@ tasks {
named("generateLicenseReport").configure {
dependsOn(cleanLicenses)
+ finalizedBy(":spotlessApply")
}
// Because we reconfigure publishing to only include the shadow jar, the Gradle metadata is not correct.

MODIFY
licenses/licenses.md
licenses/licenses.md
@@ -228,5 +228,3 @@ _2022-11-07 16:43:40 PST_
## Unknown
**48** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.0.0`
-
-

More spotless (#7126)