From ca57fbeb1876dd8f46decc3dea678bd52d18e8b7 Mon Sep 17 00:00:00 2001
From: RoB Murdock <rob@zegreatrob.com>
Date: Wed, 3 Apr 2024 10:27:19 -0400
Subject: [PATCH] [patch] updating github actions

---
 .github/workflows/gradle-update.yml         | 14 ++++++--------
 .github/workflows/main.yml                  |  6 +++---
 .github/workflows/update-gradle-wrapper.yml | 18 ++++++++----------
 .idea/kotlinc.xml                           |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/gradle-update.yml b/.github/workflows/gradle-update.yml
index b3751894..c46b60da 100644
--- a/.github/workflows/gradle-update.yml
+++ b/.github/workflows/gradle-update.yml
@@ -8,11 +8,11 @@ jobs:
     name: "Create Update Branch"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '25'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: true
       - name: Update Deps
@@ -23,7 +23,7 @@ jobs:
         run: ./gradlew kotlinUpgradeYarnLock --no-configuration-cache --no-build-cache
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           branch: "cpr-gradle-update/${{github.job}}/${{github.run_id}}"
           commit-message: "[patch] ${{github.workflow}}"
@@ -31,8 +31,6 @@ jobs:
           delete-branch: true
       - name: Enable Pull Request Automerge
         if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.TESTMINTS_PAT }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: rebase
+        run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.TESTMINTS_PAT }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa4fccb7..400f9239 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,14 +30,14 @@ jobs:
         with:
           firefox-version: latest
       - run: echo "FIREFOX_BINARY=$(which firefox)" >> $GITHUB_ENV
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: testspace-com/setup-testspace@v1
         with:
           domain: robertfmurdock
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/master' }}
       - name: Generate Version 🔢
@@ -61,7 +61,7 @@ jobs:
       - name: Collect Test Results
         if: ${{ always() }}
         run: ./gradlew collectResults
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: test-output
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index d8934383..2a67a21e 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -8,17 +8,17 @@ jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '25'
-      - uses: burrunan/gradle-cache-action@v1
-        name: Update Deps
+      - name: Setup Current Gradle
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: current
-          arguments: wrapper --distribution-type all
+      - run: gradle wrapper --distribution-type all
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           branch: "cpr/${{github.job}}/${{github.run_id}}"
           commit-message: "[patch] ${{github.workflow}}"
@@ -26,8 +26,6 @@ jobs:
           delete-branch: true
       - name: Enable Pull Request Automerge
         if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v2
-        with:
-          token: ${{ secrets.TESTMINTS_PAT }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: rebase
+        run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.TESTMINTS_PAT }}
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e805548a..8d81632f 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.20" />
+    <option name="version" value="1.9.22" />
   </component>
 </project>
\ No newline at end of file