Version 1.0.1

Bumped JUnit version to 5.11.3
Bumped PMD extension version to 1.1.7
Bumped JDK to version 23 (GitHub CI Workflow)

.github/workflows/bld.yml

@@ -2,17 +2,15 @@ name: bld-ci
 
 on: [ push, pull_request, workflow_dispatch ]
 
-env:
-  KOTLIN_HOME: /usr/share/kotlinc
-
 jobs:
   build-bld-project:
-    runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        java-version: [17, 21, 22]
-        kotlin-version: [ 1.19.24, 2.0.0 ]
+        java-version: [ 17, 21, 24 ]
+        kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout source repository
@@ -26,6 +24,14 @@ jobs:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
+      - name: Download dependencies [examples]
+        working-directory: examples
+        run: ./bld download
+
+      - name: Compile and run [examples]
+        working-directory: examples
+        run: ./bld compile run
+
       - name: Download dependencies
         run: ./bld download
 

.github/workflows/pages.yml

@@ -47,11 +47,11 @@ jobs:
         uses: actions/configure-pages@v3
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload generated Javadocs repository
           path: "build/javadoc/"
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.idea/copyright/Apache_License.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright 2023-Copyright &amp;#36;today.yearamp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="notice" value="Copyright 2023-&amp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="myName" value="Apache License" />
   </copyright>
 </component>

.idea/icon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 179 108" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-210.511,-96.3382)">
+        <g transform="matrix(1,0,0,1,-23.3386,-649.816)">
+            <g transform="matrix(0.221288,0,0,0.24,73.9536,390.254)">
+                <path d="M722.568,1482.92L722.568,1921.1L808.968,1921.1L808.968,1888.7C822.168,1907.9 846.168,1930.1 893.568,1930.1C933.168,1930.1 961.968,1917.5 985.368,1893.5C1012.97,1865.9 1027.37,1827.5 1027.37,1786.1C1027.37,1741.7 1011.17,1705.1 985.368,1680.5C961.968,1658.3 928.968,1644.5 892.368,1644.5C862.968,1644.5 830.568,1654.1 808.968,1683.5L808.968,1482.92L722.568,1482.92ZM871.368,1718.9C888.768,1718.9 903.768,1723.7 917.568,1736.9C930.168,1748.9 938.568,1766.3 938.568,1787.9C938.568,1807.7 930.168,1825.1 917.568,1837.1C904.368,1849.7 887.568,1855.7 872.568,1855.7C856.368,1855.7 837.168,1849.1 823.368,1835.9C813.168,1826.3 803.568,1810.1 803.568,1787.9C803.568,1765.1 812.568,1749.5 822.768,1738.7C836.568,1724.3 852.768,1718.9 871.368,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+                <rect x="1083.77" y="1482.92" width="86.4" height="438.182" style="fill:rgb(250,144,82);fill-rule:nonzero;"/>
+                <path d="M1531.37,1482.92L1444.97,1482.92L1444.97,1683.5C1423.37,1654.1 1390.97,1644.5 1361.57,1644.5C1324.97,1644.5 1291.97,1658.3 1268.57,1680.5C1242.77,1705.1 1226.57,1741.7 1226.57,1786.1C1226.57,1827.5 1240.97,1865.9 1268.57,1893.5C1291.97,1917.5 1320.77,1930.1 1360.37,1930.1C1407.77,1930.1 1431.77,1907.9 1444.97,1888.7L1444.97,1921.1L1531.37,1921.1L1531.37,1482.92ZM1382.57,1718.9C1401.17,1718.9 1417.37,1724.3 1431.17,1738.7C1441.37,1749.5 1450.37,1765.1 1450.37,1787.9C1450.37,1810.1 1440.77,1826.3 1430.57,1835.9C1416.77,1849.1 1397.57,1855.7 1381.37,1855.7C1366.37,1855.7 1349.57,1849.7 1336.37,1837.1C1323.77,1825.1 1315.37,1807.7 1315.37,1787.9C1315.37,1766.3 1323.77,1748.9 1336.37,1736.9C1350.17,1723.7 1365.17,1718.9 1382.57,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+            </g>
+        </g>
+    </g>
+</svg>

.idea/libraries/bld.xml

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

.vscode/settings.json

@@ -9,7 +9,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-2.1.0.jar",
+        "${HOME}/.bld/dist/bld-2.2.1.jar",
         "lib/**/*.jar"
     ]
 }

README.md

