Skip to content

Commit

Permalink
upstreamed iced-rs/iced#2197
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Jan 12, 2024
1 parent dd80b44 commit e1a397c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
18 changes: 9 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@ bevy_utils = { git = "https://github.com/bevyengine/bevy", branch = "main" }
bevy_window = { git = "https://github.com/bevyengine/bevy", branch = "main" }

# NOTE: temp using "master" branch until a release with wgpu version matching bevy
# NOTE: temp using "wgpu-renderer-send" because the `wgpu::Renderer` is no longer `Send` on master
# iced_core = "0.10"
# iced_runtime = "0.1"
# iced_wgpu = "0.11"
# iced_widget = "0.1"
# iced_renderer = { version = "0.1", features = ["wgpu"] }
iced_core = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" }
iced_runtime = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" }
iced_wgpu = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" }
iced_widget = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" }
iced_renderer = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send", features = ["wgpu"]}
iced_core = { git = "https://github.com/iced-rs/iced/", branch = "master" }
iced_runtime = { git = "https://github.com/iced-rs/iced/", branch = "master" }
iced_wgpu = { git = "https://github.com/iced-rs/iced/", branch = "master" }
iced_widget = { git = "https://github.com/iced-rs/iced/", branch = "master" }
iced_renderer = { git = "https://github.com/iced-rs/iced/", branch = "master", features = ["wgpu"]}

[dev-dependencies]
# bevy = "0.12"
Expand Down

0 comments on commit e1a397c

Please sign in to comment.