Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update wgpu to v0.19.3 and unpin web-sys. #12247

Merged
merged 2 commits into from
Mar 2, 2024
Merged

Update wgpu to v0.19.3 and unpin web-sys. #12247

merged 2 commits into from
Mar 2, 2024

Conversation

xStrom
Copy link
Contributor

@xStrom xStrom commented Mar 2, 2024

Objective

This PR unpins web-sys so that unrelated projects that have bevy_render in their workspace can finally update their web-sys.
More details in and fixes #12246.

Solution

  • Update wgpu from 0.19.1 to 0.19.3.
  • Remove the web-sys pin.
  • Update docs and wasm helper to remove the now-stale --cfg=web_sys_unstable_apis Rust flag.

Changelog

Updated wgpu to v0.19.3 and removed web-sys pin.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 2, 2024

Welcome, new contributor!

Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨

alice-i-cecile
alice-i-cecile reviewed Mar 2, 2024
View reviewed changes
crates/bevy_color/Cargo.toml
@@ -16,7 +16,7 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
bytemuck = "1"
serde = "1.0"
thiserror = "1.0"
wgpu = { version = "0.19.1", default-features = false }
wgpu = { version = "0.19.3", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should just specify 0.19 here and elsewhere: the minor version is actually ignored by Cargo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.19.0, 0.19.1, 0.19.2 have the problematic dependency. The 0.19.3 is a real dependency.

I assume by "ignored by Cargo" you mean that Cargo prefers the latest version by default. Because with the 0.19.3 requirement Cargo will never build with anything lower.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cargo does use the minor version. This is specifying at least 0.19.3.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right yep :)

@alice-i-cecile
Copy link
Member

@cwfitzgerald, can you give this a look from the wgpu side?

@alice-i-cecile
Copy link
Member

Previously discussed and added in #10163

@alice-i-cecile alice-i-cecile added C-Dependencies A change to the crates that Bevy depends on C-Code-Quality A section of code that is hard to understand or change A-Rendering Drawing game state to the screen C-Usability A targeted quality-of-life change that makes Bevy easier to use labels Mar 2, 2024
@alice-i-cecile alice-i-cecile added this to the 0.13.1 milestone Mar 2, 2024
cwfitzgerald
cwfitzgerald approved these changes Mar 2, 2024
View reviewed changes
Copy link

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@alice-i-cecile alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Mar 2, 2024
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Mar 2, 2024
@alice-i-cecile
Copy link
Member

Thanks a ton for bringing this to our attention and preparing a patch :)

Merged via the queue into bevyengine:main with commit 165c360 Mar 2, 2024
34 checks passed
@xStrom xStrom deleted the websys branch March 2, 2024 01:00
@xStrom xStrom mentioned this pull request Mar 2, 2024
Merged
mockersf pushed a commit that referenced this pull request Mar 2, 2024
@xStrom @mockersf
Update wgpu to v0.19.3 and unpin web-sys. (#12247)
f4df8b8 
This PR unpins `web-sys` so that unrelated projects that have
`bevy_render` in their workspace can finally update their `web-sys`.
More details in and fixes #12246.

* Update `wgpu` from 0.19.1 to 0.19.3.
* Remove the `web-sys` pin.
* Update docs and wasm helper to remove the now-stale
`--cfg=web_sys_unstable_apis` Rust flag.

---

Updated `wgpu` to v0.19.3 and removed `web-sys` pin.
spectria-limina pushed a commit to spectria-limina/bevy that referenced this pull request Mar 9, 2024
@xStrom @spectria-limina
Update wgpu to v0.19.3 and unpin web-sys. (bevyengine#12247)
1e15d3d 
# Objective

This PR unpins `web-sys` so that unrelated projects that have
`bevy_render` in their workspace can finally update their `web-sys`.
More details in and fixes bevyengine#12246.

## Solution

* Update `wgpu` from 0.19.1 to 0.19.3.
* Remove the `web-sys` pin.
* Update docs and wasm helper to remove the now-stale
`--cfg=web_sys_unstable_apis` Rust flag.

---

## Changelog

Updated `wgpu` to v0.19.3 and removed `web-sys` pin.
mnmaita added a commit to mnmaita/dragonskale that referenced this pull request May 1, 2024
@mnmaita
Removes obsolete web_sys_unstable_apis cfg argument
b2df081 
This is no longer necessary since bevy 0.13.1.See bevyengine/bevy#12247 for further details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hymm hymm hymm left review comments

@alice-i-cecile alice-i-cecile alice-i-cecile left review comments

@cwfitzgerald cwfitzgerald cwfitzgerald approved these changes

@mockersf mockersf mockersf approved these changes

@rparrett rparrett Awaiting requested review from rparrett

@mnmaita mnmaita Awaiting requested review from mnmaita

@nicopap nicopap Awaiting requested review from nicopap

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen C-Code-Quality A section of code that is hard to understand or change C-Dependencies A change to the crates that Bevy depends on C-Usability A targeted quality-of-life change that makes Bevy easier to use S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it
Projects
None yet
Milestone
0.13.1
Development

Successfully merging this pull request may close these issues.

web-sys doesn't need to be pinned any more
5 participants
@xStrom @alice-i-cecile @hymm @cwfitzgerald @mockersf