Bump spotless

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 9aa1611e14aa · 2025-10-27T14:56:24.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
   id("datadog.dump-hanged-test")
   id("datadog.ci-jobs")
 
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
   id("com.github.spotbugs") version "6.4.4"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
@@ -35,7 +35,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     removeUnusedImports()
 
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.29.0")
   }
   groovyGradle {
     greclipse()
@@ -44,13 +44,13 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     greclipse()
   }
   kotlinGradle {
-    ktlint("0.41.0")
+    ktlint("1.7.1")
   }
   kotlin {
-    ktlint("0.41.0")
+    ktlint("1.7.1")
   }
   scala {
-    scalafmt("2.7.5")
+    scalafmt("3.9.10")
   }
 }
 apply(from = rootDir.resolve("gradle/spotless.gradle"))
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
   `jvm-test-suite`
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
 }
 
 java {
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   java
   groovy
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
   id("com.gradleup.shadow") version "8.3.6"
 }
 
@@ -18,7 +18,7 @@ spotless {
     // ignore embedded test projects
     targetExclude("src/test/resources/**")
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.29.0")
   }
 }
 
diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 plugins {
   id 'application'
   id 'java'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
   id 'com.gradleup.shadow' version '8.3.6'
   id 'com.google.protobuf' version '0.9.3'
 }
diff --git a/dd-smoke-tests/kafka-3/application/build.gradle b/dd-smoke-tests/kafka-3/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '3.2.2'
   id 'io.spring.dependency-management' version '1.1.4'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 java {
diff --git a/dd-smoke-tests/quarkus-native/application/build.gradle b/dd-smoke-tests/quarkus-native/application/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'java'
   id 'io.quarkus'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/quarkus/application/build.gradle b/dd-smoke-tests/quarkus/application/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'java'
   id 'io.quarkus'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'java'
   id 'ear'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../../"
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '2.7.4'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle
@@ -3,7 +3,7 @@ plugins {
   id 'org.springframework.boot' version '3.0.0'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
   id 'org.graalvm.buildtools.native' version '0.9.28'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '3.0.0'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '3.0.0'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle
@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'org.springframework.boot' version '3.3.5'
   id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/dd-smoke-tests/wildfly/spring-ear/build.gradle b/dd-smoke-tests/wildfly/spring-ear/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'java'
   id 'ear'
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedRootDir = "$rootDir/../../../"
diff --git a/gradle/enforcement/spotless-scalafmt.conf b/gradle/enforcement/spotless-scalafmt.conf
@@ -1,2 +1,4 @@
+version = 3.9.10
+runner.dialect = scala213
 align.preset = more
 maxColumn = 100
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
@@ -22,7 +22,7 @@ spotless {
       // ignore embedded test projects and everything in build dir, e.g. generated sources
       targetExclude('src/test/resources/**', buildDirectoryFiles)
       // This is the last Google Java Format version that supports Java 8
-      googleJavaFormat('1.7')
+      googleJavaFormat('1.29.0')
     }
   }
 
@@ -46,7 +46,7 @@ spotless {
     target '*.gradle.kts'
     // ktfmt('0.40').kotlinlangStyle() // needs Java 11+
     // Newer versions do not work well with the older version of kotlin in this build
-    ktlint('0.41.0').userData(['indent_size': '2', 'continuation_indent_size': '2'])
+    ktlint('1.7.1')
   }
 
   project.pluginManager.withPlugin('groovy') {
@@ -66,21 +66,21 @@ spotless {
     scala {
       toggleOffOn()
       targetExclude(buildDirectoryFiles)
-      scalafmt('2.7.5').configFile(configPath + '/enforcement/spotless-scalafmt.conf')
+      scalafmt('3.9.10').configFile(configPath + '/enforcement/spotless-scalafmt.conf')
     }
   }
 
   format 'markdown', {
     toggleOffOn()
     target '*.md', '.github/**/*.md', 'src/**/*.md', 'application/**/*.md'
-    indentWithSpaces()
+    leadingTabsToSpaces()
     endWithNewline()
   }
 
   format 'misc', {
     toggleOffOn()
     target '.gitignore', '*.sh', 'tooling/*.sh', '.gitlab/*.sh'
-    indentWithSpaces()
+    leadingTabsToSpaces()
     trimTrailingWhitespace()
     endWithNewline()
   }
@@ -91,7 +91,7 @@ spotless {
       // ktfmt('0.40').kotlinlangStyle() // needs Java 11+
       targetExclude(buildDirectoryFiles)
       // Newer versions do not work well with the older version of kotlin in this build
-      ktlint('0.41.0').userData(['indent_size': '2', 'continuation_indent_size': '2'])
+      ktlint('1.7.1')
     }
   }
 }
