Skip to content

Commit

Permalink
Update to Gradle 8.10
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta committed Aug 14, 2024
1 parent 2311195 commit 958c4fb
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 5 deletions.
28 changes: 25 additions & 3 deletions .github/workflows/assemble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ jobs:
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Set up JDK 17
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
if: matrix.java == 11
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- name: Set JAVA11_HOME
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
if: matrix.java == 11
shell: bash
run: |
echo "JAVA11_HOME=$JAVA_HOME_11_${{ runner.arch }}" >> $GITHUB_ENV
- name: Setup docker (missing on MacOS)
id: setup_docker
if: runner.os == 'macos'
Expand All @@ -30,10 +43,19 @@ jobs:
# Report success even if previous step failed (Docker on MacOS runner is very unstable)
exit 0;
- name: Run Gradle (assemble)
if: runner.os != 'macos'
if: runner.os != 'macos' && matrix.java != 11
run: |
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
- name: Run Gradle (assemble)
shell: bash
if: runner.os != 'macos' && matrix.java == 11
run: |
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=11
- name: Run Gradle (assemble)
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success' && matrix.java == 11
run: |
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=11
- name: Run Gradle (assemble)
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success' && matrix.java != 11
run: |
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
20 changes: 20 additions & 0 deletions .github/workflows/precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,26 @@ jobs:
java-version: ${{ matrix.java }}
distribution: temurin
cache: gradle
- name: Set up JDK 17
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
if: matrix.java == 11
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- name: Set JAVA11_HOME
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
if: matrix.java == 11
shell: bash
run: |
echo "JAVA11_HOME=$JAVA_HOME_11_${{ runner.arch }}" >> $GITHUB_ENV
- name: Run Gradle (precommit)
# See please https://docs.gradle.org/8.10-rc-1/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
if: matrix.java == 11
shell: bash
run: |
./gradlew javadoc precommit --parallel -Druntime.java=11
- name: Run Gradle (precommit)
if: matrix.java != 11
run: |
./gradlew javadoc precommit --parallel
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
distributionSha256Sum=682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703

0 comments on commit 958c4fb

Please sign in to comment.