From 65ad74b4bc4f2c026c46d978e77118da9d5882a6 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Mon, 30 Mar 2026 08:39:54 +0200
Subject: [PATCH 1/3] Switching to cache: gradle in setup-java. The built-in
 caching automatically excludes lock files and handles cleanup properly.

---
 .github/workflows/build.yml | 44 ++++---------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 93176ac48..ab5d75d8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,16 +26,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-
-      - name: Cache gradle
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache: gradle
 
       - name: Linter (gradle)
         run: ./gradlew spotlessCheck
@@ -60,16 +51,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-
-      - name: Cache gradle
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache: gradle
 
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
@@ -102,16 +84,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-
-      - name: Cache gradle
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache: gradle
 
       - name: Build APK (gradle)
         run: ./gradlew assembleDebug
@@ -181,16 +154,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 21
-
-      - name: Cache gradle
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache: gradle
 
       - name: Build Desktop Distribution
         run: ./gradlew :desktopApp:${{ matrix.task }}

From b4c0a934b17634020d947be8d6c0027cbbe66a0c Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Mon, 30 Mar 2026 12:30:49 +0200
Subject: [PATCH 2/3] removed stopping of gradle since we're using other gradle
 cache

---
 .github/workflows/build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab5d75d8c..b58191385 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,10 +56,6 @@ jobs:
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
 
-      - name: Stop Gradle Daemon
-        if: always()
-        run: ./gradlew --stop
-
       - name: Android Test Report
         uses: asadmansr/android-test-report-action@v1.2.0
         if: ${{ always() && matrix.os == 'ubuntu-latest' }}
@@ -159,10 +155,6 @@ jobs:
       - name: Build Desktop Distribution
         run: ./gradlew :desktopApp:${{ matrix.task }}
 
-      - name: Stop Gradle Daemon
-        if: always()
-        run: ./gradlew --stop
-
       - name: Upload Desktop Distribution
         uses: actions/upload-artifact@v6
         with:

From 226c590c0dbddf955278e0b74fb93af9244f7374 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Tue, 31 Mar 2026 07:32:37 +0200
Subject: [PATCH 3/3] Revert "removed stopping of gradle since we're using
 other gradle cache"

This reverts commit b4c0a934b17634020d947be8d6c0027cbbe66a0c.
---
 .github/workflows/build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b58191385..ab5d75d8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,10 @@ jobs:
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
 
+      - name: Stop Gradle Daemon
+        if: always()
+        run: ./gradlew --stop
+
       - name: Android Test Report
         uses: asadmansr/android-test-report-action@v1.2.0
         if: ${{ always() && matrix.os == 'ubuntu-latest' }}
@@ -155,6 +159,10 @@ jobs:
       - name: Build Desktop Distribution
         run: ./gradlew :desktopApp:${{ matrix.task }}
 
+      - name: Stop Gradle Daemon
+        if: always()
+        run: ./gradlew --stop
+
       - name: Upload Desktop Distribution
         uses: actions/upload-artifact@v6
         with: