diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index 994e3558dc..a8b3a99654 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -29,9 +29,9 @@ spotlessChangelog {
 if (project == rootProject) {
 	gradle.taskGraph.whenReady { taskGraph ->
 		def changelogPushTasks = taskGraph.allTasks.stream()
-				.filter { t -> t.name == 'changelogPush' }
-				.map { t -> t.path }
-				.toList()
+		.filter { t -> t.name == 'changelogPush' }
+		.map { t -> t.path }
+		.toList()
 		if (changelogPushTasks.size() > 1) {
 			// make sure only one changelog gets published per tag/commit
 			throw new IllegalArgumentException("Run changelogPush one at a time:\n" + changelogPushTasks.join('\n'))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1e739a1fe0..a8d9c10e00 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -66,7 +66,7 @@ errorprone-core = "com.google.errorprone:error_prone_core:2.42.0"
 
 [plugins]
 test-logger = "com.adarshr.test-logger:4.0.0"
-spotless = "com.diffplug.spotless:8.3.0"
+spotless = "com.diffplug.spotless:8.7.0"
 spotless-changelog = "com.diffplug.spotless-changelog:3.1.2"
 spotbugs = "com.github.spotbugs:6.4.8"
 plugin-publish = "com.gradle.plugin-publish:2.1.1"
diff --git a/settings.gradle b/settings.gradle
index 8c344327aa..d168e1bac6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.diffplug.spotless' version '8.3.0' apply false
+	id 'com.diffplug.spotless' version '8.7.0' apply false
 	id 'com.github.spotbugs' version '6.4.8' apply false // https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.gradle.develocity' version '4.4.2'
 }
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 9809a64021..3ba4f011a5 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -33,9 +33,9 @@ apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
 	// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
 	jvmArgs(
-			'--add-opens=java.base/java.lang=ALL-UNNAMED',
-			'--add-opens=java.base/java.util=ALL-UNNAMED',
-			)
+	'--add-opens=java.base/java.lang=ALL-UNNAMED',
+	'--add-opens=java.base/java.util=ALL-UNNAMED',
+	)
 }
 
 javadoc {