From 3b18ff16129abc00d112a14ba21ca24a3148fc72 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 9 Sep 2024 11:33:38 -0700 Subject: [PATCH] Updated dependencies Bumped Gradle to version 8.10.1 Bumped Kotlin to version 2.0.20 Bumped bld to version 2.1.0 --- .circleci/config.yml | 59 ++++++++--------- .github/workflows/bld.yml | 20 +++--- .idea/bld.xml | 6 ++ .idea/libraries/bld.xml | 4 +- .idea/libraries/compile.xml | 8 +-- .idea/libraries/runtime.xml | 4 +- .idea/libraries/test.xml | 8 +-- README.md | 4 +- examples/java/bld/.gitignore | 1 + examples/java/bld/.idea/libraries/bld.xml | 5 +- examples/java/bld/.idea/libraries/compile.xml | 8 ++- examples/java/bld/.idea/libraries/runtime.xml | 4 +- examples/java/bld/.idea/libraries/test.xml | 8 ++- examples/java/bld/.vscode/settings.json | 2 +- examples/java/bld/README.md | 10 +++ examples/java/bld/lib/bld/bld-wrapper.jar | Bin 27319 -> 30440 bytes .../java/bld/lib/bld/bld-wrapper.properties | 4 +- .../bld/java/com/example/ExampleBuild.java | 14 ++-- examples/java/gradle/.idea/compiler.xml | 4 +- examples/java/gradle/README.md | 9 +++ examples/java/gradle/build.gradle | 3 - examples/kotlin/.idea/kotlinc.xml | 2 +- examples/kotlin/.idea/misc.xml | 2 +- examples/kotlin/README.md | 11 ++++ examples/kotlin/build.gradle.kts | 10 +-- .../kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/kotlin/gradlew | 7 +- examples/kotlin/gradlew.bat | 2 + lib/bld/bld-wrapper.jar | Bin 27319 -> 30440 bytes lib/bld/bld-wrapper.properties | 10 +-- .../net/thauvin/erik/semver/SemverBuild.java | 60 ++++++++---------- 32 files changed, 163 insertions(+), 128 deletions(-) create mode 100644 .idea/bld.xml create mode 100644 examples/java/bld/README.md create mode 100644 examples/java/gradle/README.md create mode 100644 examples/kotlin/README.md 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 36220d77f1f8ffa3d1af344d0898091a0dfbb472..a7466c9748a862f4fcbe672d2107b91c27005bf6 100644 GIT binary patch delta 16612 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 delta 13494 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 akhG$Lk}M4DfAVnuI?=!KLI2Va5dRNy^+DhO 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 @@