From 429852371f6711f8646cfc13c086b530a97d2bbe Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 29 Jul 2024 17:30:00 -0700 Subject: [PATCH] Bumped bld to version 2.0.1 --- .github/workflows/bld.yml | 16 ++++------- .github/workflows/pages.yml | 12 ++++---- .github/workflows/publish.yml | 19 ++++++------ .idea/bld.xml | 6 ++++ .idea/libraries/bld.xml | 4 +-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 29577 bytes lib/bld/bld-wrapper.properties | 8 +++--- .../rife/render/TemplateRenderersBuild.java | 27 +++++++++--------- 10 files changed, 47 insertions(+), 49 deletions(-) create mode 100644 .idea/bld.xml diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 5b1de3b..b8d797d 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,6 +1,6 @@ name: bld-ci -on: [push, pull_request, workflow_dispatch] +on: [ push, pull_request, workflow_dispatch ] jobs: build-bld-project: @@ -8,29 +8,25 @@ jobs: strategy: matrix: - java-version: [17, 21, 22] + java-version: [ 17, 21, 22 ] steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: 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 -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/rife2-renderers -DtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }} - diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 0236ccd..bf43624 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -3,7 +3,7 @@ name: javadocs-pages on: # Runs on pushes targeting the default branch push: - branches: [ "master" ] + branches: ["master"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -30,14 +30,14 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: "zulu" java-version: 17 - name: Build Javadocs @@ -50,8 +50,8 @@ jobs: uses: actions/upload-pages-artifact@v1 with: # Upload generated Javadocs repository - path: 'build/javadoc/' + path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b8dbc52..1a64ef3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish to the Maven Central/Rife2 on: workflow_dispatch: release: - types: [ released ] + types: [released] jobs: build-bld-project: @@ -11,26 +11,23 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'temurin' + distribution: "temurin" java-version: 17 - - name: Grant execute permission for bld - run: chmod +x bld - - - name: Download the dependencies + - name: Download dependencies run: ./bld download - name: Import key run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import - - - name: Publish with bld + + - name: Publish run: >- ./bld compile test publish -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/rife2-renderers @@ -41,6 +38,6 @@ jobs: -DsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -DsignKey=${{ secrets.SIGN_KEY }} -DsignPassphrase=${{ secrets.SIGN_PASSPHRASE }} - + - name: Delete GnuPG data run: rm -rfv $HOME/.gnupg diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 0b615c1..4dd96bf 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 9e8368e..5b2667b 100644 --- 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.0.jar", + "${HOME}/.bld/dist/bld-2.0.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 54d287d..86f3cfd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![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/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/rife2/rife2-template-renderers)](https://github.com/rife2/rife2-template-renderers/releases/latest) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/rife2-renderers/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/rife2-renderers) [![Maven Central](https://img.shields.io/maven-central/v/com.uwyn.rife2/rife2-renderers)](https://central.sonatype.com/artifact/com.uwyn.rife2/rife2-renderers/) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 5e81e4b896acedbdf27a2e873ca307c3199dbe0a..e1731053b6a3357038ba3b4d966519c64bb07fb2 100644 GIT binary patch delta 15709 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 delta 13468 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 Template Renderers") @@ -62,13 +61,13 @@ public class TemplateRenderersBuild extends Project { .link("https://rife2.github.io/rife2/"); publishOperation() - .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS.location()) + .repository(version.isSnapshot() ? SONATYPE_SNAPSHOTS .withCredentials(property("sonatypeUser"), property("sonatypePassword")) - : repository(SONATYPE_RELEASES.location()) + : SONATYPE_RELEASES .withCredentials(property("sonatypeUser"), property("sonatypePassword"))) - .repository(version.isSnapshot() ? repository(RIFE2_SNAPSHOTS.location()) + .repository(version.isSnapshot() ? RIFE2_SNAPSHOTS .withCredentials(property("rife2Username"), property("rife2Password")) - : repository(RIFE2_RELEASES.location()) + : RIFE2_RELEASES .withCredentials(property("rife2Username"), property("rife2Password"))) .info(new PublishInfo() .groupId("com.uwyn.rife2") @@ -81,7 +80,7 @@ public class TemplateRenderersBuild extends Project { .developer(new PublishDeveloper().id("gbevin").name("Geert Bevin").email("gbevin@uwyn.com") .url("https://github.com/gbevin")) .license(new PublishLicense().name("The Apache License, Version 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0.txt")) + .url("https://www.apache.org/licenses/LICENSE-2.0.txt")) .scm(new PublishScm().connection("scm:git:https://github.com/rife2/rife2-template-renderers.git") .developerConnection("scm:git:git@github.com:rife2/rife2-template-renderers.git") .url("https://github.com/rife2/rife2-template-renderers")) @@ -94,14 +93,14 @@ public class TemplateRenderersBuild extends Project { } @BuildCommand(summary = "Generates JaCoCo Reports") - public void jacoco() throws IOException { + public void jacoco() throws Exception { new JacocoReportOperation() .fromProject(this) .execute(); } @BuildCommand(summary = "Runs PMD analysis") - public void pmd() { + public void pmd() throws Exception { new PmdOperation() .fromProject(this) .failOnViolation(true) @@ -115,4 +114,4 @@ public class TemplateRenderersBuild extends Project { .apiKey(property("testsBadgeApiKey")) .fromProject(this)); } -} \ No newline at end of file +}