Merge pull request #433 from Yubico/dependabot/gradle/com.diffplug.spotless-spotless-plugin-gradle-8.0.0

emlun · web-flow · commit 9933e5863530 · 2025-10-20T15:08:58.000+02:00
Bump com.diffplug.spotless:spotless-plugin-gradle from 7.2.1 to 8.0.0
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -14,8 +14,9 @@ dependencies {
   implementation("io.franzbecker:gradle-lombok:5.0.0")
 
   // Spotless dropped Java 8 support in version 2.33.0
-  if (JavaVersion.current().isJava11Compatible) {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
+  // spotless-plugin-gradle dropped Java <17 support in version 8.0.0
+  if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")
     implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")
   }
 }
diff --git a/buildSrc/src/main/kotlin/project-convention-code-formatting.gradle.kts b/buildSrc/src/main/kotlin/project-convention-code-formatting.gradle.kts
@@ -1,4 +1,5 @@
 // Spotless dropped Java 8 support in version 2.33.0
-if (JavaVersion.current().isJava11Compatible) {
+// spotless-plugin-gradle dropped Java <17 support in version 8.0.0
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
     apply(plugin = "project-convention-code-formatting-internal")
 }

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@ dependencies {`
`14`	`14`	`implementation("io.franzbecker:gradle-lombok:5.0.0")`
`15`	`15`
`16`	`16`	`// Spotless dropped Java 8 support in version 2.33.0`
`17`		`- if (JavaVersion.current().isJava11Compatible) {`
`18`		`- implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")`
	`17`	`+ // spotless-plugin-gradle dropped Java <17 support in version 8.0.0`
	`18`	`+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {`
	`19`	`+ implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")`
`19`	`20`	`implementation("io.github.cosmicsilence:gradle-scalafix:0.2.2")`
`20`	`21`	`}`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// Spotless dropped Java 8 support in version 2.33.0`
`2`		`-if (JavaVersion.current().isJava11Compatible) {`
	`2`	`+// spotless-plugin-gradle dropped Java <17 support in version 8.0.0`
	`3`	`+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {`
`3`	`4`	`apply(plugin = "project-convention-code-formatting-internal")`
`4`	`5`	`}`