Implemented Java module for RIFE2/core.

Updated version to 1.9.0-SNAPSHOT.
rife2 · Aug 6, 2024 · 2f19152 · 2f19152
1 parent c9fff24
commit 2f19152
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 17 deletions.
diff --git a/.idea/bld.xml b/.idea/bld.xml
diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml
diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/framework.iml → .idea/rife.core.iml b/.idea/framework.iml → .idea/rife.core.iml
diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml
diff --git a/src/bld/java/rife/AbstractRife2Build.java b/src/bld/java/rife/AbstractRife2Build.java
@@ -64,15 +64,6 @@ public AbstractRife2Build()
             "test.h2");
 
         javadocOperation()
-            .excluded(
-                "rife/antlr/",
-                "rife/asm/",
-                "rife/.*/databasedrivers/",
-                "rife/.*/imagestoredrivers/",
-                "rife/.*/rawstoredrivers/",
-                "rife/.*/textstoredrivers/",
-                "rife/database/capabilities/"
-            )
             .javadocOptions()
                 .docLint(NO_MISSING)
                 .keywords()

diff --git a/src/bld/java/rife/CoreBuild.java b/src/bld/java/rife/CoreBuild.java
@@ -21,15 +21,18 @@ public CoreBuild()
 
         version = VersionNumber.parse(FileUtils.readString(new File(srcMainResourcesDirectory(), "CORE_VERSION")));
 
+        buildGeneratedDir = new File(buildDirectory(), "generated");
         antlr4Operation
             .sourceDirectories(List.of(new File(srcMainDirectory(), "antlr")))
-            .outputDirectory(new File(buildDirectory(), "generated/rife/template/antlr"));
+            .outputDirectory(new File(buildGeneratedDir, "rife/template/antlr"));
 
         precompileOperation()
             .templateTypes(HTML, XML, SQL);
 
+        srcMainModuleDir = new File(srcMainDirectory(), "module");
         compileOperation()
             .mainSourceDirectories(antlr4Operation.outputDirectory())
+            .mainSourceDirectories(srcMainModuleDir)
             .compileOptions()
                 .debuggingInfo(JavacOptions.DebuggingInfo.ALL)
                 .addAll(List.of("-encoding", "UTF-8"));
@@ -64,6 +67,18 @@ public CoreBuild()
                 .signPassphrase(property("sign.passphrase")));
     }
 
+    private final File buildGeneratedDir;
+    private final File srcMainModuleDir;
+
+    @Override
+    public void javadoc()
+    throws Exception {
+        javadocOperation().executeOnce(() -> javadocOperation()
+            .fromProject(this)
+            .sourceFiles(FileUtils.getJavaFileList(srcMainModuleDir))
+            .sourceFiles(FileUtils.getJavaFileList(buildGeneratedDir)));
+    }
+
     public static void main(String[] args)
     throws Exception {
         new CoreBuild().start(args);

diff --git a/src/main/module/module-info.java b/src/main/module/module-info.java
@@ -0,0 +1,36 @@
+module rife.core {
+    requires java.desktop;
+    requires java.logging;
+    requires java.prefs;
+    requires static java.sql;
+    requires java.xml;
+
+    exports rife;
+    exports rife.cmf;
+    exports rife.cmf.transform;
+    exports rife.config;
+    exports rife.config.exceptions;
+    exports rife.database;
+    exports rife.database.exceptions;
+    exports rife.database.queries;
+    exports rife.database.querymanagers.generic;
+    exports rife.database.querymanagers.generic.exceptions;
+    exports rife.database.types;
+    exports rife.datastructures;
+    exports rife.engine;
+    exports rife.forms;
+    exports rife.ioc;
+    exports rife.ioc.exceptions;
+    exports rife.resources;
+    exports rife.resources.exceptions;
+    exports rife.selector;
+    exports rife.template;
+    exports rife.template.exceptions;
+    exports rife.tools;
+    exports rife.tools.exceptions;
+    exports rife.validation;
+    exports rife.validation.annotations;
+    exports rife.validation.exceptions;
+    exports rife.xml;
+    exports rife.xml.exceptions;
+}
diff --git a/src/main/resources/CORE_VERSION b/src/main/resources/CORE_VERSION
@@ -1 +1 @@
-1.8.3
+1.9.0-SNAPSHOT