Batch five green dependency updates, revert Gradle to 9.6.1 - #1929
Merged
Merged
Conversation
Combines the five green Renovate PRs so they can be verified together rather than merged one at a time and re-running CI five times: - Apollo 5.1.0 -> 5.2.0, apollo-cache 1.0.7 -> 1.0.8 (#1928) - googleid 1.2.0 -> 1.2.1 (#1927) - wire-gradle-plugin 6.4.7 -> 7.0.3 (#1923) - compose-ai-tools 1.61.2 -> 1.85.0, plugin + workflow refs (#1910) - devcontainers/java image 1-21 -> 3-21 (#1924) Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Rolls back the 9.7.0 (#1854) and 9.7.1 (#1871) wrapper bumps. Both were properties-only changes, so this is their exact inverse; the checksum is the official services.gradle.org sha256 for gradle-9.6.1-bin.zip, which matches the one recorded when 9.6.1 was first introduced in #1716. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The 9.6.1 revert does not stick on its own: Renovate re-offers 9.7.1 on its next run, and CI passes on it because the breakage is IDE-side only (IntelliJ stable cannot sync the project with the KMP plugin enabled). Cap the wrapper at <9.7.0 so 9.6.x patches still flow, matching how the AGP Studio-ceiling hold is expressed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
Preview ChangesChanged (7 variant(s) across 6 function(s))
Other variants: Tablet landscape
Unchanged (137 function(s), 274 variant(s))
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Combines the five Renovate PRs that were green and conflict-free, so they get verified together rather than each against
mainin isolation, plus a Gradle wrapper revert.Replaces #1928, #1927, #1923, #1910, #1924:
Also reverts the Gradle wrapper 9.7.1 → 9.6.1. Gradle 9.7.x breaks project sync in current stable IntelliJ IDEA with the Kotlin Multiplatform plugin enabled. CI passes fully on 9.7.1 — the breakage is IDE-side only — so a Renovate rule caps the wrapper at
<9.7.0(9.6.x patches still flow). Without that rule the revert undoes itself on Renovate's next run, and the resulting PR looks like a safe green bump.All five versions were checked against the registries before use; each resolves.
Test plan
Run locally on Gradle 9.6.1 with all five updates applied:
:androidApp:assembleDebug:wearApp:assembleDebug— covers:proto, so exercises the wire 7.x major bump:backend:service-graphql:build:backend:service-import:build— includes backend tests, covers Apollo 5.2.0:compose-web:wasmJsBrowserDistribution:shared:compileKotlinJvm:shared:compileKotlinIosArm64:shared:compileKotlinIosSimulatorArm64:shared:linkDebugFrameworkIosArm64:shared:linkDebugFrameworkIosSimulatorArm64Pre-existing test failures (not caused by this branch)
:androidApp:testDebugUnitTest/:wearApp:testDebugUnitTestfail locally on macOS, but they fail the same way on cleanmain— baselined on the same machine:SettingsScreenTest > loggedInSettings,SpeakerDetailsTest > speakerDetailsScreen(wearApp, NPE) — fail deterministically onmain; identical36 tests completed, 2 failed, 11 skippedwith and without this branchSpeakerDetailsScTest > screenshotDetails(androidApp,FileSystemAlreadyExistsExceptionatZipFileSystemProvider.java:101) — flaky, not deterministic: fails ~2-in-3 onmain(fail/pass/fail) and 1-in-2 on this branchThese pass on CI's Linux runners. Worth a separate look, but unrelated to these updates.
Note on #1899
Not included, and it cannot be fixed by a re-run: Renovate proposes compose-ai-tools 3.8.3, but that plugin's published versions top out at 2.20.0 — 3.8.3 was never released, which is why every job fails at configuration with "plugin not found". #1910 (1.85.0) is the real update and is in this PR.
🤖 Generated with Claude Code