Update to Gradle 8.10

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Aug 12, 2024 · 0fba16e · 0fba16e
1 parent 2311195
commit 0fba16e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml
@@ -11,6 +11,13 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        # See please https://docs.gradle.org/8.10-rc-1/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 up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
@@ -29,6 +36,11 @@ jobs:
         run: |
           # Report success even if previous step failed (Docker on MacOS runner is very unstable)
           exit 0;
+      - name: Update Gradle Daemon (JVM)
+        # See please https://docs.gradle.org/8.10-rc-1/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
+        if: matrix.java == 11
+        run: |
+          echo 'toolchainVersion=17' > gradle/gradle-daemon-jvm.properties
       - name: Run Gradle (assemble)
         if: runner.os != 'macos'
         run: |

diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -10,13 +10,25 @@ jobs:
         java: [ 11, 17, 21 ]
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
     steps:
+      - name: Set up JDK 17
+        # See please https://docs.gradle.org/8.10-rc-1/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
+        if: matrix.java == 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
           cache: gradle
+      - name: Update Gradle Daemon (JVM)
+        # See please https://docs.gradle.org/8.10-rc-1/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
+        if: matrix.java == 11
+        run: |
+          echo 'toolchainVersion=17' > gradle/gradle-daemon-jvm.properties
       - name: Run Gradle (precommit)
         run: |
           ./gradlew javadoc precommit --parallel
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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-rc-1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
+distributionSha256Sum=dea9b3572616026b04d32dfab297da2b215e5a63939d777444feb1dd164f917a