Skip to content

Commit

Permalink
Update some crate dependencies (#3594)
Browse files Browse the repository at this point in the history
Nothing major
  • Loading branch information
emilk authored Nov 21, 2023
1 parent 8c68035 commit e823491
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- name: wasm-bindgen
uses: jetli/wasm-bindgen-action@v0.1.0
with:
version: "0.2.87"
version: "0.2.88"

- run: ./scripts/wasm_bindgen_check.sh --skip-setup

Expand Down
32 changes: 16 additions & 16 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ opt-level = 2

[workspace.dependencies]
puffin = "0.17"
raw-window-handle = "0.5.0"
thiserror = "1.0.37"

wgpu = "0.18.0"
Expand Down
6 changes: 3 additions & 3 deletions crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ egui-winit = { version = "0.23.0", path = "../egui-winit", default-features = fa
image = { version = "0.24", default-features = false, features = [
"png",
] } # Needed for app icon
raw-window-handle = { version = "0.5.0" }
raw-window-handle.workspace = true
winit = { version = "0.28.1", default-features = false }

# optional native:
Expand Down Expand Up @@ -158,7 +158,7 @@ winapi = "0.3.9"
bytemuck = "1.7"
js-sys = "0.3"
percent-encoding = "2.1"
wasm-bindgen = "0.2.87"
wasm-bindgen = "0.2.88"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3.58", features = [
"BinaryType",
Expand Down Expand Up @@ -206,6 +206,6 @@ web-sys = { version = "0.3.58", features = [

# optional web:
egui-wgpu = { version = "0.23.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
raw-window-handle = { version = "0.5.2", optional = true }
raw-window-handle = { workspace = true, optional = true }
tts = { version = "0.25", optional = true, default-features = false }
wgpu = { workspace = true, optional = true }
2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false, feature
"log",
] }
log = { version = "0.4", features = ["std"] }
raw-window-handle = "0.5.0"
raw-window-handle.workspace = true
web-time = { version = "0.2" } # We use web-time so we can (maybe) compile for web
winit = { version = "0.28", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion crates/egui_demo_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ rfd = { version = "0.11", optional = true }

# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "=0.2.87"
wasm-bindgen = "=0.2.88"
wasm-bindgen-futures = "0.4"
web-sys = "0.3"
2 changes: 2 additions & 0 deletions crates/egui_demo_app/src/web.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::mem_forget)] // False positives from #[wasm_bindgen] macro

use eframe::wasm_bindgen::{self, prelude::*};

use crate::WrapApp;
Expand Down
2 changes: 1 addition & 1 deletion crates/egui_demo_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false }
egui_extras = { version = "0.23.0", path = "../egui_extras" }
egui_plot = { version = "0.23.0", path = "../egui_plot" }
log = { version = "0.4", features = ["std"] }
unicode_names2 = { version = "0.6.0", default-features = false }
unicode_names2 = { version = "0.6.0", default-features = false } # this old version has fewer dependencies

#! ### Optional dependencies
chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false, feature
bytemuck = "1.7"
glow = "0.12"
log = { version = "0.4", features = ["std"] }
memoffset = "0.6"
memoffset = "0.7"

#! ### Optional dependencies
## Enable this when generating docs.
Expand All @@ -69,8 +69,8 @@ wasm-bindgen = { version = "0.2" }


[dev-dependencies]
glutin = "0.30" # examples/pure_glow
raw-window-handle = "0.5.0"
glutin = "0.30" # examples/pure_glow
raw-window-handle.workspace = true
glutin-winit = "0.3.0"


Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_web.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ cd "$script_path/.."
rustup target add wasm32-unknown-unknown

# For generating JS bindings:
cargo install wasm-bindgen-cli --version 0.2.87
cargo install wasm-bindgen-cli --version 0.2.88

0 comments on commit e823491

Please sign in to comment.