diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index 833c8d8..3c16f13 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -46,10 +46,16 @@ 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 - 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..e342428 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -32,10 +32,19 @@ 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 - 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..9908fd6 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -79,10 +79,16 @@ 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 - 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 @@ -196,10 +202,16 @@ 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 - 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