Cherry-pick Android bootstrap fix for beta-0.1.1#108
Closed
clholgat wants to merge 1 commit into
Closed
Conversation
GitOrigin-RevId: fac3572a955afb4385d4caedee9291386ceedaf7
Sensitive Files Detected🔧 Build rules — Affects build rules for all Valdi consumers. 📦 Dependency change — Modifies the Bazel module graph — needs runtime team review after import. This is an automated notice. A maintainer will review after import. |
📊 PR Size: size/LTotal changes: 287 lines (11 files) Top files changed:
...and 1 more files Size calculated as additions + deletions. Labels: XS (<10), S (<50), M (<250), L (<1000), XL (1000+) |
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
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.
Cherry-pick of the Android bootstrap fix onto the
release/beta-0.1branch for thebeta-0.1.1patch release.Fixes #106
Summary
rules_kotlin1.9.0MODULE.bazelnow declaresrules_androidas a dependency and exposes@androidsdkvia an extension — previously invisible fromrules_kotlin's scope, breakingvaldi build androidon clean bootstraprules_kotlin_hermetic_sdk.patchrewritesthird_party:android_sdkto use hermetic@androidsdkjarrules_kotlin_module_bzl.patchtargeting v1.9.0 source content + newrules_kotlin_module_bzl_v195.patchfor build compatibilityMODULE.bazel.templateadds full Android dependency section (rules_android, rules_kotlin, hermetic SDK/NDK, maven, toolchains).bazelrc.templatebumpstool_java_language_version11→17 (rules_android@0.6.5 uses Java records requiring Java 16+)Background
Bazel uses the registry
MODULE.bazel(not source patches) for module resolution. The Valdi registry'srules_kotlin1.9.0MODULE.bazeldidn't declarerules_androidas a dependency, so@androidsdkwas invisible fromrules_kotlin's scope, causingvaldi install android/valdi build androidto fail on any project bootstrapped withbeta-0.1.0.Cherry-picked from
Main branch commit
f6b38118614fType of Change
Testing
bazel test //...)Testing Details
--localValdiPathbootstrap →valdi build android→ APK builds (23k actions)Checklist
Release Plan
Land fix on main✅Create✅release/beta-0.1branch frombeta-0.1.0tagCherry-pick fix onto release branch✅ (this PR)beta-0.1.1from release branch tipValdi_Widgetsbeta-0.1.1DEFAULT_VALDI_RELEASE_TAG→beta-0.1.1, CLI version →1.1.6)