From 0716235edca31b13dc2e7f8ff46240ddb6291fab Mon Sep 17 00:00:00 2001
From: Werner Dietl <wdietl@gmail.com>
Date: Tue, 7 Jan 2025 19:08:58 -0500
Subject: [PATCH] Version and style updates

---
 .github/workflows/gradle.yml |  2 +-
 build.gradle                 | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b319b9d..9735e3b 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '11', '17', '21', '23-ea' ]
+        java: [ '8', '11', '17', '21', '23' ]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/build.gradle b/build.gradle
index dddb1c1..60f501a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       // Code formatting; defines targets "spotlessApply" and "spotlessCheck".
       // https://github.com/diffplug/spotless/tags ; see tags starting "gradle/"
       // Only works on JDK 11+.
-      classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
+      classpath 'com.diffplug.spotless:spotless-plugin-gradle:7.0.1'
     }
   }
 }
@@ -17,15 +17,15 @@ plugins {
   id 'com.gradleup.shadow' version '8.3.5'
 
   // Error Prone linter
-  id('net.ltgt.errorprone') version '4.1.0'
+  id 'net.ltgt.errorprone' version '4.1.0'
 
   // Checker Framework pluggable type-checking
-  id 'org.checkerframework' version '0.6.48'
+  id 'org.checkerframework' version '0.6.48' apply false
 }
 
 repositories {
   mavenCentral()
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+  maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
 }
 
 ext {
@@ -71,7 +71,7 @@ if (isJava11orHigher) {
 
       // define the steps to apply to those files
       trimTrailingWhitespace()
-      indentWithSpaces(2)
+      leadingTabsToSpaces(2)
       endWithNewline()
     }
     java {
@@ -82,7 +82,7 @@ if (isJava11orHigher) {
     groovyGradle {
       target '**/*.gradle'
       greclipse()  // which formatter Spotless should use to format .gradle files.
-      indentWithSpaces(2)
+      leadingTabsToSpaces(2)
       trimTrailingWhitespace()
       // endWithNewline() // Don't want to end empty files with a newline
     }
@@ -109,7 +109,7 @@ apply plugin: 'org.checkerframework'
 
 if (true) {
   // Use the released version of the EISOP Checker Framework.
-  ext.checkerFrameworkVersion = '3.42.0-eisop3'
+  ext.checkerFrameworkVersion = '3.42.0-eisop5'
 } else {
   // To use a snapshot version of the EISOP Checker Framework.
   // TODO: Change the above test to false to use a snapshot.
@@ -122,6 +122,7 @@ if (true) {
 dependencies {
   compileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
   testCompileOnly "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
+  checkerFramework "io.github.eisop:checker-qual:${checkerFrameworkVersion}"
   checkerFramework "io.github.eisop:checker:${checkerFrameworkVersion}"
 }
 
@@ -199,6 +200,6 @@ check.dependsOn requireJavadoc
 
 /* Make Emacs TAGS table */
 task tags(type: Exec) {
-  description 'Run etags to create an Emacs TAGS table'
+  description = 'Run etags to create an Emacs TAGS table'
   commandLine 'bash', '-c', "find src/ -name '*.java' | sort | xargs etags"
 }