From c6c6fff3a853644d9643ab4107072a6ea5a2c68b Mon Sep 17 00:00:00 2001
From: HEdingfield <HEdingfield@users.noreply.github.com>
Date: Mon, 26 Jun 2023 18:41:33 -0700
Subject: [PATCH 1/2] Upgrade deps (#722)

Upgrades JDK to 20.0.1, Gradle to 8.1.1, spotbugs-gradle-plugin to 5.0.14, spotbugs to 4.7.3, checkstyle to 10.12.1, jlink to 2.26.0, commons.csv to 1.10.0, poi-ooxml to 5.2.3, jackson to 2.15.2, jupiter to 5.9.3, javafxplugin to 0.0.14, and javafx to 20.0.1.
---
 .github/workflows/release.yml            |  21 ++---
 .github/workflows/test.yml               |   4 +-
 .idea/compiler.xml                       |   2 +-
 build.gradle                             |  34 ++++----
 config/checkstyle/google_checks.xml      | 101 +++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  33 ++++++--
 gradlew.bat                              |   1 +
 src/main/java/module-info.java           |   2 +-
 9 files changed, 113 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2c89e3650..ea5e41bec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,18 +2,19 @@ name: "Generate Releases"
 
 on:
   release:
-    types: [published]
-#      To test this workflow without creating a release, uncomment the following and add a branch name:
-#      push:
-#        branches:
-#          - 'branch-name'
+    types: [ published ]
+## To test this workflow without creating a release, uncomment the following and add a branch name (making sure "push"
+##  is at the same indent level as "release":
+#  push:
+#    branches:
+#      - 'branch-name'
 
 jobs:
   release:
     runs-on: ${{ matrix.os }}
     strategy:
-        matrix:
-            os: [ubuntu-latest, windows-latest, macos-latest]
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: "Create base filename for all artifacts"
         id: basefn
@@ -57,13 +58,13 @@ jobs:
         id: exefn
         shell: bash
         run: echo "FILEPATH=build/${{ steps.basefn.outputs.FILEPATH }}${{ steps.ext.outputs.EXT }}" >> $GITHUB_OUTPUT
-          
+
       - uses: actions/checkout@v3
 
-      - name: "Set up JDK 17.0.2"
+      - name: "Set up JDK 20.0.1"
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.2'
+          java-version: '20.0.1'
           distribution: 'temurin'
 
       - name: "Validate Gradle wrapper"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2ff576a0e..39794bcb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,10 +10,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: "Set up JDK 17"
+      - name: "Set up JDK 20.0.1"
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '20.0.1'
           distribution: 'temurin'
       - name: "Test with Gradle"
         run: ./gradlew check
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d294c7ff5..623bb33b5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="20" />
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/build.gradle b/build.gradle
index bb91b8f42..97ca39652 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,13 @@ plugins {
     id "application"
     id "checkstyle"
     // Latest version at: https://github.com/spotbugs/spotbugs-gradle-plugin/tags
-    id "com.github.spotbugs" version "5.0.9"
+    id "com.github.spotbugs" version "5.0.14"
     id "idea"
     id "java-library"
-    id "org.beryx.jlink" version "2.25.0"
-    id "org.openjfx.javafxplugin" version "0.0.11"
+    // Latest version at: https://github.com/beryx/badass-jlink-plugin/tags
+    id "org.beryx.jlink" version "2.26.0"
+    // Latest version at: https://github.com/openjfx/javafx-gradle-plugin/tags
+    id "org.openjfx.javafxplugin" version "0.0.14"
 }
 
 repositories {
@@ -14,18 +16,19 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'org.apache.poi:poi-ooxml:5.2.2'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.13.3'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.3'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+    implementation 'org.apache.commons:commons-csv:1.10.0'
+    implementation 'org.apache.poi:poi-ooxml:5.2.3'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
 }
 
 // ### Application plugin settings
 application {
+    mainModule = "${moduleName}"
     mainClass = "${moduleName}.Main"
 }
 
@@ -38,7 +41,7 @@ application {
 // ### Checkstyle plugin settings
 checkstyle {
     // Latest version at https://github.com/checkstyle/checkstyle/tags
-    toolVersion = '10.3.2'
+    toolVersion = '10.12.1'
     // Keep the below file updated along with subsequent versions of Checkstyle (make sure to choose
     // the tag matching the toolVersion above):
     // https://github.com/checkstyle/checkstyle/blob/checkstyle-10.3.2/src/main/resources/google_checks.xml
@@ -58,7 +61,7 @@ System.setProperty("org.checkstyle.google.suppressionfilter.config",
 
 spotbugs {
     // Latest version at: https://github.com/spotbugs/spotbugs/tags
-    toolVersion = '4.7.1'
+    toolVersion = '4.7.3'
     excludeFilter = file("config/spotbugs/exclude.xml")
 }
 
@@ -72,7 +75,7 @@ idea {
 // ### Java plugin settings
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(20))
     }
 }
 
@@ -92,7 +95,8 @@ test {
 
 // ### JavaFX plugin settings
 javafx {
-    version = "18"
+    // Latest version here: https://gluonhq.com/products/javafx/
+    version = "20.0.1"
     modules = ["javafx.base", "javafx.controls", "javafx.fxml", "javafx.graphics"]
 }
 
diff --git a/config/checkstyle/google_checks.xml b/config/checkstyle/google_checks.xml
index 35bd0e465..58d832543 100644
--- a/config/checkstyle/google_checks.xml
+++ b/config/checkstyle/google_checks.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE module PUBLIC
-  "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-  "https://checkstyle.org/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
@@ -26,19 +25,19 @@
 
   <property name="fileExtensions" value="java, properties, xml"/>
   <!-- Excludes all 'module-info.java' files              -->
-  <!-- See https://checkstyle.org/config_filefilters.html -->
+  <!-- See https://checkstyle.org/filefilters/index.html -->
   <module name="BeforeExecutionExclusionFileFilter">
     <property name="fileNamePattern" value="module\-info\.java$"/>
   </module>
   <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
   <module name="SuppressionFilter">
     <property name="file" value="${config_loc}/checkstyle-suppressions.xml"
-      default="checkstyle-suppressions.xml"/>
+              default="checkstyle-suppressions.xml"/>
     <property name="optional" value="true"/>
   </module>
 
   <!-- Checks for whitespace                               -->
-  <!-- See http://checkstyle.org/config_whitespace.html -->
+  <!-- See http://checkstyle.org/checks/whitespace/index.html -->
   <module name="FileTabCharacter">
     <property name="eachLine" value="true"/>
   </module>
@@ -54,9 +53,9 @@
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
       <property name="format"
-        value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+                value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
       <property name="message"
-        value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+                value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
     </module>
     <module name="AvoidEscapedUnicodeCharacters">
       <property name="allowEscapesForControlCharacters" value="true"/>
@@ -71,15 +70,15 @@
     <module name="EmptyBlock">
       <property name="option" value="TEXT"/>
       <property name="tokens"
-        value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+                value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
     </module>
     <module name="NeedBraces">
       <property name="tokens"
-        value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+                value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
     </module>
     <module name="LeftCurly">
       <property name="tokens"
-        value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
+                value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
                     INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
                     LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
@@ -88,16 +87,16 @@
     <module name="RightCurly">
       <property name="id" value="RightCurlySame"/>
       <property name="tokens"
-        value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
+                value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
                     LITERAL_DO"/>
     </module>
     <module name="RightCurly">
       <property name="id" value="RightCurlyAlone"/>
       <property name="option" value="alone"/>
       <property name="tokens"
-        value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
                     INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
-                    COMPACT_CTOR_DEF"/>
+                    COMPACT_CTOR_DEF, LITERAL_SWITCH"/>
     </module>
     <module name="SuppressionXpathSingleFilter">
       <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
@@ -107,7 +106,7 @@
     </module>
     <module name="WhitespaceAfter">
       <property name="tokens"
-        value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
+                value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
                     LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
                     LITERAL_YIELD, LITERAL_CASE"/>
@@ -119,19 +118,19 @@
       <property name="allowEmptyTypes" value="true"/>
       <property name="allowEmptyLoops" value="true"/>
       <property name="ignoreEnhancedForColon" value="false"/>
-      <message key="ws.notFollowed"
-        value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
-               may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-      <message key="ws.notPreceded"
-        value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
       <property name="tokens"
-        value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
+                value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
                     BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
                     LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
                     LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
                     LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
                     NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
                     SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+      <message key="ws.notFollowed"
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks
+               may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+      <message key="ws.notPreceded"
+               value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
     </module>
     <module name="OneStatementPerLine"/>
     <module name="MultipleVariableDeclarations"/>
@@ -142,7 +141,7 @@
     <module name="ModifierOrder"/>
     <module name="EmptyLineSeparator">
       <property name="tokens"
-        value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                     STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
                     COMPACT_CTOR_DEF"/>
       <property name="allowNoEmptyLineBetweenFields" value="true"/>
@@ -177,79 +176,79 @@
     <module name="PackageName">
       <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
       <message key="name.invalidPattern"
-        value="Package name ''{0}'' must match pattern ''{1}''."/>
+               value="Package name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="TypeName">
       <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                     ANNOTATION_DEF, RECORD_DEF"/>
       <message key="name.invalidPattern"
-        value="Type name ''{0}'' must match pattern ''{1}''."/>
+               value="Type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="MemberName">
       <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
       <message key="name.invalidPattern"
-        value="Member name ''{0}'' must match pattern ''{1}''."/>
+               value="Member name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="ParameterName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+               value="Parameter name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="LambdaParameterName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+               value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="CatchParameterName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+               value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="LocalVariableName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+               value="Local variable name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="PatternVariableName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
+               value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="ClassTypeParameterName">
       <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
       <message key="name.invalidPattern"
-        value="Class type name ''{0}'' must match pattern ''{1}''."/>
+               value="Class type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="RecordComponentName">
       <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
       <message key="name.invalidPattern"
-        value="Record component name ''{0}'' must match pattern ''{1}''."/>
+               value="Record component name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="RecordTypeParameterName">
       <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
       <message key="name.invalidPattern"
-        value="Record type name ''{0}'' must match pattern ''{1}''."/>
+               value="Record type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="MethodTypeParameterName">
       <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
       <message key="name.invalidPattern"
-        value="Method type name ''{0}'' must match pattern ''{1}''."/>
+               value="Method type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="InterfaceTypeParameterName">
       <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
       <message key="name.invalidPattern"
-        value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+               value="Interface type name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="NoFinalizer"/>
     <module name="GenericWhitespace">
       <message key="ws.followed"
-        value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+               value="GenericWhitespace ''{0}'' is followed by whitespace."/>
       <message key="ws.preceded"
-        value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+               value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
       <message key="ws.illegalFollow"
-        value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+               value="GenericWhitespace ''{0}'' should followed by whitespace."/>
       <message key="ws.notPreceded"
-        value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
     </module>
     <module name="Indentation">
       <property name="basicOffset" value="2"/>
@@ -263,7 +262,7 @@
       <property name="ignoreFinal" value="false"/>
       <property name="allowedAbbreviationLength" value="0"/>
       <property name="tokens"
-        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
                     PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
                     RECORD_COMPONENT_DEF"/>
     </module>
@@ -278,18 +277,18 @@
     </module>
     <module name="MethodParamPad">
       <property name="tokens"
-        value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
                     SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
     </module>
     <module name="NoWhitespaceBefore">
       <property name="tokens"
-        value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+                value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
                     LABELED_STAT, METHOD_REF"/>
       <property name="allowLineBreaks" value="true"/>
     </module>
     <module name="ParenPad">
       <property name="tokens"
-        value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
+                value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
                     EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
                     METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
@@ -298,14 +297,14 @@
     <module name="OperatorWrap">
       <property name="option" value="NL"/>
       <property name="tokens"
-        value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+                value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
                     LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
                     TYPE_EXTENSION_AND "/>
     </module>
     <module name="AnnotationLocation">
       <property name="id" value="AnnotationLocationMostCases"/>
       <property name="tokens"
-        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
                       RECORD_DEF, COMPACT_CTOR_DEF"/>
     </module>
     <module name="AnnotationLocation">
@@ -318,14 +317,14 @@
     <module name="JavadocTagContinuationIndentation"/>
     <module name="SummaryJavadoc">
       <property name="forbiddenSummaryFragments"
-        value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+                value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
     </module>
     <module name="JavadocParagraph"/>
     <module name="RequireEmptyLineBeforeBlockTagGroup"/>
     <module name="AtclauseOrder">
       <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
       <property name="target"
-        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
     </module>
     <module name="JavadocMethod">
       <property name="accessModifiers" value="public"/>
@@ -344,14 +343,14 @@
     <module name="MissingJavadocType">
       <property name="scope" value="protected"/>
       <property name="tokens"
-        value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                       RECORD_DEF, ANNOTATION_DEF"/>
       <property name="excludeScope" value="nothing"/>
     </module>
     <module name="MethodName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+      <property name="format" value="^[a-z][a-z0-9]\w*$"/>
       <message key="name.invalidPattern"
-        value="Method name ''{0}'' must match pattern ''{1}''."/>
+               value="Method name ''{0}'' must match pattern ''{1}''."/>
     </module>
     <module name="SingleLineJavadoc"/>
     <module name="EmptyCatchBlock">
@@ -363,7 +362,7 @@
     <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
     <module name="SuppressionXpathFilter">
       <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
-        default="checkstyle-xpath-suppressions.xml"/>
+                default="checkstyle-xpath-suppressions.xml"/>
       <property name="optional" value="true"/>
     </module>
     <module name="SuppressWarningsHolder"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7bc71990d..cd09bbd40 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # Also manually update gradlew and gradlew.bat with appropriate version tag from:
 # https://github.com/gradle/gradle
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 29fc68432..527081bbc 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/bin/sh
 
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 #
 #   Gradle start up script for POSIX generated by Gradle.
@@ -64,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -127,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -177,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/gradlew.bat b/gradlew.bat
index 4c882eb31..3624bceb8 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 015f2c777..bcfd03775 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -3,13 +3,13 @@
   requires com.fasterxml.jackson.core;
   requires com.fasterxml.jackson.databind;
   requires com.fasterxml.jackson.dataformat.xml;
-  requires commons.csv;
   requires java.logging;
   requires javafx.base;
   requires javafx.controls;
   requires javafx.fxml;
   requires javafx.graphics;
   requires java.xml;
+  requires org.apache.commons.csv;
   requires org.apache.poi.ooxml;
   // enable reflexive calls from network.brightspots.rcv into javafx.fxml
   opens network.brightspots.rcv;

From f690dddcea2c03b6e97792eb5fda0bb1046defb3 Mon Sep 17 00:00:00 2001
From: Armin Samii <artoonie@gmail.com>
Date: Mon, 26 Jun 2023 21:53:55 -0400
Subject: [PATCH 2/2] don't pretend we're testing interactive tiebreaking
 (#724)

---
 .../2018_maine_governor_primary_config.json                     | 2 +-
 .../convert_to_cdf_from_ess/convert_to_cdf_from_ess_config.json | 2 +-
 .../rcv/test_data/excluded_test/excluded_test_config.json       | 2 +-
 .../minneapolis_multi_seat_threshold_config.json                | 2 +-
 .../test_set_multi_winner_fractional_threshold_config.json      | 2 +-
 .../test_set_multi_winner_whole_threshold_config.json           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/resources/network/brightspots/rcv/test_data/2018_maine_governor_primary/2018_maine_governor_primary_config.json b/src/test/resources/network/brightspots/rcv/test_data/2018_maine_governor_primary/2018_maine_governor_primary_config.json
index 65b32c7e5..3cc143eff 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/2018_maine_governor_primary/2018_maine_governor_primary_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/2018_maine_governor_primary/2018_maine_governor_primary_config.json
@@ -56,7 +56,7 @@
     "excluded" : false
   } ],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "exhaustImmediately",
     "winnerElectionMode": "singleWinnerMajority",
     "randomSeed": "",
diff --git a/src/test/resources/network/brightspots/rcv/test_data/convert_to_cdf_from_ess/convert_to_cdf_from_ess_config.json b/src/test/resources/network/brightspots/rcv/test_data/convert_to_cdf_from_ess/convert_to_cdf_from_ess_config.json
index 4d94b7f61..9106341c8 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/convert_to_cdf_from_ess/convert_to_cdf_from_ess_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/convert_to_cdf_from_ess/convert_to_cdf_from_ess_config.json
@@ -40,7 +40,7 @@
     "excluded" : false
   } ],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "alwaysSkipToNextRank",
     "winnerElectionMode": "singleWinnerMajority",
     "randomSeed": "",
