Update Gradle + Small Moshi Test fixups (#15)

* Update Gradle to 8.7 + add Foojar Resolvers

* Fix Moshi testFixture service not being in the correct location.

* Correct a few instances of using the name Gson rather than Moshi

* Add a presence test for checking whether the IOAdapters actually exist in the environment

:harold:

core/src/testFixtures/java/org/parchmentmc/feather/spi/IOAdapterFactory.java

@@ -2,6 +2,11 @@
 
 public interface IOAdapterFactory {
 
+    /**
+     * @return Simple descriptive name of the underlying implementation
+     */
+    String name();
+
     /**
      * Creates a {@link IOAdapter <T>} for the passed in Class
      *

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ 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='"-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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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
 
@@ -57,11 +57,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
 

io-gson/src/testFixtures/java/org/parchmentmc/feather/io/gson/spi/GsonAdapterFactory.java

@@ -14,6 +14,8 @@
 
 public class GsonAdapterFactory implements IOAdapterFactory {
 
+    private static final String NAME = "gson";
+
     private static final Gson gson = new GsonBuilder()
             .registerTypeAdapterFactory(new MDCGsonAdapterFactory())
             .registerTypeAdapterFactory(new MetadataAdapterFactory())
@@ -22,6 +24,11 @@ public class GsonAdapterFactory implements IOAdapterFactory {
             .disableHtmlEscaping()
             .create();
 
+    @Override
+    public String name() {
+        return NAME;
+    }
+
     @Override
     public <T> IOAdapter<T> create(Class<T> clazz) {
         return new GsonWrapper<>(clazz);
@@ -37,7 +44,7 @@ static class GsonWrapper<T> implements IOAdapter<T> {
 
         @Override
         public String name() {
-            return "gson";
+            return NAME;
         }
 
         @Override

io-moshi/build.gradle

@@ -12,7 +12,7 @@ publishing {
     publications.create("moshiIO", MavenPublication) {
         from components.java
         pom {
-            name = "Feather IO - GSON"
+            name = "Feather IO - Moshi"
             description = "Additional IO library for serializing JSON data objects using Moshi."
         }
     }

io-moshi/src/test/java/org/parchmentmc/feather/io/moshi/OffsetDateTimeAdapterTest.java

@@ -12,7 +12,7 @@ public OffsetDateTimeAdapterTest() {
     }
 
     @Test
-    public void testGson() {
+    public void testMoshi() {
         test(OffsetDateTime.class, OffsetDateTime.MIN);
         test(OffsetDateTime.class, OffsetDateTime.MAX);
         test(OffsetDateTime.class, OffsetDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC));

io-moshi/src/testFixtures/java/org/parchmentmc/feather/io/moshi/spi/MoshiAdapterFactory.java

@@ -10,6 +10,8 @@
 
 public class MoshiAdapterFactory implements IOAdapterFactory {
 
+    private static final String NAME = "moshi";
+
     private static final Moshi moshi = new Moshi.Builder()
             .add(LinkedHashSetMoshiAdapter.FACTORY)
             .add(new MDCMoshiAdapter())
@@ -18,6 +20,11 @@ public class MoshiAdapterFactory implements IOAdapterFactory {
             .add(new SimpleVersionAdapter())
             .build();
 
+    @Override
+    public String name() {
+        return NAME;
+    }
+
     @Override
     public <T> IOAdapter<T> create(Class<T> clazz) {
         return new MoshiWrapper<>(moshi.adapter(clazz));
@@ -33,7 +40,7 @@ static class MoshiWrapper<T> implements IOAdapter<T> {
 
         @Override
         public String name() {
-            return "moshi";
+            return NAME;
         }
 
         @Override

io-tests/src/test/java/org/parchmentmc/feather/io/tests/AdapterPresenceTest.java

@@ -0,0 +1,27 @@
+package org.parchmentmc.feather.io.tests;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.parchmentmc.feather.spi.IOAdapterFactory;
+
+import java.util.ServiceLoader;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class AdapterPresenceTest {
+
+    private static final ServiceLoader<IOAdapterFactory> CONVERTERS = ServiceLoader.load(IOAdapterFactory.class);
+    private static final String[] EXPECTED_ADAPTERS = new String[] { "gson", "moshi" };
+
+    @Test
+    public void insureExpectedAdaptersAreActuallyPresent() {
+        Assertions.assertLinesMatch(
+                Stream.of(EXPECTED_ADAPTERS).sorted(),
+                StreamSupport.stream(CONVERTERS.spliterator(), false)
+                        .map(IOAdapterFactory::name)
+                        .distinct()
+                        .sorted()
+        );
+    }
+
+}

settings.gradle

@@ -8,6 +8,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 rootProject.name = 'Feather'
 include 'core'
 project(':core').name = 'feather'