Skip to content

Cherry-pick Android bootstrap fix for beta-0.1.1#108

Closed
clholgat wants to merge 1 commit into
mainfrom
release/beta-0.1
Closed

Cherry-pick Android bootstrap fix for beta-0.1.1#108
clholgat wants to merge 1 commit into
mainfrom
release/beta-0.1

Conversation

@clholgat

@clholgat clholgat commented Jun 24, 2026

Copy link
Copy Markdown
Collaborator

Cherry-pick of the Android bootstrap fix onto the release/beta-0.1 branch for the beta-0.1.1 patch release.

Fixes #106

Summary

  • Registry: rules_kotlin 1.9.0 MODULE.bazel now declares rules_android as a dependency and exposes @androidsdk via an extension — previously invisible from rules_kotlin's scope, breaking valdi build android on clean bootstrap
  • Registry: New rules_kotlin_hermetic_sdk.patch rewrites third_party:android_sdk to use hermetic @androidsdk jar
  • Registry: Rewritten rules_kotlin_module_bzl.patch targeting v1.9.0 source content + new rules_kotlin_module_bzl_v195.patch for build compatibility
  • CLI template: MODULE.bazel.template adds full Android dependency section (rules_android, rules_kotlin, hermetic SDK/NDK, maven, toolchains)
  • CLI template: .bazelrc.template bumps tool_java_language_version 11→17 (rules_android@0.6.5 uses Java records requiring Java 16+)
  • Tests: Android build smoke test unskipped

Background

Bazel uses the registry MODULE.bazel (not source patches) for module resolution. The Valdi registry's rules_kotlin 1.9.0 MODULE.bazel didn't declare rules_android as a dependency, so @androidsdk was invisible from rules_kotlin's scope, causing valdi install android / valdi build android to fail on any project bootstrapped with beta-0.1.0.

Cherry-picked from

Main branch commit f6b38118614f

Type of Change

  • Bug fix (non-breaking change that fixes an issue)

Testing

  • Tests pass locally (bazel test //...)
  • Tested on multiple platforms (iOS/Android/Web/macOS as applicable)
  • Manual testing performed (describe below)

Testing Details

  • Local verification: --localValdiPath bootstrap → valdi build android → APK builds (23k actions)

Checklist

  • Code follows project style guidelines
  • No breaking changes (or documented in description)
  • No secrets, API keys, or internal URLs included

Release Plan

  1. Land fix on main
  2. Create release/beta-0.1 branch from beta-0.1.0 tag
  3. Cherry-pick fix onto release branch ✅ (this PR)
  4. Tag beta-0.1.1 from release branch tip
  5. Create GitHub pre-release → triggers release test workflow
  6. Manual verification with fresh bootstrap
  7. Tag Valdi_Widgets beta-0.1.1
  8. Bump CLI defaults (DEFAULT_VALDI_RELEASE_TAGbeta-0.1.1, CLI version → 1.1.6)

GitOrigin-RevId: fac3572a955afb4385d4caedee9291386ceedaf7
@github-actions

Copy link
Copy Markdown

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.

@github-actions github-actions Bot added area/build-system Bazel build rules and config size/L labels Jun 24, 2026
@github-actions

Copy link
Copy Markdown

📊 PR Size: size/L

Total changes: 287 lines (11 files)

Top files changed:

  • registry/modules/rules_kotlin/1.9.0/patches/rules_kotlin_hermetic_sdk.patch: +94 -0
  • npm_modules/cli/.metadata/MODULE.bazel.template: +92 -0
  • registry/modules/rules_kotlin/1.9.0/patches/rules_kotlin_module_bzl.patch: +22 -20
  • registry/modules/rules_kotlin/1.9.0/patches/rules_kotlin_module_bzl_v195.patch: +28 -0
  • registry/modules/rules_kotlin/1.9.0/MODULE.bazel: +10 -2
  • registry/modules/rules_kotlin/1.9.0/source.json: +4 -1
  • npm_modules/cli/test/ValdiSmokeTest.ts: +2 -2
  • npm_modules/cli/test/helpers/AsyncHelpers.ts: +2 -2
  • MODULE.bazel: +2 -1
  • npm_modules/cli/.metadata/.bazelrc.template: +1 -1

...and 1 more files

Size calculated as additions + deletions. Labels: XS (<10), S (<50), M (<250), L (<1000), XL (1000+)

@clholgat clholgat changed the title Cherry-pick: Internal Change Cherry-pick Android bootstrap fix for beta-0.1.1 Jun 24, 2026
@clholgat clholgat closed this Jun 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/build-system Bazel build rules and config size/L

Projects

None yet

Development

Successfully merging this pull request may close these issues.

valdi install android fails on a clean bootstrap — generated MODULE.bazel is missing all Android dependency wiring

2 participants