diff --git a/src/test/resources/network/brightspots/rcv/test_data/excluded_test/excluded_test_config.json b/src/test/resources/network/brightspots/rcv/test_data/excluded_test/excluded_test_config.json
index 9baa01712..e3f1acc99 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/excluded_test/excluded_test_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/excluded_test/excluded_test_config.json
@@ -40,7 +40,7 @@
     "excluded" : false
   } ],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "alwaysSkipToNextRank",
     "winnerElectionMode": "singleWinnerMajority",
     "randomSeed": "",
diff --git a/src/test/resources/network/brightspots/rcv/test_data/minneapolis_multi_seat_threshold/minneapolis_multi_seat_threshold_config.json b/src/test/resources/network/brightspots/rcv/test_data/minneapolis_multi_seat_threshold/minneapolis_multi_seat_threshold_config.json
index 8348715d0..fc3a1c7f7 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/minneapolis_multi_seat_threshold/minneapolis_multi_seat_threshold_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/minneapolis_multi_seat_threshold/minneapolis_multi_seat_threshold_config.json
@@ -48,7 +48,7 @@
     "excluded" : false
   } ],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "alwaysSkipToNextRank",
     "winnerElectionMode": "multiWinnerAllowMultipleWinnersPerRound",
     "randomSeed": "",
