diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 1bc7dda..e1e183f 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 2367299..7b9e757 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.jar", + "${HOME}/.rife2/dist/rife2-1.5.17.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 590d8d3..2ef270f 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 f3f2d72..2cad6dd 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:1.1.0 -bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES +bld.extensions=com.uwyn.rife2:bld-tests-badge:0.9.4 +bld.repositories=MAVEN_CENTRAL,RIFE2 rife2.downloadLocation= -rife2.version=1.5.18 +rife2.version=1.5.17 diff --git a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java index d117919..20c3723 100644 --- a/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java +++ b/src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java @@ -20,46 +20,41 @@ public class UrlEncoderBuild extends Project { pkg = "com.uwyn.urlencoder"; name = "UrlEncoder"; mainClass = "com.uwyn.urlencoder.UrlEncoder"; - version = version(1,3,3); + 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")); javaRelease = 11; downloadSources = true; autoDownloadPurge = true; - - repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); + repositories = List.of(MAVEN_CENTRAL, RIFE2); 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(); @@ -71,6 +66,15 @@ 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); }