bump versions (#62)

* bump versions * output gradle version * fix Gradle matrix test
SAP · Jan 22, 2025 · 715a785 · 715a785
1 parent 6f348ff
commit 715a785
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -36,17 +36,17 @@ jobs:
         with:
           fetch-depth: 0
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v1
+        uses: fsfe/reuse-action@v5
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: spotlessCheck
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Check code style
+        run: ./gradlew spotlessCheck
 
   # One Basic check, for all kind of OS - to check if we have some kind of
   # issue with any kind of OS
@@ -66,29 +66,27 @@ jobs:
           java-version: '17'
           distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: check -x spotlessCheck
-      - uses: actions/upload-artifact@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build and Test
+        run: ./gradlew check -x spotlessCheck
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: ${{ matrix.os }}-test-result
           path: |
             build/reports
             build/test-results
 
-  # The check for different kind of gradle Versions
+  # Check supported Gradle releases
+  # https://gradle.org/releases/
+  # https://docs.gradle.org/current/userguide/feature_lifecycle.html#eol_support
   verify:
     strategy:
       matrix:
-        # https://gradle.org/releases/
         GRADLE_VERSION:
-        - "7.6.2"
-        - "8.0.2"
-        - "8.1.1"
-        - "8.2.1"
-        - "8.3"
+        - "7.6.3"
+        - "8.12"
     runs-on: ubuntu-latest
     needs: [basic, compliance]
     name: with Gradle ${{ matrix.GRADLE_VERSION }}
@@ -101,13 +99,13 @@ jobs:
           java-version: 17
           distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build and Test
+        run: ./gradlew check -x spotlessCheck
         env:
-          GRADLE_VERSION: ${{ matrix.GRADLE_VERSION }}
-        with:
-          arguments: check -x spotlessCheck
-      - uses: actions/upload-artifact@v3
+          GRADLE_VERSION: "${{ matrix.GRADLE_VERSION }}"
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: ${{ matrix.GRADLE_VERSION }}-test-result
@@ -128,11 +126,10 @@ jobs:
           java-version: 17
           distribution: 'sapmachine'
           cache: 'gradle'
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Publish Plugin
         env:
-          GRADLE_PUBLISH_KEY: ${{secrets.PUBLISH_KEY}}
-          GRADLE_PUBLISH_SECRET: ${{secrets.PUBLISH_SECRET}}
-        with:
-          arguments: publishPlugins "-Pgradle.publish.key=${GRADLE_PUBLISH_KEY}" "-Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET}"
-
+          ORG_GRADLE_PROJECT_gradle.publish.key: ${{secrets.PUBLISH_KEY}}
+          ORG_GRADLE_PROJECT_gradle.publish.secret: ${{secrets.PUBLISH_SECRET}}
+        run: ./gradlew publishPlugins
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum