Fix spotless on JDK21

buildSrc/build.gradle.kts

@@ -10,9 +10,14 @@ repositories {
 dependencies {
     // Plugins used by buildSrc scripts
     implementation(libs.spotbugs)
-    implementation(libs.spotless)
+    // https://github.com/diffplug/spotless/issues/1819
+    implementation(
+        when {
+            JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) -> libs.spotless.jdk11
+            else -> libs.spotless.jdk8
+        }
+    )
     implementation(libs.jmh)
-
     // https://github.com/gradle/gradle/issues/15383
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

gradle/libs.versions.toml

@@ -3,7 +3,8 @@ junit5 = "5.11.3"
 hamcrest = "3.0"
 jmh = "0.6.6"
 spotbugs = "6.0.22"
-spotless = "6.7.1"
+spotless = "6.13.0"
+spotless-jdk11 = "6.25.0"
 smithy-gradle = "1.1.0"
 assertj = "3.26.3"
 prettier4j = "0.1.1"
@@ -47,7 +48,8 @@ apiguardian-api = { module = "org.apiguardian:apiguardian-api", version.ref = "a
 
 # plugin artifacts for buildsrc plugins
 spotbugs = { module = "com.github.spotbugs.snom:spotbugs-gradle-plugin", version.ref = "spotbugs" }
-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
+spotless-jdk8 = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
+spotless-jdk11 = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless-jdk11" }
 jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version.ref = "jmh" }
 
 [plugins]

smithy-cli/build.gradle.kts

@@ -323,7 +323,7 @@ if (project.hasProperty("release.cli")) {
             replacements = mapOf(
                 "osx" to "darwin",
                 "aarch_64" to "aarch64",
-                "windows_x86_64" to "windows_x64"
+                "windows_x86_64" to "windows_x64",
             )
         }