Updated to RIFE2 and bld 1.5.17

.idea/libraries/bld.xml

@@ -2,11 +2,11 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PDMPlugin">
+    <option name="skipTestSources" value="false" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build" />
+  </component>
+</project>

.vscode/settings.json

@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.16.jar",
+        "${HOME}/.rife2/dist/rife2-1.5.17.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"

README.md

@@ -21,7 +21,7 @@ private final CompileOperation compileOperation = new CompileOperation();
 @BuildCommand(summary = "Generates the grammar Java sources")
 public void generateGrammar()
 throws Exception {
-    antlr4Operation.executeOnce(o -> o
+    antlr4Operation.executeOnce(() -> antlr4Operation
         .sourceDirectories(List.of(new File(srcMainDirectory(), "antlr")))
         .outputDirectory(new File(buildDirectory(), "generated"))
         // these options are specific to ANTLR4, please refer to the extension
@@ -36,7 +36,7 @@ throws Exception {
     generateGrammar();
 
     // include the generated grammar with the main sources
-    compileOperation.executeOnce(o -> o
+    compileOperation.executeOnce(() -> compileOperation
         .fromProject(this)
         .mainSourceDirectories(List.of(antlr4Operation.outputDirectory())));
 }

lib/bld/bld-wrapper.properties

@@ -3,4 +3,4 @@ bld.downloadExtensionSources=true
 bld.extensions=
 bld.repositories=MAVEN_CENTRAL
 rife2.downloadLocation=
-rife2.version=1.5.16
+rife2.version=1.5.17

src/bld/java/rife/bld/extension/Antlr4Build.java

@@ -5,7 +5,10 @@
 package rife.bld.extension;
 
 import rife.bld.Project;
+import rife.bld.publish.PublishDeveloper;
 import rife.bld.publish.PublishInfo;
+import rife.bld.publish.PublishLicense;
+import rife.bld.publish.PublishScm;
 
 import java.io.File;
 import java.util.List;
@@ -18,14 +21,29 @@ public class Antlr4Build extends Project {
     public Antlr4Build() {
         pkg = "rife.bld.extension";
         name = "Antlr4";
-        version = version(0,9,5);
+        version = version(0,9,6);
         javadocOptions
             .docLint(NO_MISSING)
             .link("https://rife2.github.io/rife2/");
-        publishRepository = repository("rife2");
+
+        publishRepository = version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases");
         publishInfo = new PublishInfo()
             .groupId("com.uwyn.rife2")
             .artifactId("bld-antlr4")
+            .description("bld extension for generating ANTLR4 grammars")
+            .url("https://github.com/rife2/bld-antlr4")
+            .developer(new PublishDeveloper()
+                .id("gbevin")
+                .name("Geert Bevin")
+                .email("gbevin@uwyn.com")
+                .url("https://github.com/gbevin"))
+            .license(new PublishLicense()
+                .name("The Apache License, Version 2.0")
+                .url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
+            .scm(new PublishScm()
+                .connection("scm:git:https://github.com/rife2/bld-antlr4.git")
+                .developerConnection("scm:git:git@github.com:rife2/bld-antlr4.git")
+                .url("https://github.com/rife2/bld-antlr4"))
             .signKey(property("sign.key"))
             .signPassphrase(property("sign.passphrase"));
 
@@ -34,7 +52,7 @@ public class Antlr4Build extends Project {
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_CENTRAL,RIFE2);
         scope(compile)
-            .include(dependency("com.uwyn.rife2", "rife2", version(1,5,16)))
+            .include(dependency("com.uwyn.rife2", "rife2", version(1,5,17)))
             .include(dependency("org.antlr", "antlr4", version(4,11,1)));
         scope(test)
             .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2)))