diff --git a/test-published-dependencies/build.gradle b/test-published-dependencies/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'com.diffplug.spotless' version '6.13.0'
+  id 'com.diffplug.spotless' version '8.0.0'
 }
 
 def sharedConfigDirectory = "$rootDir/../gradle"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`id("datadog.dump-hanged-test")`
`9`	`9`	`id("datadog.ci-jobs")`
`10`	`10`
`11`		`- id("com.diffplug.spotless") version "6.13.0"`
	`11`	`+ id("com.diffplug.spotless") version "8.0.0"`
`12`	`12`	`id("com.github.spotbugs") version "6.4.4"`
`13`	`13`	`id("de.thetaphi.forbiddenapis") version "3.10"`
`14`	`14`	`id("io.github.gradle-nexus.publish-plugin") version "2.0.0"`
`@@ -35,7 +35,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {`
`35`	`35`	`removeUnusedImports()`
`36`	`36`
`37`	`37`	`// This is the last Google Java Format version that supports Java 8`
`38`		`- googleJavaFormat("1.7")`
	`38`	`+ googleJavaFormat("1.29.0")`
`39`	`39`	`}`
`40`	`40`	`groovyGradle {`
`41`	`41`	`greclipse()`
`@@ -44,13 +44,13 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {`
`44`	`44`	`greclipse()`
`45`	`45`	`}`
`46`	`46`	`kotlinGradle {`
`47`		`- ktlint("0.41.0")`
	`47`	`+ ktlint("1.7.1")`
`48`	`48`	`}`
`49`	`49`	`kotlin {`
`50`		`- ktlint("0.41.0")`
	`50`	`+ ktlint("1.7.1")`
`51`	`51`	`}`
`52`	`52`	`scala {`
`53`		`- scalafmt("2.7.5")`
	`53`	`+ scalafmt("3.9.10")`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`apply(from = rootDir.resolve("gradle/spotless.gradle"))`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`java-gradle-plugin`
`4`	`4`	`kotlin-dsl`
`5`	`5`	`jvm-test-suite`
`6`		`- id("com.diffplug.spotless") version "6.13.0"`
	`6`	`+ id("com.diffplug.spotless") version "8.0.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`java`
`3`	`3`	`groovy`
`4`		`- id("com.diffplug.spotless") version "6.13.0"`
	`4`	`+ id("com.diffplug.spotless") version "8.0.0"`
`5`	`5`	`id("com.gradleup.shadow") version "8.3.6"`
`6`	`6`	`}`
`7`	`7`
`@@ -18,7 +18,7 @@ spotless {`
`18`	`18`	`// ignore embedded test projects`
`19`	`19`	`targetExclude("src/test/resources/**")`
`20`	`20`	`// This is the last Google Java Format version that supports Java 8`
`21`		`- googleJavaFormat("1.7")`
	`21`	`+ googleJavaFormat("1.29.0")`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`plugins {`
`8`	`8`	`id 'application'`
`9`	`9`	`id 'java'`
`10`		`- id 'com.diffplug.spotless' version '6.13.0'`
	`10`	`+ id 'com.diffplug.spotless' version '8.0.0'`
`11`	`11`	`id 'com.gradleup.shadow' version '8.3.6'`
`12`	`12`	`id 'com.google.protobuf' version '0.9.3'`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id 'java'`
`3`	`3`	`id 'org.springframework.boot' version '3.2.2'`
`4`	`4`	`id 'io.spring.dependency-management' version '1.1.4'`
`5`		`- id 'com.diffplug.spotless' version '6.13.0'`
	`5`	`+ id 'com.diffplug.spotless' version '8.0.0'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`java {`