diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index c8275a6..308fe5a 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,9 +1,9 @@ name: bld-ci -on: [push, pull_request, workflow_dispatch] +on: [ push, pull_request, workflow_dispatch ] env: - KOTLIN_HOME: /usr/share/kotlinc + KOTLIN_HOME: /usr/share/kotlinc jobs: build-bld-project: @@ -11,8 +11,8 @@ jobs: strategy: matrix: - java-version: [17, 21, 22] - kotlin-version: [1.9.24, 2.0.0] + java-version: [ 17, 21, 22 ] + kotlin-version: [ 1.9.24, 2.0.0 ] steps: - name: Checkout source repository @@ -26,20 +26,15 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Download the examples dependencies + - name: Download dependencies [examples] working-directory: examples - run: | - chmod +x bld - ./bld download + run: ./bld download - - name: Run examples tests + - name: Run tests [examples] working-directory: examples run: ./bld compile test - - name: Grant execute permission for bld - run: chmod +x bld - - - name: Download the dependencies + - name: Download dependencies run: ./bld download - name: Run tests diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index e191f6d..1e9f25d 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: ["main"] + branches: [ "main" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.vscode/launch.json b/.vscode/launch.json index 2d63b46..d8eb2e0 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,8 @@ "--disable-banner", "--disable-ansi-colors", "--exclude-engine=junit-platform-suite", - "--exclude-engine=junit-vintage"] + "--exclude-engine=junit-vintage" + ] } ] } diff --git a/examples/.idea/kotlinc.xml b/examples/.idea/kotlinc.xml index 0dd4b35..ac319d7 100644 --- a/examples/.idea/kotlinc.xml +++ b/examples/.idea/kotlinc.xml @@ -3,4 +3,7 @@ + + \ No newline at end of file diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml index 78b0f96..70c470c 100644 --- a/examples/.idea/misc.xml +++ b/examples/.idea/misc.xml @@ -1,4 +1,3 @@ - @@ -24,4 +23,7 @@ + + \ No newline at end of file diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index 3d341bd..b3aa62b 100644 Binary files a/examples/lib/bld/bld-wrapper.jar and b/examples/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 5c9583c..681e9d4 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 3037315..59aa513 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,8 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= +bld.javaOptions= +bld.javacOptions= 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