@@ -3,12 +3,20 @@
 
 [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-generated-version/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-generated-version)
 [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-generated-version/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-generated-version)
 [![GitHub CI](https://github.com/rife2/bld-generated-version/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-generated-version/actions/workflows/bld.yml)
 
-To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions).
+To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
+
+```properties
+bld.extension-generated-version=com.uwyn.rife2:bld-generated-version
+```
+
+For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
+
+## Generate Version Data Class
 
 To automatically create a generated version class using the default template in your project on compile, add the following to your build file:
 ```java

config/pmd.xml

@@ -7,9 +7,9 @@
     <!-- BEST PRACTICES -->
     <rule ref="category/java/bestpractices.xml">
         <exclude name="AvoidPrintStackTrace"/>
-        <exclude name="JUnit4TestShouldUseTestAnnotation"/>
-        <exclude name="JUnitTestContainsTooManyAsserts"/>
         <exclude name="GuardLogStatement"/>
+        <exclude name="UnitTestContainsTooManyAsserts"/>
+        <exclude name="UnitTestShouldUseTestAnnotation"/>
     </rule>
 
     <rule ref="category/java/bestpractices.xml/MissingOverride">

examples/.idea/libraries/bld.xml

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

examples/.vscode/settings.json

@@ -9,7 +9,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-2.1.0.jar",
+        "${HOME}/.bld/dist/bld-2.2.1.jar",
         "lib/**/*.jar"
     ]
 }

examples/lib/bld/bld-wrapper.properties

@@ -1,6 +1,6 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-gv=com.uwyn.rife2:bld-generated-version:0.9.9
+bld.extension-gv=com.uwyn.rife2:bld-generated-version:1.0.1
 bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
-bld.version=2.1.0
+bld.version=2.2.1

examples/src/bld/java/com/example/SampleBuild.java

@@ -27,8 +27,8 @@ public class SampleBuild extends Project {
 
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)));
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
     }
 
     public static void main(String[] args) {

examples/src/main/java/com/example/GeneratedVersion.java

@@ -12,7 +12,7 @@ import java.util.Date;
  */
 public final class GeneratedVersion {
     public static final String PROJECT = "Sample";
-    public static final Date BUILD_DATE = new Date(1725050914888L);
+    public static final Date BUILD_DATE = new Date(1736843939053L);
     public static final int MAJOR = 1;
     public static final int MINOR = 0;
     public static final int REVISION = 1;

lib/bld/bld-wrapper.properties

@@ -1,6 +1,6 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
-bld.version=2.1.0
+bld.version=2.2.1

src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public class GeneratedVersionOperationBuild extends Project {
     public GeneratedVersionOperationBuild() {
         pkg = "rife.bld.extension";
         name = "GeneratedVersionOperation";
-        version = version(0, 9, 9);
+        version = version(1, 0, 1);
 
         javaRelease = 17;
 
@@ -44,11 +44,11 @@ public class GeneratedVersionOperationBuild extends Project {
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
 
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
+                .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
+                .include(dependency("org.assertj", "assertj-core", version(3, 27, 3)));
 
         precompileOperation()
                 .templateTypes(TXT);
@@ -63,25 +63,23 @@ public class GeneratedVersionOperationBuild extends Project {
 
         publishOperation()
                 .repositories(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
+                .repository(repository("github"))
                 .info()
                 .groupId("com.uwyn.rife2")
                 .artifactId("bld-generated-version")
                 .description("bld Extension to Generate Project Version Data")
                 .url("https://github.com/rife2/generated-version")
-                .developer(
-                        new PublishDeveloper()
+                .developer(new PublishDeveloper()
                         .id("ethauvin")
                         .name("Erik C. Thauvin")
                         .email("erik@thauvin.net")
                         .url("https://erik.thauvin.net/")
                 )
-                .license(
-                        new PublishLicense()
+                .license(new PublishLicense()
                         .name("The Apache License, Version 2.0")
                         .url("https://www.apache.org/licenses/LICENSE-2.0.txt")
                 )
-                .scm(
-                        new PublishScm()
+                .scm(new PublishScm()
                         .connection("scm:git:https://github.com/rife2/generated-version.git")
                         .developerConnection("scm:git:git@github.com:rife2/generated-version.git")
                         .url("https://github.com/rife2/generated-version")

src/main/java/rife/bld/extension/GeneratedVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/rife/bld/extension/GeneratedVersionOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/java/rife/bld/extension/GeneratedVersionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package rife.bld.extension;
 
+import org.assertj.core.api.AutoCloseableSoftAssertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import rife.bld.BaseProject;
@@ -70,6 +71,30 @@ class GeneratedVersionTest {
         logger.setUseParentHandlers(false);
     }
 
+    /**
+     * Compares two strings by removing all line separators and whitespace.
+     *
+     * @param text1 The first text to compare
+     * @param text2 The second text to compare
+     * @return true if the texts are equivalent when line separators are ignored, false otherwise
+     */
+    static boolean compareTextIgnoringLineSeparators(String text1, String text2) {
+        // Handle null cases
+        if (text1 == null && text2 == null) {
+            return true;
+        }
+        if (text1 == null || text2 == null) {
+            return false;
+        }
+
+        // Remove all line separators and whitespace
+        var cleanedText1 = text1.replaceAll("\\r?\\n|\\r|\\s", "");
+        var cleanedText2 = text2.replaceAll("\\r?\\n|\\r|\\s", "");
+
+        // Compare the cleaned strings
+        return cleanedText1.equals(cleanedText2);
+    }
+
     static void deleteOnExit(File folder) {
         folder.deleteOnExit();
         for (var f : Objects.requireNonNull(folder.listFiles())) {
@@ -91,21 +116,22 @@ class GeneratedVersionTest {
         gv.setClassName("MyVersion");
 
         var t = gv.buildTemplate();
-        assertThat(t.getContent()).isEqualTo("""
-                package com.example.my;
-                
-                public final class MyVersion {
-                    public static final int PROJECT = "My App";
-                    public static final int MAJOR = 2;
-                    public static final int MINOR = 1;
-                    public static final int REVISION = 3;
-                    public static final String QUALIFIER = "";
-                
-                    private MyVersion() {
-                        // no-op
-                    }
-                }
-                """);
+        var v = gv.getProject().version();
+        assertThat(v).extracting("majorInt", "minorInt", "revisionInt").as("version")
+                .containsExactly(2, 1, 3);
+        assertThat(compareTextIgnoringLineSeparators(t.getContent(),
+                String.format("package %s;" +
+                              "public final class %s {" +
+                              "    public static final int PROJECT = \"%s\";" +
+                              "    public static final int MAJOR = %d;" +
+                              "    public static final int MINOR = %d;" +
+                              "    public static final int REVISION = %d;" +
+                              "    public static final String QUALIFIER = \"\";" +
+                              "    private MyVersion() {" +
+                              "        // no-op" +
+                              "    }" +
+                              "}", gv.getPackageName(), gv.getClassName(), gv.getProjectName(), v.majorInt(),
+                        v.minorInt(), v.revisionInt()))).as("template").isTrue();
     }
 
     @Test
@@ -116,9 +142,11 @@ class GeneratedVersionTest {
         var t = gv.buildTemplate();
         assertThat(t).isNotNull();
 
-        assertThat(gv.getProject()).isEqualTo(PROJECT);
-        assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg());
-        assertThat(gv.getProjectName()).isEqualTo(PROJECT.name());
+        try (var softly = new AutoCloseableSoftAssertions()) {
+            softly.assertThat(gv.getProject()).isEqualTo(PROJECT);
+            softly.assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg());
+            softly.assertThat(gv.getProjectName()).isEqualTo(PROJECT.name());
+        }
 
         assertThat(t.getContent()).contains("package com.example;").contains("class GeneratedVersion")
                 .contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1")
@@ -147,7 +175,7 @@ class GeneratedVersionTest {
         tmpDir.deleteOnExit();
 
         new GeneratedVersionOperation()
-                .fromProject(new BaseProjectBlueprint(new File("examples"), "com.example", "Example"))
+                .fromProject(new BaseProjectBlueprint(new File("examples"), "com.example", "Example", "Example"))
                 .directory(tmpDir.getAbsolutePath())
                 //.classTemplate(new File("examples", "my_app_version.txt"))
                 .classTemplate(new File("examples", "version.txt"))
@@ -201,13 +229,15 @@ class GeneratedVersionTest {
         gv.setDirectory(new File("build"));
         gv.setExtension(".java");
 
-        assertThat(gv.getProject()).as("project").isEqualTo(PROJECT);
-        assertThat(gv.getTemplate()).as("template").exists();
-        assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool");
-        assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App");
-        assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion");
-        assertThat(gv.getExtension()).as("extension").isEqualTo(".java");
-        assertThat(gv.getDirectory()).as("directory").isDirectory();
+        try (var softly = new AutoCloseableSoftAssertions()) {
+            softly.assertThat(gv.getProject()).as("project").isEqualTo(PROJECT);
+            softly.assertThat(gv.getTemplate()).as("template").exists();
+            softly.assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool");
+            softly.assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App");
+            softly.assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion");
+            softly.assertThat(gv.getExtension()).as("extension").isEqualTo(".java");
+            softly.assertThat(gv.getDirectory()).as("directory").isDirectory();
+        }
     }
 
     @Test