Implemented Java module for bld.

Updated version to 2.1.0-SNAPSHOT. Updated RIFE2/core.
rife2 · Aug 6, 2024 · 7cd547f · 7cd547f
1 parent 7f8120e
commit 7cd547f
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 4 deletions.
diff --git a/core b/core
diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java
@@ -40,8 +40,7 @@ public BldBuild()
         var core_src_main_dir = new File(core_src_dir, "main");
 
         antlr4Operation
-            .sourceDirectories(List.of(new File(core_src_main_dir, "antlr")))
-            .outputDirectory(new File(buildDirectory(), "generated/rife/template/antlr"));
+            .sourceDirectories(List.of(new File(core_src_main_dir, "antlr")));
 
         var core_src_test_dir = new File(core_src_dir, "test");
         var core_src_test_java_dir = new File(core_src_test_dir, "java");
@@ -110,6 +109,14 @@ public BldBuild()
                 new PublishArtifact(zipBldOperation.destinationFile(), "", "zip"));
     }
 
+    @Override
+    public void javadoc()
+    throws Exception {
+        javadocOperation().executeOnce(() -> javadocOperation()
+            .fromProject(this)
+            .sourceFiles(FileUtils.getJavaFileList(buildGeneratedDir)));
+    }
+
     final ZipOperation zipBldOperation = new ZipOperation();
     @BuildCommand(value = "zip-bld", summary = "Creates the bld zip archive")
     public void zipBld()

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -0,0 +1,54 @@
+/**
+ * bld is a new build system that allows you to write your build logic in pure Java.
+ * <p>
+ * More information can be found on the <a href="https://rife2.com/bld">`bld` website</a>.
+ *
+ * @since 2.1.0
+ */
+module rife.bld {
+    requires java.compiler;
+    requires java.desktop;
+    requires java.logging;
+    requires java.net.http;
+    requires java.prefs;
+    requires static java.sql;
+    requires java.xml;
+
+    exports rife.bld;
+    exports rife.bld.blueprints;
+    exports rife.bld.dependencies;
+    exports rife.bld.dependencies.exceptions;
+    exports rife.bld.help;
+    exports rife.bld.operations;
+    exports rife.bld.operations.exceptions;
+    exports rife.bld.publish;
+
+    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/BLD_VERSION b/src/main/resources/BLD_VERSION
@@ -1 +1 @@
-2.0.1
+2.1.0-SNAPSHOT
+8 −0		.idea/bld.xml
+0 −1		.idea/libraries/runtime.xml
+2 −3		.idea/libraries/test.xml
+1 −1		.idea/modules.xml
+0 −0		.idea/rife.core.iml
+1 −1		.idea/runConfigurations/Run Tests.xml
+1 −1		README.md
+4 −10		src/bld/java/rife/AbstractRife2Build.java
+14 −2		src/bld/java/rife/CoreBuild.java
+10 −0		src/main/java/rife/cmf/transform/package-info.java
+36 −0		src/main/module/module-info.java
+1 −1		src/main/resources/CORE_VERSION