chore(deps): move to gpui-kit 0.6.0 and crates.io gpui-pre, drop the zed git dependency - #320
Merged
Conversation
…zed git dependency gpui-base 0.6.0 (now published from longbridge/gpui-kit) depends on the crates.io `gpui-pre` snapshot of zed's gpui instead of the zed git repo. Follow it: `gpui`/`gpui_platform` become `gpui-pre`/`gpui-pre-platform` so cargo unifies them with gpui-base's requirement, and every `zed-industries/zed` git reference disappears from Cargo.lock. Also bump gpui-wry / gpui-component-macros to 0.6.0 and switch the assets crate to its new name `gpui-kit-assets` (kept under the old dependency key so `assets.rs` is untouched). API adaptations for gpui-base 0.6.0: - build.rs: the assets `links` key is now `gpui-kit-default-icons`. - theme.rs: `Theme.appearance`, `ColorTokens.selection`, `ScrollbarTheme` builder, `ResizableTheme` handles are `Option`. - menu.rs: `register_deferred_popover` returns an RAII token; hold it in `ContextMenuState` and drop it on dismiss. Verified: cargo check --all-targets, clippy clean, cargo test --workspace green.
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.
Why
gpui-base0.6.0 is now published from longbridge/gpui-kit and depends on the crates.iogpui-presnapshot of zed's gpui instead of the zed git repo. Following it lets cargo unify ourgpuiwith gpui-base's requirement, so the gpui version is driven by gpui-base's semver range and everyzed-industries/zedgit reference disappears fromCargo.lock.gpuistays a direct dependency because gpui-base does not re-export it (76 files incrates/uiusegpui::paths), but it is nowgpui = { package = "gpui-pre", version = "0.3.1" }rather than a hand-aligned git rev.What
crates/ui,crates/app:gpui→gpui-pre,gpui_platform→gpui-pre-platform;gpui-base,gpui-wry,gpui-component-macros→ crates.io 0.6.0; assets crate renamed togpui-kit-assets(kept under the old dependency key,assets.rsuntouched).crates/ui/build.rs: assetslinkskey is nowgpui-kit-default-icons.crates/ui/src/theme.rs: gpui-base 0.6.0 addsTheme.appearanceandColorTokens.selection, makesScrollbarThemebuilder-only, and turnsResizableThemehandles intoOption.crates/ui/src/widgets/menu.rs:register_deferred_popovernow returns an RAII token andunregister_deferred_popoveris gone; the token lives inContextMenuStateand is dropped on dismiss.Verification
cargo check --workspace --all-targets✅cargo clippy --workspace --all-targets— no warnings ✅cargo test --workspace— all green (tcode-ui: 301 passed) ✅Note
Cargo resolved
gpui-pre0.3.3 (zed@5b055fa) while gpui-base was published against 0.3.1 (zed@801c087). gpui-pre patch versions are distinct zed snapshots, socargo updatecan move gpui ahead of what gpui-base was tested with. That is how gpui-kit itself consumes it; builds and tests are clean at 0.3.3.Not visually verified in the running app: context menu popovers, scrollbar styling, and resize handle colours are the behaviour-touching spots.