diff --git a/.circleci/config.yml b/.circleci/config.yml index 20fd6d1..a89d1b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,40 +1,41 @@ -version: 2 -defaults: &defaults - working_directory: ~/repo - environment: - JVM_OPTS: -Xmx3200m - TERM: dumb - CI_NAME: "CircleCI" +version: 2.1 -defaults_bld: &defaults_bld - steps: - - checkout - - run: - name: Download the dependencies - command: ./bld download - - run: - name: Run tests with bld - command: ./bld compile test +commands: + build_and_test: + parameters: + reports-dir: + type: string + default: "build/reports/test_results" + steps: + - checkout + - run: + name: Download dependencies + command: ./bld download + - run: + name: Compile source + command: ./bld compile + - run: + name: Run tests + command: ./bld jacoco -reports-dir=<< parameters.reports-dir >> + - store_test_results: + path: << parameters.reports-dir >> + - store_artifacts: + path: build/reports/jacoco/test/html jobs: - bld_jdk21: - <<: *defaults - - docker: - - image: cimg/openjdk:21.0 - - <<: *defaults_bld - bld_jdk17: - <<: *defaults - docker: - - image: cimg/openjdk:17.0 + - image: cimg/openjdk:17 + steps: + - build_and_test - <<: *defaults_bld + bld_jdk21: + docker: + - image: cimg/openjdk:21 + steps: + - build_and_test workflows: - version: 2 bld: jobs: - bld_jdk17 diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 45b3b77..1e81746 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest env: - COVERAGE_SDK: "17" + COVERAGE_JDK: "17" strategy: matrix: @@ -25,28 +25,28 @@ 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 - run: ./bld compile jacoco + - name: Compile source + run: ./bld compile + + - name: Run tests + run: ./bld jacoco - name: Remove pom.xml - if: success() && matrix.java-version == env.COVERAGE_SDK + if: success() && matrix.java-version == env.COVERAGE_JDK run: rm -rf pom.xml - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@master - if: success() && matrix.java-version == env.COVERAGE_SDK + if: success() && matrix.java-version == env.COVERAGE_JDK env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 - if: success() && matrix.java-version == env.COVERAGE_SDK + if: success() && matrix.java-version == env.COVERAGE_JDK env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} 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 48e8fd5..8105a64 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 143dc93..5316b95 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 2ae5c4b..d4069f2 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index c16475a..05f52ce 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -10,9 +10,9 @@ - - - - + + + + \ No newline at end of file diff --git a/README.md b/README.md index e4b57ca..e90782a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) [![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.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![release](https://img.shields.io/github/release/ethauvin/semver.svg)](https://github.com/ethauvin/semver/releases/latest) [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/semver?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/semver/) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/semver.svg)](https://central.sonatype.com/artifact/net.thauvin.erik/semver) @@ -297,7 +297,7 @@ dependencies { kapt { arguments { - arg("semver.project.dir", projectDir) + arg("semver.project.dir", projectDir.absolutePath) } } ``` diff --git a/examples/java/bld/.gitignore b/examples/java/bld/.gitignore index a2805aa..b53292f 100644 --- a/examples/java/bld/.gitignore +++ b/examples/java/bld/.gitignore @@ -5,6 +5,7 @@ lib/bld/** !lib/bld/bld-wrapper.jar !lib/bld/bld-wrapper.properties lib/compile/ +lib/provided/ lib/runtime/ lib/standalone/ lib/test/ diff --git a/examples/java/bld/.idea/libraries/bld.xml b/examples/java/bld/.idea/libraries/bld.xml index cb3eddb..8105a64 100644 --- a/examples/java/bld/.idea/libraries/bld.xml +++ b/examples/java/bld/.idea/libraries/bld.xml @@ -2,11 +2,12 @@ - + - + + diff --git a/examples/java/bld/.idea/libraries/compile.xml b/examples/java/bld/.idea/libraries/compile.xml index 9bd86aa..5316b95 100644 --- a/examples/java/bld/.idea/libraries/compile.xml +++ b/examples/java/bld/.idea/libraries/compile.xml @@ -2,12 +2,16 @@ + + - - + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/runtime.xml b/examples/java/bld/.idea/libraries/runtime.xml index 2ae5c4b..d4069f2 100644 --- a/examples/java/bld/.idea/libraries/runtime.xml +++ b/examples/java/bld/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/test.xml b/examples/java/bld/.idea/libraries/test.xml index b80486a..05f52ce 100644 --- a/examples/java/bld/.idea/libraries/test.xml +++ b/examples/java/bld/.idea/libraries/test.xml @@ -2,13 +2,17 @@ + + - - + + + + \ No newline at end of file diff --git a/examples/java/bld/.vscode/settings.json b/examples/java/bld/.vscode/settings.json index d136e4d..4c33beb 100644 --- a/examples/java/bld/.vscode/settings.json +++ b/examples/java/bld/.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.1.0.jar", "lib/**/*.jar" ] } diff --git a/examples/java/bld/README.md b/examples/java/bld/README.md new file mode 100644 index 0000000..d1f800f --- /dev/null +++ b/examples/java/bld/README.md @@ -0,0 +1,10 @@ +## Examples + +To compile & run the examples: + +```console +./bld compile + +./bld run +./bld run-example +``` diff --git a/examples/java/bld/lib/bld/bld-wrapper.jar b/examples/java/bld/lib/bld/bld-wrapper.jar index 36220d7..a7466c9 100644 Binary files a/examples/java/bld/lib/bld/bld-wrapper.jar and b/examples/java/bld/lib/bld/bld-wrapper.jar differ diff --git a/examples/java/bld/lib/bld/bld-wrapper.properties b/examples/java/bld/lib/bld/bld-wrapper.properties index 2e76ebe..1c0547e 100644 --- a/examples/java/bld/lib/bld/bld-wrapper.properties +++ b/examples/java/bld/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true +bld.downloadLocation= bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES -bld.downloadLocation= bld.sourceDirectories= -bld.version=1.9.1 +bld.version=2.1.0 diff --git a/examples/java/bld/src/bld/java/com/example/ExampleBuild.java b/examples/java/bld/src/bld/java/com/example/ExampleBuild.java index 5abcec1..34b7157 100644 --- a/examples/java/bld/src/bld/java/com/example/ExampleBuild.java +++ b/examples/java/bld/src/bld/java/com/example/ExampleBuild.java @@ -6,16 +6,12 @@ import rife.bld.Project; import java.io.File; import java.util.List; -import static rife.bld.dependencies.Repository.*; -import static rife.bld.dependencies.Scope.compile; +import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; +import static rife.bld.dependencies.Repository.MAVEN_LOCAL; +import static rife.bld.dependencies.Scope.provided; /** * Example build. - * - *
    - *
  • ./bld run
  • - *
  • ./bld runExample
  • - *
*/ public class ExampleBuild extends Project { public ExampleBuild() { @@ -29,7 +25,7 @@ public class ExampleBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); - scope(compile).include(dependency("net.thauvin.erik", "semver", version(1, 2, 2, "SNAPSHOT"))); + scope(provided).include(dependency("net.thauvin.erik", "semver", version(1, 2, 2, "SNAPSHOT"))); } public static void main(String[] args) { @@ -50,7 +46,7 @@ public class ExampleBuild extends Project { super.compile(); } - @BuildCommand(summary = "Run the example") + @BuildCommand(value = "run-example", summary = "Runs the example") public void runExample() throws Exception { runOperation().fromProject(this).mainClass("com.example.Example").execute(); } diff --git a/examples/java/gradle/.idea/compiler.xml b/examples/java/gradle/.idea/compiler.xml index 735a70b..a83902e 100644 --- a/examples/java/gradle/.idea/compiler.xml +++ b/examples/java/gradle/.idea/compiler.xml @@ -6,8 +6,8 @@