deps: upgrade gpui-component to upstream main (be3c841) and gpui to zed 1a246efd - #174
Merged
Conversation
…ed 1a246efd Bump the gpui-component dependency from the old pinned 196b9259 to current upstream main, consumed via our fork stippi/gpui-component. Because gpui-component depends on gpui via a git dependency, the fork branch (pin-zed-1a246efd, commit bc2fabed) pins the zed git deps to 1a246efd so the workspace resolves to a single copy of gpui (0.2.2); without a rev the bare zed source floats to HEAD, which carries a 0.0.0 placeholder gpui and produces duplicate-gpui type mismatches. Port ui_gpui to the new gpui Styled API: flex_grow() and flex_shrink() now take an explicit f32 factor; the previous no-arg calls meant grow/shrink 1, so they become flex_grow(1.0) / flex_shrink(1.0). Update the release workflow comment: the gpui git deps are now explicitly pinned, so cargo update --workspace keeps them locked.
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.
Bump the gpui-component dependency from the old pinned 196b9259 to current upstream main, consumed via our fork stippi/gpui-component. Because gpui-component depends on gpui via a git dependency, the fork branch (pin-zed-1a246efd, commit bc2fabed) pins the zed git deps to 1a246efd so the workspace resolves to a single copy of gpui (0.2.2); without a rev the bare zed source floats to HEAD, which carries a 0.0.0 placeholder gpui and produces duplicate-gpui type mismatches.
Port ui_gpui to the new gpui Styled API: flex_grow() and flex_shrink() now take an explicit f32 factor; the previous no-arg calls meant grow/shrink 1, so they become flex_grow(1.0) / flex_shrink(1.0).
Update the release workflow comment: the gpui git deps are now explicitly pinned, so cargo update --workspace keeps them locked.