From 09b5aaa19c7f77209201beba2cb6ef3820eb607f Mon Sep 17 00:00:00 2001
From: Mariano Barrios <marbar@gmail.com>
Date: Wed, 1 Nov 2023 11:51:24 +0100
Subject: [PATCH] Build for Java 21

---
 .github/workflows/main.yml |  2 +-
 build.gradle               | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ae58a1ae..0f64085d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 8, 11, 17, 20 ]
+        java-version: [ 8, 11, 17, 21 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
diff --git a/build.gradle b/build.gradle
index ce4b945a..71664e8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,8 @@ plugins {
     id 'scala'
     id 'signing'
     id 'maven-publish'
-    // pinned version due to Java 8 compatibility
-    id "com.diffplug.spotless" version "6.11.0"
-    // pinned version due to https://github.com/spotbugs/spotbugs/issues/2041
-    id "com.github.spotbugs" version "5.0.13"
+    id "com.diffplug.spotless" version "6.22.0"
+    id "com.github.spotbugs" version "5.2.1"
 }
 
 compileJava {
@@ -39,7 +37,8 @@ dependencies {
 
 spotless {
     java {
-        palantirJavaFormat()
+        // remove when spotless moved to this Palantir version
+        palantirJavaFormat("2.38.0")
     }
     scala {
         scalafmt('3.7.1').configFile('.scalafmt.conf')
@@ -48,7 +47,7 @@ spotless {
 
 // There are some compatibility issues with spotless older Java versions,
 // but we don't need to cross-do style checks anyway
-if (JavaVersion.current().ordinal() < JavaVersion.VERSION_17.ordinal()) {
+if (JavaVersion.current().ordinal() < JavaVersion.VERSION_21.ordinal()) {
     tasks.findByName("spotlessScala").enabled(false)
     tasks.findByName("spotlessJava").enabled(false)
 }