From eeaf206615505ba82f4888430f87c3fc466adbaf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Aug 2024 09:24:21 +0200
Subject: [PATCH 1/3] Gradle update action: Use JDK 17 and skip early in forks.

---
 .github/workflows/gradle-wrapper-update.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index d35bace705..b75813c026 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -7,12 +7,18 @@ on:
 jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-latest
+    # Skip in forks
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        name: Use JDK 17
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
-        # Skip in forks
-        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           target-branch: develop

From f52751efffbce52a631318d01362de674659634f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Aug 2024 09:31:29 +0200
Subject: [PATCH 2/3] Renovate: Disable gradle update. Update of gradle is done
 by a specific GitHub action.

---
 .github/renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 66e1b98aea..ca74a436e8 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,7 +7,8 @@
     "PR-Dependencies"
   ],
   "ignoreDeps" : [
-    "string:app_name"
+    "string:app_name",
+    "gradle"
   ],
   "packageRules" : [
     {

From b59e17481d94128e36bc7c2d33c167b18f2d0996 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Aug 2024 09:33:37 +0200
Subject: [PATCH 3/3] Update Gradle: ddd workflow_dispatch

---
 .github/workflows/gradle-wrapper-update.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index b75813c026..7cb6798ba5 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -1,6 +1,7 @@
 name: Update Gradle Wrapper
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 0 * * *"