Updated to bld 1.8.0

Updated version to 1.3.5

.idea/libraries/bld.xml

@@ -2,11 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17-sources.jar!/" />
+      <root url="file://$PROJECT_DIR$/lib/bld" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/libraries/compile.xml

@@ -2,12 +2,16 @@
   <library name="compile">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
   </library>
 </component>

.idea/libraries/test.xml

@@ -2,12 +2,17 @@
   <library name="test">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
+      <root url="file://$PROJECT_DIR$/src/test/resources" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
+      <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
   </library>
 </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />

.vscode/settings.json

@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.17.jar",
+        "${HOME}bld-1.7.0.jar",
         "lib/bld/*.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",

README.md

@@ -11,7 +11,7 @@
 A simple defensive library to encode/decode URL components.
 
 This library was extracted from the [RIFE2 Web Application Framework](https://rife2.com).  
-A Kotlin version can also be found at [https://github.com/ethauvin/urlencoder](https://github.com/ethauvin/urlencoder).
+A Kotlin Multiplatform version can also be found at [https://github.com/ethauvin/urlencoder](https://github.com/ethauvin/urlencoder).
 
 The rules are determined by combining the unreserved character set from
 [RFC 3986](https://www.rfc-editor.org/rfc/rfc3986#page-13) with the

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.extensions=com.uwyn.rife2:bld-tests-badge:1.4.6
-bld.repositories=MAVEN_CENTRAL,RIFE2
+bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
-rife2.downloadLocation=
+bld.downloadLocation=
-rife2.version=1.5.17
+bld.version=1.8.0

src/bld/java/com/uwyn/urlencoder/UrlEncoderBuild.java

@@ -2,12 +2,14 @@ package com.uwyn.urlencoder;
 
 import rife.bld.Project;
 import rife.bld.extension.TestsBadgeOperation;
+import rife.bld.operations.JarOperation;
 import rife.bld.publish.PublishDeveloper;
 import rife.bld.publish.PublishInfo;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
 import java.util.List;
+import java.util.jar.Attributes;
 
 import static rife.bld.dependencies.Repository.*;
 import static rife.bld.dependencies.Scope.*;
@@ -17,45 +19,49 @@ public class UrlEncoderBuild extends Project {
         pkg = "com.uwyn.urlencoder";
         name = "UrlEncoder";
         mainClass = "com.uwyn.urlencoder.UrlEncoder";
-        version = version(1,3,1);
+        version = version(1,3,5);
-
-        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);
+
+        repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
         scope(test)
-            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,2)))
+            .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,1)))
-            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,2)));
+            .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,1)));
+
+        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();
-
     public void test()
     throws Exception {
         testsBadgeOperation.executeOnce(() -> testsBadgeOperation

src/main/java/module-info.java

@@ -0,0 +1,3 @@
+module com.uwyn.urlencoder {
+    exports com.uwyn.urlencoder;
+}