diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5138dcae082..2ba10349d5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 + - cd test-published-dependencies && ./gradlew spotlessCheck $GRADLE_ARGS check-instrumentation-naming: extends: .gradle_build diff --git a/test-published-dependencies/build.gradle.kts b/test-published-dependencies/build.gradle.kts index e3031c4786a..b9e30b36bff 100644 --- a/test-published-dependencies/build.gradle.kts +++ b/test-published-dependencies/build.gradle.kts @@ -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") + } + } }