From 18fb00ef75954a89a1c9ddc1a84d8a07acd5a4bd Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 8 Apr 2023 09:48:26 -0400 Subject: [PATCH] Updated to released RIFE2 1.5.18 --- .idea/libraries/bld.xml | 4 +- .idea/runConfigurations/Run Main.xml | 9 ---- .vscode/settings.json | 2 +- lib/bld/bld-wrapper.jar | Bin 24397 -> 24388 bytes lib/bld/bld-wrapper.properties | 6 +-- .../java/rife/bld/extension/ArchiveBuild.java | 42 +++++++++--------- 6 files changed, 27 insertions(+), 36 deletions(-) delete mode 100644 .idea/runConfigurations/Run Main.xml diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index a15e294..1bc7dda 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/.idea/runConfigurations/Run Main.xml b/.idea/runConfigurations/Run Main.xml deleted file mode 100644 index b560bd0..0000000 --- a/.idea/runConfigurations/Run Main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index c2af365..e04f1cd 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.18-SNAPSHOT8.jar", + "${HOME}/.rife2/dist/rife2-1.5.18.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 1347d7498622396a3650708e925b0b3b042df721..931903122d2b430e2bcee6e0928cde4a46c28655 100644 GIT binary patch delta 178 zcmX@RkMYPpM&1B#W)=|!4h{|m75k2fymib#YGYru4v5~&qub2{X3WyJ(gZWEN1SB@ zGnPjgf~6+kj!{-*UF}*(76uMlt{Zyx=%A diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 2722ee6..a2a6ff6 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extensions= -bld.repositories=MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -rife2.downloadLocation=https://uwyn.com -rife2.version=1.5.18-SNAPSHOT8 +bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES +rife2.downloadLocation= +rife2.version=1.5.18 diff --git a/src/bld/java/rife/bld/extension/ArchiveBuild.java b/src/bld/java/rife/bld/extension/ArchiveBuild.java index 9f920e2..26d7ed6 100644 --- a/src/bld/java/rife/bld/extension/ArchiveBuild.java +++ b/src/bld/java/rife/bld/extension/ArchiveBuild.java @@ -15,16 +15,16 @@ public class ArchiveBuild extends Project { public ArchiveBuild() { pkg = "rife.bld.extension"; name = "Archive"; - version = version(0,1,0,"SNAPSHOT"); + version = version(0,2,0); archiveBaseName = "bld-archive"; javaRelease = 17; downloadSources = true; autoDownloadPurge = true; - repositories = List.of(MAVEN_CENTRAL, RIFE2_SNAPSHOTS, RIFE2_RELEASES); + repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1,5,18,"SNAPSHOT"))) + .include(dependency("com.uwyn.rife2", "rife2", version(1,5,18))) .include(dependency("org.apache.commons", "commons-compress", version(1,23,0))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2))) @@ -38,24 +38,24 @@ public class ArchiveBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshots") : repository("rife2-releases")) .info() - .groupId("com.uwyn.rife2") - .artifactId("bld-archive") - .description("bld extension for creating archives") - .url("https://github.com/rife2/bld-archive") - .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-archive.git") - .developerConnection("scm:git:git@github.com:rife2/bld-archive.git") - .url("https://github.com/rife2/bld-archive")) - .signKey(property("sign.key")) - .signPassphrase(property("sign.passphrase")); + .groupId("com.uwyn.rife2") + .artifactId("bld-archive") + .description("bld extension for creating archives") + .url("https://github.com/rife2/bld-archive") + .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-archive.git") + .developerConnection("scm:git:git@github.com:rife2/bld-archive.git") + .url("https://github.com/rife2/bld-archive")) + .signKey(property("sign.key")) + .signPassphrase(property("sign.passphrase")); } public static void main(String[] args) {