From 174c9a559696d62e8caec55a4801621a366338f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20V=C3=A9rin?= <thomas.verin@sonarsource.com>
Date: Mon, 8 Jun 2026 11:02:20 +0200
Subject: [PATCH 1/2] PREQ-6264: Add Gradle wrapper download retries in
 config-gradle

---
 config-gradle/action.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/config-gradle/action.yml b/config-gradle/action.yml
index a918dc67..6a96062f 100644
--- a/config-gradle/action.yml
+++ b/config-gradle/action.yml
@@ -139,6 +139,31 @@ runs:
           echo "DEVELOCITY_ACCESS_KEY=${{ steps.develocity-hostname.outputs.hostname }}=$DEVELOCITY_TOKEN" >> "$GITHUB_ENV"
         fi
 
+    - name: Configure Gradle wrapper download resilience
+      if: steps.config-gradle-completed.outputs.skip != 'true'
+      shell: bash
+      working-directory: ${{ inputs.working-directory }}
+      run: |
+        WRAPPER_PROPS="gradle/wrapper/gradle-wrapper.properties"
+        if [[ ! -f "$WRAPPER_PROPS" ]]; then
+          echo "No ${WRAPPER_PROPS} found, skipping wrapper resilience config"
+          exit 0
+        fi
+
+        update_prop() {
+          local key="$1" value="$2"
+          if grep -q "^${key}=" "$WRAPPER_PROPS"; then
+            sed -i.bak "s/^${key}=.*/${key}=${value}/" "$WRAPPER_PROPS"
+          else
+            echo "${key}=${value}" >> "$WRAPPER_PROPS"
+          fi
+        }
+
+        update_prop networkTimeout 60000
+        update_prop retries 3
+        update_prop retryBackOffMs 1000
+        rm -f "${WRAPPER_PROPS}.bak"
+
     - name: Configure Gradle
       if: steps.config-gradle-completed.outputs.skip != 'true'
       uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0

From 4564b4d3357578f2bbc732e2d8a5fb3574b77185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20V=C3=A9rin?= <thomas.verin@sonarsource.com>
Date: Mon, 8 Jun 2026 11:05:40 +0200
Subject: [PATCH 2/2] PREQ-6264: Ensure trailing newline before appending
 wrapper props

---
 config-gradle/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config-gradle/action.yml b/config-gradle/action.yml
index 6a96062f..f2d9f86d 100644
--- a/config-gradle/action.yml
+++ b/config-gradle/action.yml
@@ -155,6 +155,7 @@ runs:
           if grep -q "^${key}=" "$WRAPPER_PROPS"; then
             sed -i.bak "s/^${key}=.*/${key}=${value}/" "$WRAPPER_PROPS"
           else
+            [[ -s "$WRAPPER_PROPS" && -n "$(tail -c1 "$WRAPPER_PROPS")" ]] && echo >> "$WRAPPER_PROPS"
             echo "${key}=${value}" >> "$WRAPPER_PROPS"
           fi
         }