Reformat with ktfmt 0.65 and clean up build scripts

build-logic/src/main/kotlin/spotless.changelog.gradle.kts

@@ -22,7 +22,7 @@ spotlessChangelog {
   commitMessage("Published $kind/{{version}}") // {{version}} will be replaced
   tagMessage("{{changes}}")
   runAfterPush(
-      "gh release create $kind/{{version}} --title '$releaseTitle v{{version}}' --notes-from-tag"
+      "gh release create $kind/{{version}} --title '$releaseTitle v{{version}}' --notes-from-tag",
   )
 }
 
@@ -32,7 +32,7 @@ if (project == rootProject) {
     if (changelogPushTasks.size > 1) {
       // make sure only one changelog gets published per tag/commit
       throw IllegalArgumentException(
-          "Run changelogPush one at a time:\n" + changelogPushTasks.joinToString("\n")
+          "Run changelogPush one at a time:\n" + changelogPushTasks.joinToString("\n"),
       )
     }
     if (changelogPushTasks.size == 1) {
@@ -55,7 +55,7 @@ if (project == rootProject) {
                 "You should run :changelogPush first!  Else you'll be missing out on:\n" +
                 "${rootSpotlessChangelog.parsedChangelog.unreleasedChanges()}\n" +
                 "If it's okay to miss those and link against the old ${rootSpotlessChangelog.versionLast} then " +
-                "add -PignoreUnreleasedLib=true"
+                "add -PignoreUnreleasedLib=true",
         )
       }
     }

build-logic/src/main/kotlin/spotless.rewrite.gradle.kts

@@ -12,7 +12,7 @@ rewrite {
           "**idea/full.clean.java",
           "**package-info.java",
           "**testlib/src/main/resources**",
-      )
+      ),
   )
   isExportDatatables = true
   failOnDryRunResults = true

build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts

@@ -2,10 +2,6 @@ plugins {
   id("com.diffplug.spotless")
 }
 
-// The released Spotless plugin used here only knows the legacy `com.facebook:ktfmt` coordinate.
-// TODO: switch back to `libs.ktfmt` once a Spotless release supporting ktfmt 0.65+ is used.
-val KTFMT_VERSION = "0.64"
-
 spotless {
   if (project != rootProject) {
     java {
@@ -27,21 +23,11 @@ spotless {
   }
   kotlin {
     target("build-logic/src/**/*.kt")
-    ktfmt(KTFMT_VERSION)
+    ktfmt(libs.ktfmt.get().version)
   }
   kotlinGradle {
     target("*.gradle.kts", "build-logic/*.gradle.kts", "build-logic/src/**/*.gradle.kts")
-    ktfmt(KTFMT_VERSION)
-  }
-  groovyGradle {
-    target("*.gradle", "gradle/*.gradle")
-    greclipse()
-        .configFile(
-            rootProject.files(
-                "gradle/spotless.eclipseformat.xml",
-                "gradle/spotless.groovyformat.prefs",
-            )
-        )
+    ktfmt(libs.ktfmt.get().version)
   }
   format("dotfiles") {
     target(".gitignore", ".gitattributes", ".editorconfig")

gradle/libs.versions.toml

@@ -71,7 +71,7 @@ errorprone-core = "com.google.errorprone:error_prone_core:2.50.0"
 [plugins]
 buildconfig = "com.github.gmazzo.buildconfig:6.1.2"
 test-logger = "com.adarshr.test-logger:4.0.0"
-spotless = "com.diffplug.spotless:8.10.3"
+spotless = "com.diffplug.spotless:8.10.4"
 spotless-changelog = "com.diffplug.spotless-changelog:3.1.2"
 spotbugs = "com.github.spotbugs:6.5.12"
 plugin-publish = "com.gradle.plugin-publish:2.2.1"

lib-extra/build.gradle.kts

@@ -89,7 +89,7 @@ p2deps {
   into("groovyCompileOnly") {
     p2repo("https://download.eclipse.org/eclipse/updates/4.26/")
     p2repo(
-        "https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/"
+        "https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/",
     )
     install("org.codehaus.groovy.eclipse.refactoring")
     install("org.codehaus.groovy.eclipse.core")

lib/build.gradle.kts

@@ -171,7 +171,7 @@ dependencies {
   "compatKtLint1Dot0Dot0CompileAndTestOnly"(libs.slf4j.api)
   // palantirJavaFormat
   "palantirJavaFormatCompileOnly"(
-      pinnedLibs.palantir.java.format
+      pinnedLibs.palantir.java.format,
   ) // this version needs to stay compilable against Java 8 for CI Job testNpm
   // princeOfSpace
   "princeOfSpaceCompileOnly"(libs.prince.of.space.core)

settings.gradle.kts

@@ -7,8 +7,6 @@ pluginManagement {
 }
 
 plugins {
-  id("com.diffplug.spotless") version "8.10.3" apply false
-  id("com.github.spotbugs") version "6.5.12" apply false
   id("com.gradle.develocity") version "4.6.0"
 }