diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index f7e10f8..6dc0235 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -1,14 +1,16 @@
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, 23]
+ 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
@@ -22,8 +24,16 @@ jobs:
distribution: "zulu"
java-version: ${{ matrix.java-version }}
+ - name: Download dependencies [examples]
+ working-directory: examples
+ run: ./bld download
+
+ - name: Compile and run JaCoCo [examples]
+ working-directory: examples
+ run: ./bld compile jacoco
+
- name: Download dependencies
run: ./bld download
- name: Run tests
- run: ./bld compile test
+ run: ./bld compile test
\ No newline at end of file
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index bf43624..508f6a5 100644
--- a/.github/workflows/pages.yml
+++ b/.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
diff --git a/.idea/copyright/Apache_License.xml b/.idea/copyright/Apache_License.xml
index ade80da..4446c15 100644
--- a/.idea/copyright/Apache_License.xml
+++ b/.idea/copyright/Apache_License.xml
@@ -1,6 +1,6 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index 553c281..153a060 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
-
+
-
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a3f4fd0..ba429d0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,7 +9,7 @@
],
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
- "${HOME}/.bld/dist/bld-2.2.0.jar",
+ "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar"
]
}
diff --git a/README.md b/README.md
index c4ab957..fa7d3b7 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,20 @@
[](https://opensource.org/licenses/Apache-2.0)
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[](https://rife2.com/bld)
+[](https://rife2.com/bld)
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-jacoco-report)
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-jacoco-report)
[](https://github.com/rife2/bld-jacoco-report/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-jacoco=com.uwyn.rife2:bld-jacoco-report
+```
+
+For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
+
+## Generate Code Coverage Reports
To run the tests and generate the code coverage reports, add the floowing to your build file:
diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml
index 553c281..153a060 100644
--- a/examples/.idea/libraries/bld.xml
+++ b/examples/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
-
+
-
+
diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json
index a3f4fd0..ba429d0 100644
--- a/examples/.vscode/settings.json
+++ b/examples/.vscode/settings.json
@@ -9,7 +9,7 @@
],
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
- "${HOME}/.bld/dist/bld-2.2.0.jar",
+ "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar"
]
}
diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar
index fe35b33..b186992 100644
Binary files a/examples/lib/bld/bld-wrapper.jar and b/examples/lib/bld/bld-wrapper.jar differ
diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index ee02e52..736e12d 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.9
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.10
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
-bld.version=2.2.0
+bld.version=2.2.1
diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java
index 5c74ee9..4dd3a0b 100644
--- a/examples/src/bld/java/com/example/ExamplesBuild.java
+++ b/examples/src/bld/java/com/example/ExamplesBuild.java
@@ -25,8 +25,8 @@ public class ExamplesBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
scope(test)
- .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4)))
- .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)));
+ .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) {
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 9d0f7a4..cf19588 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 e0d4619..b8fd71b 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
-bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.4
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.10
+bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.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.2.0
+bld.version=2.2.1
diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
index c4eef32..54a64c4 100644
--- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-Copyright $today.yearamp;#36;today.year 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 JacocoReportOperationBuild extends Project {
public JacocoReportOperationBuild() {
pkg = "rife.bld.extension";
name = "JacocoReportOperation";
- version = version(0, 9, 9);
+ version = version(0, 9, 10);
javaRelease = 17;
@@ -43,14 +43,14 @@ public class JacocoReportOperationBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
- var jacocoVersion = new VersionNumber(0, 8, 12);
+ var jacocoVersion = new VersionNumber(0, 8, 13);
scope(compile)
.include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc"))
- .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0)));
+ .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
scope(test)
- .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4)))
- .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)))
- .include(dependency("org.assertj", "assertj-core", version(3, 27, 2)));
+ .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)));
javadocOperation()
.javadocOptions()
@@ -100,10 +100,13 @@ public class JacocoReportOperationBuild extends Project {
@Override
public void test() throws Exception {
- new ExecOperation()
- .fromProject(this)
- .command("scripts/cliargs.sh")
- .execute();
+ var os = System.getProperty("os.name");
+ if (os != null && os.toLowerCase().contains("linux")) {
+ new ExecOperation()
+ .fromProject(this)
+ .command("scripts/cliargs.sh")
+ .execute();
+ }
super.test();
}
}
diff --git a/src/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java
index 77866ea..3d8946e 100644
--- a/src/main/java/rife/bld/extension/JacocoReportOperation.java
+++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023-Copyright $today.yearamp;#36;today.year 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.
@@ -347,7 +347,7 @@ public class JacocoReportOperation extends AbstractOperation",
"--classfiles",