From ff5ca4a27dc12475b44a8be2af429629645c1b37 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Mon, 24 May 2021 15:58:59 +0200
Subject: [PATCH 1/2] Add gradle cache to app-build workflow

---
 .github/workflows/app-build.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/app-build.yaml b/.github/workflows/app-build.yaml
index 8a47ee729..d398f7688 100644
--- a/.github/workflows/app-build.yaml
+++ b/.github/workflows/app-build.yaml
@@ -12,22 +12,27 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
           distribution: adopt
           java-version: 11
-
+      - name: Setup Gradle cache
+        uses: actions/cache@v2.1.5
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Assemble debug APKs
         run: ./gradlew --no-daemon --info assembleDebug
-
       - name: Split APK release types
         run: |
           mkdir -p build/jellyfin-publish/release-libre build/jellyfin-publish/release-proprietary;
           mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-debug.apk build/jellyfin-publish/release-libre/;
           mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-debug.apk build/jellyfin-publish/release-proprietary/;
-
       - uses: actions/upload-artifact@v2
         with:
           name: build-artifacts

From 7b15c918330616d11d53767be98caaa6818de209 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Mon, 24 May 2021 16:01:03 +0200
Subject: [PATCH 2/2] Remove empty lines from publish workflow

---
 .github/workflows/app-publish.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
index b4c010fd0..bd4aca14b 100644
--- a/.github/workflows/app-publish.yaml
+++ b/.github/workflows/app-publish.yaml
@@ -12,16 +12,13 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
           distribution: adopt
           java-version: 11
-
       - name: Set JELLYFIN_VERSION
         run: echo "JELLYFIN_VERSION=$(echo ${GITHUB_REF#refs/tags/v} | tr / -)" >> $GITHUB_ENV
-
       - name: Assemble release APKs
         env:
           KEYSTORE: ${{ secrets.KEYSTORE }}
@@ -29,14 +26,12 @@ jobs:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: ./gradlew --no-daemon --info assembleRelease versionTxt
-
       - name: Split APK release types
         run: |
           mkdir -p build/jellyfin-publish/release-libre build/jellyfin-publish/release-proprietary;
           mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-release.apk build/jellyfin-publish/release-libre/;
           mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-release.apk build/jellyfin-publish/release-proprietary/;
           mv app/build/version.txt build/jellyfin-publish/;
-
       - name: Upload release artifacts
         uses: alexellis/upload-assets@0.3.0
         env:
@@ -46,7 +41,6 @@ jobs:
             ["build/jellyfin-publish/release-libre/*",
             "build/jellyfin-publish/release-proprietary/*",
             "build/jellyfin-publish/version.txt"]
-
       - name: Upload to repo.jellyfin.org
         uses: burnett01/rsync-deployments@4.1
         with:
@@ -56,7 +50,6 @@ jobs:
           remote_host: ${{ secrets.DEPLOY_HOST }}
           remote_user: ${{ secrets.DEPLOY_USER }}
           remote_key: ${{ secrets.DEPLOY_KEY }}
-
       - name: Update repo.jellyfin.org symlinks
         uses: appleboy/ssh-action@v0.1.4
         with: