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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ google-java-format = "1.36.1"
greclipse = "4.27" # Pinned. See: https://github.com/diffplug/spotless/issues/3013
ktlint = "1.8.0"
scalafmt = "3.11.5"
spotless = "8.10.0"
spotless = "8.10.1"
tabletest-formatter = "1.1.2"

# DataDog libs and forks
Expand Down
10 changes: 5 additions & 5 deletions gradle/spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def configPath = rootProject.hasProperty('sharedConfigDirectory') ? sharedConfig
// This is necessary for some projects that set a special groovy target which can't coexist with excludeJava
boolean groovySkipJavaExclude = project.hasProperty('groovySkipJavaExclude') ? groovySkipJavaExclude : false

def buildDirectoryFiles = project.layout.buildDirectory.asFileTree
def buildDirectory = project.layout.buildDirectory

// Temporary exclusions as conventions are properly setup for these projects.
def javaGradleApplyExceptions = [
Expand Down Expand Up @@ -50,7 +50,7 @@ spotless {
// set explicit target to workaround https://github.com/diffplug/spotless/issues/1163
target 'src/**/*.java'
// ignore embedded test projects and everything in build dir, e.g. generated sources
targetExclude('src/test/resources/**', buildDirectoryFiles)
targetExclude('src/test/resources/**', buildDirectory)
removeUnusedImports()
forbidWildcardImports()
tableTestFormatter(libs.versions.tabletest.formatter.get())
Expand Down Expand Up @@ -93,15 +93,15 @@ spotless {
// the Groovy Eclipse formatter extends the Java Eclipse formatter,
// so it formats Java files by default (unless `excludeJava` is used).
}
targetExclude(buildDirectoryFiles)
targetExclude(buildDirectory)
greclipse(libs.versions.greclipse.get()).configFile(configPath + '/enforcement/spotless-groovy.properties')
}
}

project.pluginManager.withPlugin('scala') {
scala {
toggleOffOn()
targetExclude(buildDirectoryFiles)
targetExclude(buildDirectory)
Comment thread
AlexeyKuznetsov-DD marked this conversation as resolved.
scalafmt(libs.versions.scalafmt.get()).configFile(configPath + '/enforcement/spotless-scalafmt.conf')
}
}
Expand All @@ -124,7 +124,7 @@ spotless {
project.pluginManager.withPlugin('kotlin') {
kotlin {
toggleOffOn()
targetExclude(buildDirectoryFiles)
targetExclude(buildDirectory)
ktlint(libs.versions.ktlint.get()).editorConfigOverride([
// Disable trailing comma rules to minimize diff.
'ktlint_standard_trailing-comma-on-call-site': 'disabled',
Expand Down
Loading