diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index bfb4c1b..63b9243 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -16,11 +16,6 @@ jobs: steps: - name: Checkout ${{ github.repository }} uses: actions/checkout@v4 - - name: Get versions - id: versions - run: | - gradle_version=$(grep -Eo 'gradle [a-z0-9.-]+' .tool-versions | cut -d'-' -f2) - echo "gradle=${gradle_version}" >> "$GITHUB_OUTPUT" - name: Setup Java uses: actions/setup-java@v4 with: @@ -28,9 +23,8 @@ jobs: distribution: "temurin" - name: Setup gradle uses: gradle/actions/setup-gradle@v4 - with: - gradle-version: "${{ steps.versions.outputs.gradle }}" - name: Publish package - run: gradle publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gradle publish + shell: sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6614551..69417cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,6 @@ on: # yamllint disable-line rule:truthy jobs: github: name: GitHub - uses: fabasoad/reusable-workflows/.github/workflows/wf-github-release.yml@dependabot/github_actions/zaproxy/action-api-scan-0.8.0 + uses: fabasoad/reusable-workflows/.github/workflows/wf-github-release.yml@main with: bump-tags: false diff --git a/.tool-versions b/.tool-versions index f620974..3378a13 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,3 @@ -gradle 8.10 java openjdk-23 coursier 2.1.9 pre-commit 3.8.0 diff --git a/Makefile b/Makefile index 0a6af17..3f59514 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,5 @@ install: dev/install ## (Recommended) Installs all the required dependencies test: java/test ## (Recommended) Runs unit tests update: java/update ## (Recommended) Updates dependencies to the latest version + +clean: java/clean ## (Recommended) Removes build directory diff --git a/build.gradle b/build.gradle index 585057b..e009e6a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'io.fabasoad' -version '0.2.1' +version '0.2.3' repositories { mavenCentral() @@ -14,7 +14,7 @@ repositories { dependencies { implementation 'com.google.guava:guava:33.3.1-jre' - implementation 'org.apache.groovy:groovy-all:4.0.22' + implementation 'org.apache.groovy:groovy-all:4.0.23' testImplementation 'org.spockframework:spock-core:2.4-M4-groovy-4.0' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/tasks/Makefile.java.mk b/tasks/Makefile.java.mk index 14ed902..525c494 100644 --- a/tasks/Makefile.java.mk +++ b/tasks/Makefile.java.mk @@ -11,3 +11,6 @@ java/test: ## Runs unit tests with coverage java/update: ## Updates dependencies to the latest version @./gradlew dependencyUpdates -Drevision=releas + +java/clean: ## Removes build directory + @./gradlew clean