From e91c259c6ad318a91bfa729e707f17b3bb488d32 Mon Sep 17 00:00:00 2001
From: Vermeil <120065660+VermeilChan@users.noreply.github.com>
Date: Tue, 30 Jan 2024 19:23:45 +0100
Subject: Bump Gradle To 8.5

---
 .github/workflows/build.yml                     |  23 +++++++++++++++--------
 .github/workflows/gradle-wrapper-validation.yml |   4 ++--
 .github/workflows/init.yml                      |   4 ++--
 gradle/wrapper/gradle-wrapper.jar               | Bin 63375 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties        |   2 +-
 gradlew                                         |   3 ++-
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d794684..e1e773f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,22 +1,29 @@
 name: Run Gradle Build
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
+
 jobs:
   gradle:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        name: Setup Java
+        uses: actions/checkout@v4.1.1
+
+      - name: Setup Java
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: temurin
           java-version: 17
+
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Execute Gradle build
         run: ./gradlew build
-      - uses: actions/upload-artifact@v3
-        name: Upload built mod JAR
+
+      - name: Upload built mod JAR
+        uses: actions/upload-artifact@v4.3.0
         with:
           name: mod-jar
-          path: build/libs/*.jar
\ No newline at end of file
+          path: build/libs/*.jar
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 91e75b3..352f9cb 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
\ No newline at end of file
+      - uses: actions/checkout@v4.1.1
+      - uses: gradle/wrapper-validation-action@v2.0.0-rc.1
\ No newline at end of file
diff --git a/.github/workflows/init.yml b/.github/workflows/init.yml
index c18810f..4220638 100644
--- a/.github/workflows/init.yml
+++ b/.github/workflows/init.yml
@@ -12,7 +12,7 @@ jobs:
     if: github.event.repository.name != 'Forge1.8.9Template'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
       - name: Initialize Repo
         run: |
           git config --local user.email "action@github.com"
@@ -32,7 +32,7 @@ jobs:
           Set modid to $modid
           EOF
       - name: Push changes
-        uses: ad-m/github-push-action@v0.6.0
+        uses: ad-m/github-push-action@v0.8.0
         with:
           branch: ${{ github.ref }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c..7f93135 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34..1af9e09 100644
--- 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.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca..0adc8e1 100755
--- 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
-- 
cgit