Bumped bld to version 2.0.0-SNAPSHOT

rife2 · Jul 23, 2024 · 1ebc093 · 1ebc093
1 parent 0cb08be
commit 1ebc093
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
@@ -1,14 +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, 22]
+        java-version: [ 17, 21, 22 ]
 
     steps:
       - name: Checkout source repository
@@ -22,11 +22,8 @@ jobs:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Grant execute permission for bld
-        run: chmod +x bld
-
-      - name: Download the dependencies
+      - name: Download dependencies
         run: ./bld download
 
-      - name: Run tests with bld
+      - name: Run tests
         run: ./bld compile test
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,7 +9,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.9.1.jar",
+        "${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar",
         "lib/**/*.jar"
     ]
 }
diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml
diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json
@@ -10,7 +10,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.9.1.jar",
+        "${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar",
         "lib/**/*.jar"
     ]
 }
diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar
diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
@@ -1,8 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.7-SNAPSHOT
 bld.extension-testng=com.uwyn.rife2:bld-testng:0.9.9-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=1.9.1
+bld.version=2.0.0-SNAPSHOT
diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java
@@ -54,7 +54,7 @@ public static void main(String[] args) {
     }
 
     @BuildCommand(summary = "Generates Jacoco Reports")
-    public void jacoco() throws IOException {
+    public void jacoco() throws Exception {
         new JacocoReportOperation()
                 .fromProject(this)
                 .execute();

diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
@@ -5,4 +5,4 @@ bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.1
 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.2
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
-bld.version=1.9.1
+bld.version=2.0.0-SNAPSHOT
diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
@@ -25,7 +25,9 @@
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Repository.MAVEN_LOCAL;
 import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
+import static rife.bld.dependencies.Repository.RIFE2_SNAPSHOTS;
 import static rife.bld.dependencies.Scope.compile;
 import static rife.bld.dependencies.Scope.test;
 import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@@ -40,18 +42,18 @@ public TestNgOperationBuild() {
 
         downloadSources = true;
         autoDownloadPurge = true;
-        repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
+        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
 
-        var rife2 = version(1, 7, 3);
+        var rife2 = version(1, 8, 0);
         scope(compile)
                 .include(dependency("com.uwyn.rife2", "rife2", rife2))
-                .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1)));
+                .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 0, "SNAPSHOT")));
 
         scope(test)
                 .include(dependency("org.testng", "testng", version(7, 10, 2)))
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3)))
-                .include(dependency("org.assertj", "assertj-core", version(3, 26, 0)));
+                .include(dependency("org.assertj", "assertj-core", version(3, 26, 3)));
 
         javadocOperation()
                 .javadocOptions()

diff --git a/src/main/java/rife/bld/extension/TestNgOperation.java b/src/main/java/rife/bld/extension/TestNgOperation.java
@@ -165,6 +165,7 @@ public void execute() throws IOException, InterruptedException, ExitStatusExcept
      * @return the command list
      */
     @Override
+    @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
     protected List<String> executeConstructProcessCommandList() {
         final List<String> args = new ArrayList<>();