From ed2f93ee9a784f388a10c355410ddd691af19769 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 2 Apr 2023 23:58:45 -0400 Subject: [PATCH] Updated to RIFE2 1.5.15 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- lib/bld/bld-wrapper.jar | Bin 24013 -> 24361 bytes lib/bld/bld-wrapper.properties | 9 ++++---- .../java/rife/bld/extension/Antlr4Build.java | 20 ++++++++++++------ 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 657c6e2..77834d8 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 44ad385..c5b0e3b 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.11.jar", + "${HOME}/.rife2/dist/rife2-1.5.15.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 013d716f985abaa6831ce22cf47edb5d2580b276..c7a2e8fee27d3ca6749815a4f378357eb4856864 100644 GIT binary patch delta 11619 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 UF)mb_QF@IrDcrpg#DC8J0hZ#XbN~PV delta 11395 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 LPya^`0rCF;ohJRQ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 1e9bd89..197b8ef 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,5 +1,6 @@ -#Fri Mar 31 21:16:42 EDT 2023 -bld.extension= -bld.repositories=https\://repo1.maven.org/maven2/ +bld.downloadExtensionJavadoc=false +bld.downloadExtensionSources=true +bld.extensions= +bld.repositories=https://repo1.maven.org/maven2/ rife2.downloadLocation= -rife2.version=1.5.11 +rife2.version=1.5.15 diff --git a/src/bld/java/rife/bld/extension/Antlr4Build.java b/src/bld/java/rife/bld/extension/Antlr4Build.java index 0711b2f..0b39823 100644 --- a/src/bld/java/rife/bld/extension/Antlr4Build.java +++ b/src/bld/java/rife/bld/extension/Antlr4Build.java @@ -12,21 +12,27 @@ import java.util.List; import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.*; +import static rife.bld.operations.JavadocOptions.DocLinkOption.*; public class Antlr4Build extends Project { public Antlr4Build() { pkg = "rife.bld.extension"; name = "Antlr4"; - version = version(0,9,0); - javadocOptions.add("-Xdoclint:-missing"); - publishRepository = MAVEN_LOCAL; - publishInfo = new PublishInfo().groupId("com.uwyn.rife2").artifactId("bld-antlr4"); + version = version(0,9,2); + javadocOptions.docLint(NO_MISSING); + publishRepository = repository("rife2"); + publishInfo = new PublishInfo() + .groupId("com.uwyn.rife2") + .artifactId("bld-antlr4") + .signKey(properties().getValueString("sign.key")) + .signPassphrase(properties().getValueString("sign.passphrase")); + javaRelease = 17; downloadSources = true; - repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); + repositories = List.of(MAVEN_CENTRAL,RIFE2); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1,5,11))) - .include(dependency("org.antlr", "antlr4", version(4,12,0))); + .include(dependency("com.uwyn.rife2", "rife2", version(1,5,15))) + .include(dependency("org.antlr", "antlr4", version(4,11,1))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,2)));