.github/workflows/bld.yml

@@ -1,16 +1,14 @@
 name: bld-ci
 
-on: [ push, pull_request, workflow_dispatch ]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build-bld-project:
+    runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        java-version: [ 17, 21, 24 ]
+        java-version: [17, 21, 23]
-        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
@@ -24,14 +22,6 @@ jobs:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Download dependencies [examples]
-        working-directory: examples
-        run: ./bld download
-
-      - name: Run PIT tests [examples]
-        working-directory: examples
-        run: ./bld compile pit
-
       - 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@v3
+        uses: actions/upload-pages-artifact@v1
         with:
           # Upload generated Javadocs repository
           path: "build/javadoc/"
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v1

.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.2.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-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.2.1.jar",
+        "${HOME}/.bld/dist/bld-2.2.0.jar",
         "lib/**/*.jar"
     ]
 }

README.md

@@ -2,20 +2,12 @@
 
 [![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.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/2.2.0-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-pitest/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pitest)
 [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pitest/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pitest)
 [![GitHub CI](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml)
 
-To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
+To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions).
-
-```properties
-bld.extension-pitest=com.uwyn.rife2:bld-pitest
-```
-
-For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
-
-## Mutation Testing with PIT
 
 To run mutation tests and coverage, add the following to your build file:
 
@@ -48,8 +40,8 @@ Don't forget to add the Pitest `test` dependencies to your build file, as they a
 ```java
 repositories = List.of(MAVEN_CENTRAL);
 scope(test)
-    .include(dependency("org.pitest", "pitest", version(1, 19, 1)))
+    .include(dependency("org.pitest", "pitest", version(1, 17, 4)))
     .include(dependency("org.pitest", "pitest-command-line", version(1, 17, 4)))
-    .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
+    .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1)))
     .include(dependency("org.pitest", "pitest-testng-plugin", version(1, 0, 0)));
 ```

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.2.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-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.2.1.jar",
+        "${HOME}/.bld/dist/bld-2.2.0.jar",
         "lib/**/*.jar"
     ]
 }

examples/lib/bld/bld-wrapper.properties

@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-pitest=com.uwyn.rife2:bld-pitest:1.0.10
+bld.extension-pitest=com.uwyn.rife2:bld-pitest:1.0.7
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS
 bld.sourceDirectories=
-bld.version=2.2.1
+bld.version=2.2.0

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

@@ -7,9 +7,6 @@ import rife.tools.FileUtils;
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static rife.bld.dependencies.Scope.test;
 
@@ -29,26 +26,16 @@ public class ExamplesBuild extends Project {
 
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
 
-        var pitest = version(1, 19, 1);
+        var pitest = version(1, 17, 4);
         scope(test)
                 .include(dependency("org.pitest", "pitest", pitest))
                 .include(dependency("org.pitest", "pitest-command-line", pitest))
-                .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
+                .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)));
     }
 
     public static void main(String[] args) {
-        // Enable detailed logging for the extensions
-        var level = Level.ALL;
-        var logger = Logger.getLogger("rife.bld.extension");
-        var consoleHandler = new ConsoleHandler();
-
-        consoleHandler.setLevel(level);
-        logger.addHandler(consoleHandler);
-        logger.setLevel(level);
-        logger.setUseParentHandlers(false);
-
         new ExamplesBuild().start(args);
     }
 

lib/bld/bld-wrapper.properties

@@ -1,8 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5
+bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.4
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.10
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=2.2.1
+bld.version=2.2.0

src/bld/java/rife/bld/extension/PitestOperationBuild.java

@@ -38,7 +38,7 @@ public class PitestOperationBuild extends Project {
     public PitestOperationBuild() {
         pkg = "rife.bld.extension";
         name = "PitestExtension";
-        version = version(1, 0, 11, "SNAPSHOT");
+        version = version(1, 0, 7);
 
         javaRelease = 17;
 
@@ -47,16 +47,16 @@ public class PitestOperationBuild extends Project {
 
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
 
-        var pitest = version(1, 19, 1);
+        var pitest = version(1, 17, 4);
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
+                .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0)));
         scope(test)
                 .include(dependency("org.pitest", "pitest", pitest))
                 .include(dependency("org.pitest", "pitest-command-line", pitest))
-                .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
+                .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 27, 3)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 27, 2)));
 
         javadocOperation()
                 .javadocOptions()
@@ -108,13 +108,10 @@ public class PitestOperationBuild extends Project {
 
     @Override
     public void test() throws Exception {
-        var os = System.getProperty("os.name");
+        new ExecOperation()
-        if (os != null && os.toLowerCase().contains("linux")) {
+                .fromProject(this)
-            new ExecOperation()
+                .command("scripts/cliargs.sh")
-                    .fromProject(this)
+                .execute();
-                    .command("scripts/cliargs.sh")
-                    .execute();
-        }
         super.test();
     }
 }

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

@@ -109,19 +109,6 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
         return avoidCallsTo(List.of(avoidCallTo));
     }
 
-    private String buildClassPath(String... path) {
-        var classpath = new StringBuilder();
-        for (var p : path) {
-            if (!p.isBlank()) {
-                if (!classpath.isEmpty()) {
-                    classpath.append(File.pathSeparator);
-                }
-                classpath.append(p);
-            }
-        }
-        return classpath.toString();
-    }
-
     /**
      * List of packages and classes which are to be considered outside the scope of mutation. Any lines of code
      * containing calls to these classes will not be mutated.
@@ -445,10 +432,9 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
         if (project_ != null) {
             args.add(javaTool());
             args.add("-cp");
-            args.add(buildClassPath(joinClasspathJar(project_.testClasspathJars()),
+            args.add(String.format("%s:%s:%s:%s", new File(project_.libTestDirectory(), "*"),
-                    joinClasspathJar(project_.compileClasspathJars()),
+                    new File(project_.libCompileDirectory(), "*"), project_.buildMainDirectory(),
-                    joinClasspathJar(project_.providedClasspathJars()),
+                    project_.buildTestDirectory()));
-                    project_.buildMainDirectory().getAbsolutePath(), project_.buildTestDirectory().getAbsolutePath()));
             args.add("org.pitest.mutationtest.commandline.MutationCoverageReport");
 
             if (!options_.containsKey(SOURCE_DIRS)) {
@@ -463,10 +449,6 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
             });
         }
 
-        if (LOGGER.isLoggable(Level.FINE)) {
-            LOGGER.fine(String.join(" ", args));
-        }
-
         return args;
     }
 
@@ -700,14 +682,6 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
         return s != null && !s.isBlank();
     }
 
-    private String joinClasspathJar(List<File> jars) {
-        if (!jars.isEmpty()) {
-            return String.join(File.pathSeparator, jars.stream().map(File::getAbsolutePath).toList());
-        } else {
-            return "";
-        }
-    }
-
     /**
      * Argument string to use when PIT launches child processes. This is most commonly used to increase the amount of
      * memory available to the process, but may be used to pass any valid JVM argument.

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

@@ -18,8 +18,6 @@ package rife.bld.extension;
 
 import org.assertj.core.api.AutoCloseableSoftAssertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 import rife.bld.BaseProject;
 import rife.bld.Project;
 import rife.bld.WebProject;
@@ -66,7 +64,6 @@ class PitestOperationTest {
     }
 
     @Test
-    @EnabledOnOs(OS.LINUX)
     void checkAllParameters() throws IOException {
         var args = Files.readAllLines(Paths.get("src", "test", "resources", "pitest-args.txt"));