Skip to content

Commit

Permalink
Enabled explicit Gradle v8.9 for compatibility with the latest setup-…
Browse files Browse the repository at this point in the history
…gradle GitHub action. Bumped build Gradle to v8.9 (#250)
  • Loading branch information
lagergren authored Nov 12, 2024
1 parent 5a84542 commit dda0a7d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
17 changes: 5 additions & 12 deletions .github/workflows/xvm-verify-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ on:
env:
# TODO: Default should be disabled; we only want to be bothered by tagging and publishing for the master branch.
always_publish_snapshot: false
enable_gradle_home_cache_cleanup: true

# Add manual tests as an included build to the composite build configuration, and also build them.
ORG_GRADLE_PROJECT_includeBuildManualTests: true
Expand Down Expand Up @@ -84,14 +83,14 @@ jobs:
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: ${{ env.enable_gradle_home_cache_cleanup }}
cache-disabled: ${{ github.ref == 'refs/heads/master' }}
cache-read-only: false
gradle-version: "8.9"

- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

- name: Dump environment info
shell: bash
Expand Down Expand Up @@ -153,12 +152,6 @@ jobs:
runs-on: ubuntu-latest
#if: ${{ (github.ref == 'refs/heads/master') }}
steps:
- name: Maximize Build Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
large-packages: false

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v4
Expand All @@ -171,11 +164,11 @@ jobs:
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4
with:
gradle-home-cache-cleanup: ${{ env.enable_gradle_home_cache_cleanup }}
cache-disabled: ${{ github.ref == 'refs/heads/master' }}
cache-read-only: false
gradle-version: "8.9"

- name: Dump environment info
shell: bash
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down

0 comments on commit dda0a7d

Please sign in to comment.