Skip to content

Commit 01acf1c

Browse files
authored
Update to Gradle 8.10 (#15177)
* Update to Gradle 8.10 Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Address code review comments Signed-off-by: Andriy Redko <andriy.redko@aiven.io> --------- Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 68b74ff commit 01acf1c

4 files changed

Lines changed: 29 additions & 5 deletions

File tree

.github/workflows/assemble.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ jobs:
1616
with:
1717
java-version: ${{ matrix.java }}
1818
distribution: temurin
19+
- name: Set up JDK 17
20+
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
21+
if: matrix.java == 11
22+
uses: actions/setup-java@v4
23+
with:
24+
java-version: 17
25+
distribution: temurin
26+
- name: Set JAVA${{ matrix.java }}_HOME
27+
shell: bash
28+
run: |
29+
echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
1930
- name: Setup docker (missing on MacOS)
2031
id: setup_docker
2132
if: runner.os == 'macos'
@@ -30,10 +41,11 @@ jobs:
3041
# Report success even if previous step failed (Docker on MacOS runner is very unstable)
3142
exit 0;
3243
- name: Run Gradle (assemble)
44+
shell: bash
3345
if: runner.os != 'macos'
3446
run: |
35-
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
47+
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }}
3648
- name: Run Gradle (assemble)
3749
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
3850
run: |
39-
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
51+
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }}

.github/workflows/precommit.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ jobs:
1717
java-version: ${{ matrix.java }}
1818
distribution: temurin
1919
cache: gradle
20+
- name: Set up JDK 17
21+
# See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
22+
if: matrix.java == 11
23+
uses: actions/setup-java@v4
24+
with:
25+
java-version: 17
26+
distribution: temurin
27+
- name: Set JAVA${{ matrix.java }}_HOME
28+
shell: bash
29+
run: |
30+
echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
2031
- name: Run Gradle (precommit)
32+
shell: bash
2133
run: |
22-
./gradlew javadoc precommit --parallel
34+
./gradlew javadoc precommit --parallel -Druntime.java=${{ matrix.java }}

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

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

0 commit comments

Comments
 (0)