java modules v2

api/build.gradle

@@ -2,11 +2,11 @@
 dependencies {
   api libs.purefunCore
   api libs.jaxb
+  api libs.purejson
   implementation libs.purefunTypeclasses
   implementation libs.purefunMonad
   implementation libs.purefunEffect
   runtimeOnly libs.purefunInstances
-  implementation libs.purejson
   implementation libs.jsonPath
   testImplementation libs.equalsVerifier
 }

api/src/main/java/module-info.java

@@ -0,0 +1,13 @@
+module com.github.tonivade.zeromock.api {
+  exports com.github.tonivade.zeromock.api;
+
+  requires transitive com.github.tonivade.purefun;
+  requires transitive com.github.tonivade.purefun.core;
+  requires static com.github.tonivade.purefun.effect;
+  requires static com.github.tonivade.purefun.monad;
+  requires transitive com.github.tonivade.purefun.typeclasses;
+  requires transitive com.github.tonivade.purejson;
+  requires static jakarta.xml.bind;
+  requires transitive java.xml;
+  requires static json.path;
+}

build.gradle

@@ -72,6 +72,9 @@ allprojects {
   compileJava {
     options.compilerArgs << '-Xlint:unchecked'
     options.compilerArgs << '-Xlint:rawtypes'
+    options.compilerArgs << '-Xlint:module'
+    options.compilerArgs << '-Xlint:exports'
+    options.compilerArgs << '-Xlint:opens'
     options.release = 21
   }
 
@@ -120,6 +123,12 @@ subprojects {
     }
   }
 
+  javadoc {
+    modularity.inferModulePath = false
+
+    exclude "module-info.java"
+  }
+
   publishing {
     publications {
       mavenJava(MavenPublication) {

client/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
   api projects.zeromockApi
+  api libs.purejson
   implementation libs.purefunMonad
   implementation libs.purefunEffect
-  implementation libs.purejson
   runtimeOnly libs.purefunInstances
   testImplementation projects.zeromockServer
 }

client/src/main/java/module-info.java

@@ -0,0 +1,12 @@
+module com.github.tonivade.zeromock.client {
+  exports com.github.tonivade.zeromock.client;
+
+  requires transitive com.github.tonivade.purefun;
+  requires transitive com.github.tonivade.purefun.core;
+  requires static com.github.tonivade.purefun.effect;
+  requires static com.github.tonivade.purefun.monad;
+  requires transitive com.github.tonivade.purefun.typeclasses;
+  requires transitive com.github.tonivade.purejson;
+  requires transitive com.github.tonivade.zeromock.api;
+  requires transitive java.net.http;
+}

gradle.properties

@@ -1,2 +1,2 @@
-version=1.1-SNAPSHOT
+version=2.0-SNAPSHOT
 systemProp.sonar.gradle.skipCompile=true

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ junitVersion = "4.13.2"
 junitEngineVersion = "5.10.2"
 junitPlatformVersion = "1.10.2"
 equalsVerifierVersion = "3.16.1"
-purefunVersion = "5.0"
-purejsonVersion = "1.0"
+purefunVersion = "6.0-SNAPSHOT"
+purejsonVersion = "2.0-SNAPSHOT"
 jaxbVersion = "4.0.5"
 jsonPathVersion = "2.9.0"
 sonarVersion = "4.4.1.3373"

junit4/src/main/java/module-info.java

@@ -0,0 +1,13 @@
+module com.github.tonivade.zeromock.junit4 {
+  exports com.github.tonivade.zeromock.junit4;
+
+  requires transitive com.github.tonivade.purefun;
+  requires transitive com.github.tonivade.purefun.core;
+  requires com.github.tonivade.purefun.effect;
+  requires com.github.tonivade.purefun.monad;
+  requires transitive com.github.tonivade.purefun.typeclasses;
+  requires transitive com.github.tonivade.zeromock.api;
+  requires transitive com.github.tonivade.zeromock.client;
+  requires transitive com.github.tonivade.zeromock.server;
+  requires transitive junit;
+}

junit5/src/main/java/module-info.java

@@ -0,0 +1,16 @@
+module com.github.tonivade.zeromock.junit5 {
+  exports com.github.tonivade.zeromock.junit5;
+
+  requires transitive com.github.tonivade.purefun;
+  requires transitive com.github.tonivade.purefun.core;
+  requires com.github.tonivade.purefun.effect;
+  requires com.github.tonivade.purefun.monad;
+  requires transitive com.github.tonivade.purefun.typeclasses;
+  requires transitive com.github.tonivade.zeromock.api;
+  requires transitive com.github.tonivade.zeromock.client;
+  requires transitive com.github.tonivade.zeromock.server;
+  requires transitive jdk.httpserver;
+  requires transitive org.junit.jupiter.api;
+  requires transitive org.junit.platform.commons;
+  requires org.opentest4j;
+}

server/src/main/java/module-info.java

@@ -0,0 +1,14 @@
+module com.github.tonivade.zeromock.server {
+  exports com.github.tonivade.zeromock.server;
+
+  requires transitive com.github.tonivade.purefun;
+  requires transitive com.github.tonivade.purefun.core;
+  requires static com.github.tonivade.purefun.effect;
+  requires static com.github.tonivade.purefun.instances;
+  requires static com.github.tonivade.purefun.monad;
+  requires transitive com.github.tonivade.purefun.typeclasses;
+  requires transitive com.github.tonivade.zeromock.api;
+  requires transitive jakarta.xml.bind;
+  requires transitive jdk.httpserver;
+  requires transitive org.slf4j;
+}