From 5fd1a18792791ef6fbca3689a0dc43ddbecddf35 Mon Sep 17 00:00:00 2001 From: SiteRelEnby <125829806+SiteRelEnby@users.noreply.github.com> Date: Mon, 29 Jun 2026 00:13:59 -0400 Subject: [PATCH 1/2] ci: pin regenerated gradle wrapper to 8.13 setup-gradle now provides Gradle 9.6.0, and the 'gradle wrapper' step (run to regenerate the gitignored wrapper jar) was rewriting the wrapper to 9.6.0 - which AGP 8.13.2 cannot run on (it relies on a Gradle internal API removed in 9.6.0). Every PR + release build started failing at plugin apply. Pass --gradle-version 8.13 so the wrapper regenerates at the project's pinned version regardless of setup-gradle's default. --- .github/workflows/dev-release.yml | 3 ++- .github/workflows/pr-checks.yml | 6 +++++- .github/workflows/tagged-release.yml | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index 833c8d8..613d9d3 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -49,7 +49,8 @@ jobs: - name: Generate Gradle wrapper JAR working-directory: sheaf - run: gradle wrapper + # Pin to the project Gradle version; see pr-checks.yml. + run: gradle wrapper --gradle-version 8.13 - name: Make gradlew executable run: chmod +x sheaf/gradlew diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 4acbbf4..c1df186 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -35,7 +35,11 @@ jobs: - name: Generate Gradle wrapper JAR working-directory: sheaf - run: gradle wrapper + # Pin the regenerated wrapper to the project's Gradle version. Without + # --gradle-version, `gradle wrapper` rewrites the wrapper to whatever + # Gradle setup-gradle provides (now 9.6.0), which AGP 8.13.2 can't run + # on. Keep this in sync with gradle/wrapper/gradle-wrapper.properties. + run: gradle wrapper --gradle-version 8.13 - name: Make gradlew executable run: chmod +x sheaf/gradlew diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index d2d1e2a..1d6061a 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -82,7 +82,8 @@ jobs: - name: Generate Gradle wrapper JAR working-directory: sheaf - run: gradle wrapper + # Pin to the project Gradle version; see pr-checks.yml. + run: gradle wrapper --gradle-version 8.13 - name: Make gradlew executable run: chmod +x sheaf/gradlew @@ -199,7 +200,8 @@ jobs: - name: Generate Gradle wrapper JAR working-directory: sheaf - run: gradle wrapper + # Pin to the project Gradle version; see pr-checks.yml. + run: gradle wrapper --gradle-version 8.13 - name: Make gradlew executable run: chmod +x sheaf/gradlew From 5139798bf713ccaf74e0cf9a58c020465de129ae Mon Sep 17 00:00:00 2001 From: SiteRelEnby <125829806+SiteRelEnby@users.noreply.github.com> Date: Mon, 29 Jun 2026 00:19:20 -0400 Subject: [PATCH 2/2] ci: pin setup-gradle to 8.13 (the wrapper-flag alone wasn't enough) The 'gradle wrapper' step runs under setup-gradle's Gradle, which (at 9.6.0) configures the AGP 8.13.2 project and fails at plugin apply before it can rewrite the wrapper - so --gradle-version on the wrapper command didn't help. Pin setup-gradle's provisioned Gradle to 8.13 so every CI Gradle invocation matches the project (and local builds). --- .github/workflows/dev-release.yml | 5 +++++ .github/workflows/pr-checks.yml | 5 +++++ .github/workflows/tagged-release.yml | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index 613d9d3..3c16f13 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -46,6 +46,11 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v3 + with: + # AGP 8.13.2 cannot run on Gradle 9.6.0 (setup-gradle now defaults + # to it); pin to the project version. Keep in sync with + # gradle/wrapper/gradle-wrapper.properties. + gradle-version: "8.13" - name: Generate Gradle wrapper JAR working-directory: sheaf diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index c1df186..e342428 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -32,6 +32,11 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v3 + with: + # AGP 8.13.2 cannot run on Gradle 9.6.0 (setup-gradle now defaults + # to it); pin to the project version. Keep in sync with + # gradle/wrapper/gradle-wrapper.properties. + gradle-version: "8.13" - name: Generate Gradle wrapper JAR working-directory: sheaf diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index 1d6061a..9908fd6 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -79,6 +79,11 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v3 + with: + # AGP 8.13.2 cannot run on Gradle 9.6.0 (setup-gradle now defaults + # to it); pin to the project version. Keep in sync with + # gradle/wrapper/gradle-wrapper.properties. + gradle-version: "8.13" - name: Generate Gradle wrapper JAR working-directory: sheaf @@ -197,6 +202,11 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v3 + with: + # AGP 8.13.2 cannot run on Gradle 9.6.0 (setup-gradle now defaults + # to it); pin to the project version. Keep in sync with + # gradle/wrapper/gradle-wrapper.properties. + gradle-version: "8.13" - name: Generate Gradle wrapper JAR working-directory: sheaf