diff --git a/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_fractional_threshold/test_set_multi_winner_fractional_threshold_config.json b/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_fractional_threshold/test_set_multi_winner_fractional_threshold_config.json
index 1476b122e..151bc5983 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_fractional_threshold/test_set_multi_winner_fractional_threshold_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_fractional_threshold/test_set_multi_winner_fractional_threshold_config.json
@@ -47,7 +47,7 @@
     "excluded": false
   }],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "alwaysSkipToNextRank",
     "winnerElectionMode": "multiWinnerAllowMultipleWinnersPerRound",
     "randomSeed": "1",
diff --git a/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_whole_threshold/test_set_multi_winner_whole_threshold_config.json b/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_whole_threshold/test_set_multi_winner_whole_threshold_config.json
index 4cf7398f9..cea2ba40a 100644
--- a/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_whole_threshold/test_set_multi_winner_whole_threshold_config.json
+++ b/src/test/resources/network/brightspots/rcv/test_data/test_set_multi_winner_whole_threshold/test_set_multi_winner_whole_threshold_config.json
@@ -47,7 +47,7 @@
     "excluded": false
   }],
   "rules" : {
-    "tiebreakMode": "stopCountingAndAsk",
+    "tiebreakMode": "useCandidateOrder",
     "overvoteRule": "alwaysSkipToNextRank",
     "winnerElectionMode": "multiWinnerAllowMultipleWinnersPerRound",
     "randomSeed": "",