From 2305b87d170eaf69d1457b7d7d3e7e8650e45ce8 Mon Sep 17 00:00:00 2001
From: Alex Vanyo <vanyo@google.com>
Date: Fri, 13 May 2022 15:39:16 -0700
Subject: [PATCH] Simplify Gradle caching setup

Using gradle/gradle-build-action which takes care of caching, we can remove the custom checksum calculation and files.

Change-Id: I190e4f911f6fa70199fd75a7335df12983157516
---
 .github/workflows/Build.yaml | 24 ++++------------------
 scripts/checksum.sh          | 39 ------------------------------------
 2 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100755 scripts/checksum.sh

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index d1590932c..51938bb74 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -29,16 +29,8 @@ jobs:
         with:
           java-version: 11
 
-      - name: Generate cache key
-        run: ./scripts/checksum.sh checksum.txt
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/modules-*
-            ~/.gradle/caches/jars-*
-            ~/.gradle/caches/build-cache-*
-          key: gradle-${{ hashFiles('checksum.txt') }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: Check spotless
         run: ./gradlew spotlessCheck --stacktrace
@@ -98,16 +90,8 @@ jobs:
         with:
           java-version: 11
 
-      - name: Generate cache key
-        run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
-
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches/modules-*
-            ~/.gradle/caches/jars-*
-            ~/.gradle/caches/build-cache-*
-          key: gradle-${{ hashFiles('checksum.txt') }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
diff --git a/scripts/checksum.sh b/scripts/checksum.sh
deleted file mode 100755
index 438f9e90e..000000000
--- a/scripts/checksum.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  Copyright 2022 Google, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-
-#!/bin/bash
-RESULT_FILE=$1
-
-if [ -f $RESULT_FILE ]; then
-  rm $RESULT_FILE
-fi
-touch $RESULT_FILE
-
-checksum_file() {
-  echo $(openssl md5 $1 | awk '{print $2}')
-}
-
-FILES=()
-while read -r -d ''; do
-	FILES+=("$REPLY")
-done < <(find . -type f \( -name "build.gradle*" -o -name "gradle-wrapper.properties"  -o -name "robolectric.properties" \) -print0)
-
-# Loop through files and append MD5 to result file
-for FILE in ${FILES[@]}; do
-	echo $(checksum_file $FILE) >> $RESULT_FILE
-done
-# Now sort the file so that it is idempotent
-sort $RESULT_FILE -o $RESULT_FILE