diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index e1e183f..1bc7dda 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 7b9e757..2367299 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.17.jar", + "${HOME}/.rife2/dist/rife2-1.5.18.jar", "lib/bld/*.jar", "lib/compile/*.jar", "lib/runtime/*.jar", diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 2ef270f..590d8d3 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 2cad6dd..04ac087 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=com.uwyn.rife2:bld-tests-badge:0.9.4 -bld.repositories=MAVEN_CENTRAL,RIFE2 +bld.extensions=com.uwyn.rife2:bld-tests-badge:1.0.0 +bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES rife2.downloadLocation= -rife2.version=1.5.17 +rife2.version=1.5.18 diff --git a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java index 20c3723..d117919 100644 --- a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java +++ b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java @@ -20,41 +20,46 @@ public class UrlEncoderBuild extends Project { pkg = "com.uwyn.urlencoder"; name = "UrlEncoder"; mainClass = "com.uwyn.urlencoder.UrlEncoder"; - version = version(1,3,2); - - publishRepository = version.isSnapshot() ? repository("sonatype-snapshots") : repository("sonatype-releases"); - publishInfo = new PublishInfo() - .groupId("com.uwyn") - .artifactId("urlencoder") - .description("A simple defensive library to encode/decode URL components.") - .url("https://github.com/rife2/tests-badge") - .developer(new PublishDeveloper() - .id("gbevin") - .name("Geert Bevin") - .email("gbevin@uwyn.com") - .url("https://github.com/gbevin")) - .developer(new PublishDeveloper() - .id("ethauvin") - .name("Erik C. Thauvin") - .email("erik@thauvin.net") - .url("https://erik.thauvin.net/")) - .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/gbevin/urlencoder.git") - .developerConnection("scm:git:git@github.com:gbevin/urlencoder.git") - .url("https://github.com/gbevin/urlencoder")) - .signKey(property("sign.key")) - .signPassphrase(property("sign.passphrase")); + version = version(1,3,3); javaRelease = 11; downloadSources = true; autoDownloadPurge = true; - repositories = List.of(MAVEN_CENTRAL, RIFE2); + + repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); 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))); + + jarOperation() + .manifestAttribute(Attributes.Name.MAIN_CLASS, mainClass()); + + publishOperation() + .repository(version.isSnapshot() ? repository("sonatype-snapshots") : repository("sonatype-releases")) + .info() + .groupId("com.uwyn") + .artifactId("urlencoder") + .description("A simple defensive library to encode/decode URL components.") + .url("https://github.com/rife2/tests-badge") + .developer(new PublishDeveloper() + .id("gbevin") + .name("Geert Bevin") + .email("gbevin@uwyn.com") + .url("https://github.com/gbevin")) + .developer(new PublishDeveloper() + .id("ethauvin") + .name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/")) + .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/gbevin/urlencoder.git") + .developerConnection("scm:git:git@github.com:gbevin/urlencoder.git") + .url("https://github.com/gbevin/urlencoder")) + .signKey(property("sign.key")) + .signPassphrase(property("sign.passphrase")); } private final TestsBadgeOperation testsBadgeOperation = new TestsBadgeOperation(); @@ -66,15 +71,6 @@ public class UrlEncoderBuild extends Project { .fromProject(this)); } - private final JarOperation jarOperation = new JarOperation(); - public void jar() - throws Exception { - compile(); - jarOperation.executeOnce(() -> jarOperation - .fromProject(this) - .manifestAttributes(Map.of(Attributes.Name.MAIN_CLASS, mainClass()))); - } - public static void main(String[] args) { new UrlEncoderBuild().start(args); }