Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,9 @@ spotless:
CACHE_TYPE: "spotless"
script:
- ./gradlew --version
- ./gradlew spotlessCheck $GRADLE_ARGS
# test-published-dependencies's build file needs main version file
- ./gradlew spotlessCheck writeMainVersionFile $GRADLE_ARGS
Comment thread
mcculls marked this conversation as resolved.
- cd test-published-dependencies && ./gradlew spotlessCheck $GRADLE_ARGS

check-instrumentation-naming:
extends: .gradle_build
Expand Down
22 changes: 21 additions & 1 deletion test-published-dependencies/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,25 @@ allprojects {
version = versionFromFile

apply(from = "$sharedConfigDirectory/repositories.gradle")
apply(from = "$sharedConfigDirectory/spotless.gradle")
apply(plugin = "com.diffplug.spotless")

// Apply a simple spotless config here.
// Using the dd-trace-java's plugin scripts, adds a step with grecplipse that
// has a concurrency bug surfacing with gradle 9.6 when there's no matching file.
spotless {
kotlinGradle {
target("*.gradle.kts")
ktlint("1.8.0").editorConfigOverride(
mapOf(
// Disable trailing comma rules to minimize diff.
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
),
)
}
java {
target("src/**/*.java")
googleJavaFormat("1.35.0")
}
}
}