From f6d3b93a893149806956ccd8f169f62ad480b891 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Mon, 6 May 2024 15:47:41 -0400
Subject: [PATCH] More CI updates

---
 .github/workflows/ci.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d94ede..21df66e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Install JDK
         uses: actions/setup-java@v3
@@ -45,19 +45,18 @@ jobs:
       - name: Spot check
         run: ./gradlew spotlessCheck
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Test plugin
         id: gradle
         if: matrix.job == 'plugin'
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: -p keeper-gradle-plugin check
+        run: ./gradlew -p keeper-gradle-plugin check
 
       - name: Assemble instrumentation tests
         id: gradle-assemble-instrumentation
         if: matrix.job == 'instrumentation'
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: :sample:minifyExternalStagingWithR8 validateL8 --stacktrace
+        run: ./gradlew :sample:minifyExternalStagingWithR8 validateL8 --stacktrace
 
       # TODO AVD caching disabled due to https://github.com/ReactiveCircus/android-emulator-runner/issues/278
 #      - name: AVD cache
@@ -132,12 +131,8 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
 
-      # Just here to restore cache
-      - name: Gradle prep
-        id: gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: help
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Upload snapshot (main only)
         env: