chore: sync 88 commits from Silo-Server/silo-android main - #25
Merged
Conversation
…y-chain build(android): forward-split verified supply chain from PR 108
…epub fix(android): forward-split auth and EPUB security from PR 108
…sync fix(android): scope Room storage and outbox state (PR 108 slice C)
…r-foundation fix(android): harden player lifecycle and final writes (PR 108 slice D)
…tles feat(android): transactional subtitles and PGS support (PR 108 slice E)
…-together feat(android): production-ready Watch Together (PR 108 slice F)
Bring prairie-android up to date with upstream silo-android, including the PR Silo-Server#108 Watch Together / subtitles / player foundation slices and related auth, epub, and supply-chain work. Prairie adaptations: - Remap org.siloserver.silo → org.prairieserver.prairie and Silo* → Prairie* - Keep Live TV DI bindings, X-Prairie-* / ImageFormats headers, and newer GitHub Actions majors - Keep prairie-dovi-bridge naming and prairie_dovi.cpp; add dovi AndroidManifest Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
|
Warning Review limit reached
Next review available in: 4 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (2)
📒 Files selected for processing (291)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
The upstream sync brought in check-build-supply-chain.sh, which rejects mutable action tags. Adopt the pinned checkout/upload/download digests from Silo-Server/silo-android so CI can pass. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
Upstream supply-chain verification-metadata.xml did not include Prairie's org.jetbrains.kotlinx.kover 0.9.1 artifacts, so :shared:testDebugUnitTest failed dependency verification before tests could run. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
Tree-wide Silo→Prairie rename left uppercase SILO.EXAMPLE / SILO.LAN hosts while lowercasing counterparts to prairie.*, so case-normalization origin equality assertions failed. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
Exclude private KtorWatchTogetherSocket* transport classes from the shared commonMain coverage gate (same live-websocket rationale as DefaultWatchTogetherRealtimeClient) and add focused unit tests for the new subtitle codec/language canonicalizers so the 95% line gate clears. Co-authored-by: Jonah May <JonahMMay@users.noreply.github.com>
JonahMMay
marked this pull request as ready for review
July 27, 2026 18:30
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
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
3 participants
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.
Problem
Prairie-android was 88 commits behind
Silo-Server/silo-androidmain.Approach
Merge upstream
maininto Prairie, including the PR Silo-Server#108 split slices:Prairie adaptations:
org.siloserver.silo→org.prairieserver.prairieandSilo*→Prairie*X-Prairie-*/ImageFormatsheaders, and newer GitHub Actions majorsprairie-dovi-bridgenaming andprairie_dovi.cpp; add doviAndroidManifest.xmlfor the updated build scriptAfter merge: 0 behind
upstream/main(Prairie remains ahead on fork-only commits).Testing
AI Disclosure
Checklist