Upgrade all dependency versions.

Now produces java 9 artifacts.
tomlj · Sep 19, 2024 · e2d94e6 · e2d94e6
1 parent 67f775f
commit e2d94e6
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 61 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,11 +7,11 @@ plugins {
   id 'jacoco'
   id 'maven-publish'
   id 'signing'
-  id 'com.diffplug.spotless' version '6.11.0'
+  id 'com.diffplug.spotless' version '6.25.0'
   id "com.github.hierynomus.license-report" version "0.16.1"
-  id 'io.spring.dependency-management' version '1.0.14.RELEASE'
-  id 'net.ltgt.errorprone' version '3.0.1'
-  id 'com.github.johnrengelman.shadow' version '7.1.2'
+  id 'io.spring.dependency-management' version '1.1.6'
+  id 'net.ltgt.errorprone' version '4.0.1'
+  id 'com.gradleup.shadow' version '8.3.2'
 }
 
 description = 'A parser for Tom\'s Obvious, Minimal Language (TOML).'
@@ -37,7 +37,10 @@ static String buildTag() {
 //////
 // Dependencies and licensing checks
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+  gradlePluginPortal()
+}
 
 apply from: "${rootDir}/dependency-versions.gradle"
 apply from: "${rootDir}/gradle/check-licenses.gradle"
@@ -114,15 +117,10 @@ java {
 
 sourcesJar.dependsOn generateGrammarSource
 
-jacoco { toolVersion = '0.8.7' }
+jacoco { toolVersion = '0.8.12' }
 
 tasks.withType(JavaCompile) {
-  // Until https://github.com/gradle/gradle/issues/2510 is resolved and
-  // something like a `releaseCompability` property is added, we have to add
-  // the --release flag explicitly
-  if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
-    options.compilerArgs.addAll(['--release', '8'])
-  }
+  options.release = 9
   options.compilerArgs += [
     '-Xlint:unchecked',
     '-Xlint:cast',

diff --git a/dependency-versions.gradle b/dependency-versions.gradle
@@ -1,13 +1,13 @@
 dependencyManagement {
   dependencies {
-    dependency('com.google.errorprone:error_prone_core:2.16')
-    dependency('com.google.errorprone:javac:9-dev-r4023-3')
-    dependencySet(group: 'org.antlr', version: '4.11.1') {
+    dependency('com.google.errorprone:error_prone_core:2.32.0')
+    dependency('com.google.errorprone:javac:9+181-r4173-1')
+    dependencySet(group: 'org.antlr', version: '4.13.2') {
       entry 'antlr4'
       entry 'antlr4-runtime'
     }
-    dependency('org.checkerframework:checker-qual:3.21.2')
-    dependencySet(group: 'org.junit.jupiter', version: '5.9.1') {
+    dependency('org.checkerframework:checker-qual:3.47.0')
+    dependencySet(group: 'org.junit.jupiter', version: '5.11.0') {
       entry 'junit-jupiter-api'
       entry 'junit-jupiter-engine'
       entry 'junit-jupiter-params'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ 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='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

diff --git a/src/main/java/org/tomlj/TomlArray.java b/src/main/java/org/tomlj/TomlArray.java
@@ -51,6 +51,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains strings.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsStrings();
 
   /**
@@ -59,6 +60,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains longs.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsLongs();
 
   /**
@@ -67,6 +69,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains doubles.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsDoubles();
 
   /**
@@ -75,6 +78,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains booleans.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsBooleans();
 
   /**
@@ -83,6 +87,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains {@link OffsetDateTime}s.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsOffsetDateTimes();
 
   /**
@@ -91,6 +96,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains {@link LocalDateTime}s.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsLocalDateTimes();
 
   /**
@@ -99,6 +105,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains {@link LocalDate}s.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsLocalDates();
 
   /**
@@ -107,6 +114,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains {@link LocalTime}s.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsLocalTimes();
 
   /**
@@ -115,6 +123,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains arrays.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsArrays();
 
   /**
@@ -123,6 +132,7 @@ public interface TomlArray {
    * @return {@code true} if the array contains tables.
    * @deprecated Future releases will support heterogeneous arrays and this method will be removed.
    */
+  @Deprecated
   boolean containsTables();
 
   /**

diff --git a/src/main/java/org/tomlj/TomlCommand.java b/src/main/java/org/tomlj/TomlCommand.java
@@ -22,6 +22,13 @@
  */
 public class TomlCommand {
 
+  private TomlCommand() {}
+
+  /**
+   * The main method.
+   *
+   * @param args Command line arguments (ignored).
+   **/
   public static void main(String[] args) {
     try {
       TomlParseResult result = Toml.parse(System.in);

diff --git a/src/main/java/org/tomlj/TomlParseError.java b/src/main/java/org/tomlj/TomlParseError.java
@@ -18,6 +18,9 @@
 @SuppressWarnings("OverrideThrowableToString")
 public final class TomlParseError extends RuntimeException {
 
+  /**
+   * The position of the error.
+   */
   private final TomlPosition position;
 
   TomlParseError(String message, TomlPosition position) {

diff --git a/src/main/java/org/tomlj/TomlSerializer.java b/src/main/java/org/tomlj/TomlSerializer.java
@@ -39,21 +39,13 @@ static void toToml(TomlTable table, Appendable appendable) throws IOException {
     toToml(table, appendable, -2, "");
   }
 
-  private static void toToml(TomlTable table, Appendable appendable, int indent, String path)
-      throws IOException {
+  private static void toToml(TomlTable table, Appendable appendable, int indent, String path) throws IOException {
     final List<Map.Entry<String, Object>> entryListSorted =
-        table.entrySet().stream()
-            .sorted(
-                Comparator.comparing(
-                    entry -> {
-                      final TomlType tomlType = typeFor(entry.getValue()).get();
-                      return tomlType.equals(TABLE)
-                              || (tomlType.equals(ARRAY)
-                                  && isTableArray((TomlArray) entry.getValue()))
-                          ? 1
-                          : 0;
-                    }))
-            .collect(Collectors.toList());
+        table.entrySet().stream().sorted(Comparator.comparing(entry -> {
+          final TomlType tomlType = typeFor(entry.getValue()).get();
+          return tomlType.equals(TABLE) || (tomlType.equals(ARRAY) && isTableArray((TomlArray) entry.getValue())) ? 1
+              : 0;
+        })).collect(Collectors.toList());
 
     for (Map.Entry<String, Object> entry : entryListSorted) {
       String key = entry.getKey();

diff --git a/src/main/java/org/tomlj/TomlVersion.java b/src/main/java/org/tomlj/TomlVersion.java
@@ -64,6 +64,7 @@ public enum TomlVersion {
     this.canonical = canonical != null ? canonical : this;
   }
 
+  @SuppressWarnings("EnumOrdinal")
   boolean after(TomlVersion other) {
     return this.ordinal() > other.ordinal();
   }