Update gradle ci version and use config-cache

geoff-powell · Feb 4, 2024 · 7d3d371 · 7d3d371
1 parent 416a1b6
commit 7d3d371
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -25,12 +25,13 @@ jobs:
       with:
         java-version: '17'
         distribution: 'zulu'
-        cache: gradle
 
     - name: Setup gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/setup-gradle@v3
       with:
         gradle-home-cache-cleanup: true
+        cache-write-only: ${{ github.event_name == 'push' }}
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Build with Gradle
       run: ./gradlew composeApp:assembleDebug -Pbuild-numeber=${{ needs.build-number.outputs.build-number }}
@@ -51,10 +52,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup gradle
+        uses: gradle/setup-gradle@v3
+        with:
+          gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Build with Gradle
         run: ./gradlew composeApp:assembleRelease -Pbuild-numeber=${{ needs.build-number.outputs.build-number }}
@@ -75,10 +79,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup gradle
+        uses: gradle/setup-gradle@v3
+        with:
+          gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Build with Gradle
         run: ./gradlew composeApp:testDebugUnitTest
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -24,12 +24,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Build with Gradle
         run: ./gradlew spotlessCheck
diff --git a/.github/workflows/desktop-web.yml b/.github/workflows/desktop-web.yml
@@ -26,12 +26,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Build with Gradle
         run: ./gradlew composeApp:desktopJar
@@ -48,10 +49,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup gradle
+        uses: gradle/setup-gradle@v3
+        with:
+          gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Setup Node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -72,12 +72,13 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
-          cache: gradle
 
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/setup-gradle@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-write-only: ${{ github.event_name == 'push' }}
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
 #       Update build number with the one generated from build-number.yml
       - uses: yanamura/ios-bump-version@v1