From 8c57938ac3974dd139a62574680ed08457b61087 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2026 00:26:25 +0000 Subject: [PATCH 1/3] Update plugin spotless to v8.10.4 --- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33a3bea2cf..32fee2646c 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/settings.gradle.kts b/settings.gradle.kts index 9bdbf29868..2190e0a117 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id("com.diffplug.spotless") version "8.10.3" apply false + id("com.diffplug.spotless") version "8.10.4" apply false id("com.github.spotbugs") version "6.5.12" apply false id("com.gradle.develocity") version "4.6.0" } From e69b289aa095231bc3c71f7a3ca8f671f8c5a835 Mon Sep 17 00:00:00 2001 From: Goooler Date: Fri, 9 Oct 2026 08:30:31 +0800 Subject: [PATCH 2/3] Clean up redundant settings plugins and obsolete groovyGradle formatting - Removes redundant plugins applied in `settings.gradle.kts` to avoid plugin classpath conflicts. - Removes obsolete `groovyGradle` spotless target as all build scripts are now Kotlin DSL. --- .../kotlin/spotless.spotless-conventions.gradle.kts | 10 ---------- settings.gradle.kts | 2 -- 2 files changed, 12 deletions(-) diff --git a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts b/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts index 398b576af3..71fb2975cd 100644 --- a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts @@ -33,16 +33,6 @@ spotless { 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", - ) - ) - } format("dotfiles") { target(".gitignore", ".gitattributes", ".editorconfig") leadingTabsToSpaces(2) diff --git a/settings.gradle.kts b/settings.gradle.kts index 2190e0a117..b614dc1631 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,8 +7,6 @@ pluginManagement { } plugins { - id("com.diffplug.spotless") version "8.10.4" apply false - id("com.github.spotbugs") version "6.5.12" apply false id("com.gradle.develocity") version "4.6.0" } From 19afb0197cfbbc6432eb62b2d085cbba7b7c6082 Mon Sep 17 00:00:00 2001 From: Goooler Date: Fri, 9 Oct 2026 08:04:53 +0800 Subject: [PATCH 3/3] Reformat with Ktfmt 0.65 --- build-logic/src/main/kotlin/spotless.changelog.gradle.kts | 6 +++--- build-logic/src/main/kotlin/spotless.rewrite.gradle.kts | 2 +- .../main/kotlin/spotless.spotless-conventions.gradle.kts | 8 ++------ lib-extra/build.gradle.kts | 2 +- lib/build.gradle.kts | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/build-logic/src/main/kotlin/spotless.changelog.gradle.kts b/build-logic/src/main/kotlin/spotless.changelog.gradle.kts index 6004ed1627..908dd029ab 100644 --- a/build-logic/src/main/kotlin/spotless.changelog.gradle.kts +++ b/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", ) } } diff --git a/build-logic/src/main/kotlin/spotless.rewrite.gradle.kts b/build-logic/src/main/kotlin/spotless.rewrite.gradle.kts index 18f1718506..19b9d406ce 100644 --- a/build-logic/src/main/kotlin/spotless.rewrite.gradle.kts +++ b/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 diff --git a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts b/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts index 71fb2975cd..2b775d6048 100644 --- a/build-logic/src/main/kotlin/spotless.spotless-conventions.gradle.kts +++ b/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,11 +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) + ktfmt(libs.ktfmt.get().version) } format("dotfiles") { target(".gitignore", ".gitattributes", ".editorconfig") diff --git a/lib-extra/build.gradle.kts b/lib-extra/build.gradle.kts index 63ef257d6e..16fa5b7f77 100644 --- a/lib-extra/build.gradle.kts +++ b/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") diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 6d8e5f9213..1e7f44de8c 100644 --- a/lib/build.gradle.kts +++ b/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)