Update primogenitor, dependencies. Run tests in module-path mode.

.github/workflows/main.linux.temurin.current.yml

@@ -14,7 +14,13 @@ jobs:
       - name: JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 19
+          java-version: 20
           distribution: 'temurin'
       - name: Build
         run: mvn --errors clean verify site
+      - name: Upload test logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-logs
+          path: ./com.io7m.calino.tests/target/surefire-reports

.github/workflows/main.linux.temurin.lts.yml

@@ -18,6 +18,12 @@ jobs:
           distribution: 'temurin'
       - name: Build
         run: mvn --errors clean verify site
+      - name: Upload test logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-logs
+          path: ./com.io7m.calino.tests/target/surefire-reports
       - name: Coverage
         uses: codecov/codecov-action@v1
         with:

.github/workflows/main.windows.temurin.current.yml

@@ -14,7 +14,13 @@ jobs:
       - name: JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 19
+          java-version: 20
           distribution: 'temurin'
       - name: Build
         run: mvn --errors clean verify site
+      - name: Upload test logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-logs
+          path: ./com.io7m.calino.tests/target/surefire-reports

.github/workflows/main.windows.temurin.lts.yml

@@ -18,3 +18,9 @@ jobs:
           distribution: 'temurin'
       - name: Build
         run: mvn --errors clean verify site
+      - name: Upload test logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: test-logs
+          path: ./com.io7m.calino.tests/target/surefire-reports

com.io7m.calino.tests/pom.xml

@@ -20,6 +20,7 @@
 
   <properties>
     <mdep.analyze.skip>true</mdep.analyze.skip>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
   <dependencies>

com.io7m.calino.tests/src/test/java/com/io7m/calino/tests/CLN1ParsersMappedTest.java → com.io7m.calino.tests/src/main/java/com/io7m/calino/tests/CLN1ParsersMappedTest.java

@@ -23,7 +23,7 @@
 import com.io7m.calino.vanilla.CLN1Parsers;
 import com.io7m.jmulticlose.core.CloseableCollection;
 import com.io7m.jmulticlose.core.ClosingResourceFailedException;
-import com.io7m.wendover.core.internal.ByteBufferChannel;
+import com.io7m.wendover.core.ByteBufferChannels;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
@@ -74,7 +74,7 @@ public CLNParserType parserFor(
       channel.map(FileChannel.MapMode.READ_ONLY, 0L, channel.size());
 
     final var mappedChannel =
-      new ByteBufferChannel(map);
+      ByteBufferChannels.ofByteBuffer(map);
 
     this.resources.add(mappedChannel);
 

com.io7m.calino.tests/src/test/java/com/io7m/calino/tests/CLNCompressionTest.java → com.io7m.calino.tests/src/main/java/com/io7m/calino/tests/CLNCompressionTest.java

@@ -22,7 +22,7 @@
 import com.io7m.calino.supercompression.api.CLNCompressors;
 import com.io7m.calino.supercompression.api.CLNDecompressorRequest;
 import com.io7m.calino.supercompression.api.CLNDecompressors;
-import com.io7m.wendover.core.internal.ByteBufferChannel;
+import com.io7m.wendover.core.ByteBufferChannels;
 import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
@@ -54,7 +54,7 @@ public void testUnsupportedDecompression()
         new CLNImage2DDescription(
           0, 0L, 100L, 100L, 0
         ),
-        new ByteBufferChannel(ByteBuffer.allocate(100))
+        ByteBufferChannels.ofByteBuffer(ByteBuffer.allocate(100))
       ));
     });
   }

com.io7m.calino.tests/src/main/java/module-info.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 Mark Raynsford <code@io7m.com> https://www.io7m.com
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * Calino texture format (Test suite)
+ */
+
+open module com.io7m.calino.tests
+{
+  requires com.io7m.calino.api;
+  requires com.io7m.calino.cmdline;
+  requires com.io7m.calino.imageproc.api;
+  requires com.io7m.calino.imageproc.awt;
+  requires com.io7m.calino.imageview;
+  requires com.io7m.calino.parser.api;
+  requires com.io7m.calino.supercompression.api;
+  requires com.io7m.calino.supercompression.lz4;
+  requires com.io7m.calino.supercompression.spi;
+  requires com.io7m.calino.validation.api;
+  requires com.io7m.calino.vanilla;
+  requires com.io7m.calino.writer.api;
+
+  requires org.junit.jupiter.api;
+  requires org.junit.jupiter.engine;
+  requires org.junit.platform.commons;
+  requires org.junit.platform.engine;
+
+  requires com.io7m.jmulticlose.core;
+  requires com.io7m.wendover.core;
+  requires java.desktop;
+  requires org.slf4j;
+
+  exports com.io7m.calino.tests;
+}

pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.io7m.primogenitor</groupId>
     <artifactId>com.io7m.primogenitor.full</artifactId>
-    <version>7.5.0</version>
+    <version>8.0.0-beta0001</version>
   </parent>
 
   <groupId>com.io7m.calino</groupId>
@@ -41,7 +41,7 @@
   <properties>
     <com.io7m.jbssio.version>2.0.0</com.io7m.jbssio.version>
     <com.io7m.xstructural.version>1.8.0</com.io7m.xstructural.version>
-    <com.io7m.jxtrand.version>1.1.0</com.io7m.jxtrand.version>
+    <com.io7m.jxtrand.version>2.0.0</com.io7m.jxtrand.version>
     <io7m.api.previousVersion>0.0.2-SNAPSHOT</io7m.api.previousVersion>
     <junit.version>5.9.3</junit.version>
   </properties>
@@ -158,7 +158,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.11.0</version>
+        <version>2.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -168,7 +168,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.8</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
@@ -198,7 +198,7 @@
       <dependency>
         <groupId>com.io7m.primogenitor</groupId>
         <artifactId>com.io7m.primogenitor.support</artifactId>
-        <version>7.5.0</version>
+        <version>8.0.0-beta0001</version>
       </dependency>
     </dependencies>
   </dependencyManagement>