diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 45df1a7..dfbc5de 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -19,17 +19,17 @@ jobs: - name: Get versions id: versions run: | - java_version=$(grep -Eo 'java [a-z0-9.-]+' .tool-versions | cut -d'-' -f2) - echo "java=$java_version" >> "$GITHUB_OUTPUT" + 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: - java-version: ${{ steps.versions.outputs.java }} - distribution: temurin + java-version-file: ".tool-versions" + distribution: "temurin" - name: Setup gradle uses: gradle/actions/setup-gradle@v3 with: - gradle-version: "8.8" + gradle-version: "${{ steps.versions.outputs.gradle }}" - name: Publish package run: gradle publish env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7f4452a..3cbb515 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,12 +31,15 @@ repos: - id: gitleaks stages: ["commit", "push"] - repo: https://github.com/fabasoad/pre-commit-snyk - rev: v0.6.2 + rev: v1.0.0 hooks: - id: snyk-test + args: + - --snyk-args=--all-projects --severity-threshold=low + - --hook-args=--log-level debug stages: ["push"] - repo: https://github.com/fabasoad/pre-commit-grype - rev: v0.3.1 + rev: v0.6.1 hooks: - id: grype-dir args: @@ -51,7 +54,7 @@ repos: args: ['-R', 'java-basic,java-empty,java-imports,java-unnecessary,java-unusedcode', '-dir', '.'] exclude: /test/ - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks - rev: v2.13.0 + rev: v2.14.0 hooks: - id: pretty-format-java args: [--autofix] diff --git a/.tool-versions b/.tool-versions index 7cbc4b0..43dfb36 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,4 @@ -gradle 8.8 +gradle 8.10 java openjdk-22 coursier 2.1.9 +pre-commit 3.8.0 diff --git a/build.gradle b/build.gradle index 9a75a39..0c49fba 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ repositories { } dependencies { - implementation 'com.google.guava:guava:33.2.1-jre' + implementation 'com.google.guava:guava:33.3.0-jre' implementation 'org.apache.groovy:groovy-all:4.0.22' testImplementation 'org.spockframework:spock-core:2.4-M4-groovy-4.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..9355b41 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/.