From 7e63bbd663cca7ab61bf305ab96440011711925e Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Tue, 4 Apr 2023 17:35:06 -0400 Subject: [PATCH] Updated to RIFE2 and bld 1.5.17 --- .idea/libraries/bld.xml | 4 +-- .idea/misc.xml | 9 +++++++ .vscode/settings.json | 2 +- README.md | 4 +-- lib/bld/bld-wrapper.jar | Bin 24362 -> 24362 bytes lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/Antlr4Build.java | 24 +++++++++++++++--- 7 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 .idea/misc.xml diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 0f59db6..e1e183f 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..c8b6c65 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 2aea7f2..8a2a643 100644 --- a/.vscode/settings.json +++ b/.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" diff --git a/README.md b/README.md index 1232205..23ee8b8 100644 --- a/README.md +++ b/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()))); } diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 8f4b9092792f7a3d59f499c47864b1a00cb7dbfc..a83cca00c0f6ea6747cc07b725d4369e99b5299a 100644 GIT binary patch delta 166 zcmZ3rk8#yLM&1B#W)=|!4h{|mfu5F$ymib#YGYrj4v60TO{bd)%xKX!(*!g2Mx12? zGkT*8!BUeC#waVYGX!|Eb8x9%?&e@%U|<8{0B=Sn5eB%ylUZY(LE0vJ$9jV4>9HYT b`dzFmm^O=xgNVoZa{$$afy|oxF3tu3+cYvi delta 166 zcmZ3rk8#yLM&1B#W)=|!4h{~67u%XA^42i}sf~T9Iv{%UH=S-KFr!7^OcTu58*!Eq z%;=3W1WQdm7^AGn%n;zs&M`;y${!8}1_m}D4)A7V5@CQFJef7t8KiBpcdRFvo*o+l brr*W7f@!n3IEZ+hKL=1<7|5*2@8WC#lyE{Z diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 7ed7845..c252da3 100644 --- a/lib/bld/bld-wrapper.properties +++ b/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 diff --git a/src/bld/java/rife/bld/extension/Antlr4Build.java b/src/bld/java/rife/bld/extension/Antlr4Build.java index 16a57b8..a3ec385 100644 --- a/src/bld/java/rife/bld/extension/Antlr4Build.java +++ b/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)))