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.

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

bump bevy_tasks futures-lite to 2.0.1 #10675

Merged
merged 6 commits into from
Nov 24, 2023

Conversation

tbillington
Copy link
Contributor

Objective

Updates futures-lite in bevy_tasks to the next major version (1 -> 2).

Also removes the duplication of futures-lite, as async-fs requires v 2, so there are currently 2 copies of futures-lite in the dependency tree.

Futures-lite has received a number of updates since bevy's current version 1.4.

@alice-i-cecile alice-i-cecile added C-Dependencies A change to the crates that Bevy depends on A-Tasks Tools for parallel and async work labels Nov 21, 2023
@hymm
Copy link
Contributor

hymm commented Nov 22, 2023

looking at cargo tree there are still other versions of futures-lite < 2 in tree. One in bevy_assets and one in dev-dependencies. I also think we'd need to upgrade async-fs to v2 to remove futures lite 1. We should at least do the explicit dependencies in bevy_assets and the root Cargo.toml in this pr.

edit: async-fs will be updated in this pr #10370

@tbillington
Copy link
Contributor Author

Good catch @hymm , I think I accidentally ran cargo tree in my project repo instead of bevy so I missed those.

I will re-investigate after #10370 is merged :)

@alice-i-cecile
Copy link
Member

Merging the linked PR for you now :)

@tbillington
Copy link
Contributor Author

I've updated all usages of futures-lite and async-executor which was using v1. Running cargo tree now only gives me futures-lite 2.0.1.

@alice-i-cecile alice-i-cecile added this pull request to the merge queue Nov 23, 2023
@alice-i-cecile alice-i-cecile removed this pull request from the merge queue due to a manual request Nov 23, 2023
Cargo.toml Outdated Show resolved Hide resolved
Co-authored-by: Mike <mike.hsu@gmail.com>
@alice-i-cecile
Copy link
Member

@tbillington I resolved the formatting issue for you :)

@mockersf mockersf 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 Nov 23, 2023
@alice-i-cecile alice-i-cecile added this pull request to the merge queue Nov 24, 2023
Merged via the queue into bevyengine:main with commit 6f56380 Nov 24, 2023
26 of 27 checks passed
@tbillington tbillington deleted the bump-futures-lite branch November 24, 2023 11:54
rdrpenguin04 pushed a commit to rdrpenguin04/bevy that referenced this pull request Jan 9, 2024
# Objective

Updates [`futures-lite`](https://github.com/smol-rs/futures-lite) in
bevy_tasks to the next major version (1 -> 2).

Also removes the duplication of `futures-lite`, as `async-fs` requires v
2, so there are currently 2 copies of futures-lite in the dependency
tree.

Futures-lite has received [a number of
updates](https://github.com/smol-rs/futures-lite/blob/master/CHANGELOG.md)
since bevy's current version `1.4`.

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: Mike <mike.hsu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Tasks Tools for parallel and async work C-Dependencies A change to the crates that Bevy depends on 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
Development

Successfully merging this pull request may close these issues.

4 participants