Skip to content

Commit

Permalink
Update primogenitor, dependencies, move test sources root.
Browse files Browse the repository at this point in the history
  • Loading branch information
io7m committed Jul 1, 2023
1 parent dab5609 commit 4eec51f
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.linux.temurin.current.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.windows.temurin.current.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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
Expand Down
1 change: 1 addition & 0 deletions com.io7m.hibiscus.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<properties>
<mdep.analyze.skip>true</mdep.analyze.skip>
<checkstyle.skip>true</checkstyle.skip>
</properties>

<dependencies>
Expand Down
19 changes: 13 additions & 6 deletions com.io7m.hibiscus.tests/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,21 @@

open module com.io7m.hibiscus.tests
{
requires transitive com.io7m.hibiscus.api;
requires transitive com.io7m.hibiscus.basic;

requires java.net.http;
requires org.slf4j;

requires transitive org.junit.jupiter.api;
requires transitive org.junit.jupiter.engine;
requires transitive org.junit.platform.commons;
requires transitive org.junit.platform.engine;

requires com.io7m.hibiscus.api;
requires com.io7m.hibiscus.basic;

requires com.io7m.quixote.core;
requires java.net.http;
requires net.bytebuddy.agent;
requires net.bytebuddy;
requires net.jqwik.api;
requires org.mockito;
requires org.slf4j;

exports com.io7m.hibiscus.tests;
}
24 changes: 18 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.io7m.primogenitor</groupId>
<artifactId>com.io7m.primogenitor.full</artifactId>
<version>7.6.0</version>
<version>8.0.0-beta0001</version>
</parent>

<groupId>com.io7m.hibiscus</groupId>
Expand Down Expand Up @@ -96,12 +96,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.7</version>
<version>1.4.8</version>
</dependency>
<dependency>
<groupId>com.io7m.lanark</groupId>
<artifactId>com.io7m.lanark.core</artifactId>
<version>1.0.0-beta0001</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.io7m.jdeferthrow</groupId>
Expand Down Expand Up @@ -133,14 +133,14 @@
<dependency>
<groupId>com.io7m.primogenitor</groupId>
<artifactId>com.io7m.primogenitor.support</artifactId>
<version>7.6.0</version>
<version>8.0.0-beta0001</version>
</dependency>

<!-- Test suite. -->
<dependency>
<groupId>com.io7m.quixote</groupId>
<artifactId>com.io7m.quixote.core</artifactId>
<version>0.0.2</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>net.jqwik</groupId>
Expand All @@ -162,10 +162,22 @@
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>

<!-- Mockito -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.3.1</version>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.5</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.5</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 4eec51f

Please sign in to comment.