github
/
egui
mirror of https://github.com/emilk/egui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update some crate dependencies (#3594) 

Nothing major
pull/3598/head
Emil Ernerfeldt 12 months ago
committed by GitHub
parent
8c68035b66
commit
e823491240
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .github/workflows/rust.yml
  2. 32
      Cargo.lock
  3. 1
      Cargo.toml
  4. 6
      crates/eframe/Cargo.toml
  5. 2
      crates/egui-winit/Cargo.toml
  6. 2
      crates/egui_demo_app/Cargo.toml
  7. 2
      crates/egui_demo_app/src/web.rs
  8. 2
      crates/egui_demo_lib/Cargo.toml
  9. 6
      crates/egui_glow/Cargo.toml
  10. 2
      scripts/setup_web.sh

2
.github/workflows/rust.yml
View File

@ -118,7 +118,7 @@ jobs:
- name: wasm-bindgen - name: wasm-bindgen
uses: jetli/wasm-bindgen-action@v0.1.0 uses: jetli/wasm-bindgen-action@v0.1.0
with: with:
version: "0.2.87" version: "0.2.88"
- run: ./scripts/wasm_bindgen_check.sh --skip-setup - run: ./scripts/wasm_bindgen_check.sh --skip-setup

32
Cargo.lock
View File

@ -1054,7 +1054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
dependencies = [ dependencies = [
"bitflags 2.4.0", "bitflags 2.4.0",
"libloading 0.8.0", "libloading 0.7.4",
"winapi", "winapi",
] ]
@ -1159,7 +1159,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [ dependencies = [
"libloading 0.8.0", "libloading 0.7.4",
] ]
[[package]] [[package]]
@ -1371,7 +1371,7 @@ dependencies = [
"glutin", "glutin",
"glutin-winit", "glutin-winit",
"log", "log",
"memoffset 0.6.5", "memoffset 0.7.1",
"puffin", "puffin",
"raw-window-handle", "raw-window-handle",
"wasm-bindgen", "wasm-bindgen",
@ -4187,9 +4187,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"wasm-bindgen-macro", "wasm-bindgen-macro",
@ -4197,9 +4197,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"log", "log",
@ -4224,9 +4224,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -4234,9 +4234,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4247,9 +4247,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.87" version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
[[package]] [[package]]
name = "wayland-client" name = "wayland-client"
@ -4451,7 +4451,7 @@ dependencies = [
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
"libloading 0.8.0", "libloading 0.7.4",
"log", "log",
"metal", "metal",
"naga", "naga",
@ -4735,9 +4735,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.28.6" version = "0.28.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
dependencies = [ dependencies = [
"android-activity", "android-activity",
"bitflags 1.3.2", "bitflags 1.3.2",

1
Cargo.toml
View File

@ -37,6 +37,7 @@ opt-level = 2
[workspace.dependencies] [workspace.dependencies]
puffin = "0.17" puffin = "0.17"
raw-window-handle = "0.5.0"
thiserror = "1.0.37" thiserror = "1.0.37"
wgpu = "0.18.0" wgpu = "0.18.0"

6
crates/eframe/Cargo.toml
View File

@ -126,7 +126,7 @@ egui-winit = { version = "0.23.0", path = "../egui-winit", default-features = fa
image = { version = "0.24", default-features = false, features = [ image = { version = "0.24", default-features = false, features = [
"png", "png",
] } # Needed for app icon ] } # Needed for app icon
raw-window-handle = { version = "0.5.0" } raw-window-handle.workspace = true
winit = { version = "0.28.1", default-features = false } winit = { version = "0.28.1", default-features = false }
# optional native: # optional native:
@ -158,7 +158,7 @@ winapi = "0.3.9"
bytemuck = "1.7" bytemuck = "1.7"
js-sys = "0.3" js-sys = "0.3"
percent-encoding = "2.1" percent-encoding = "2.1"
wasm-bindgen = "0.2.87" wasm-bindgen = "0.2.88"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3.58", features = [ web-sys = { version = "0.3.58", features = [
"BinaryType", "BinaryType",
@ -206,6 +206,6 @@ web-sys = { version = "0.3.58", features = [
# optional web: # optional web:
egui-wgpu = { version = "0.23.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit 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 } tts = { version = "0.25", optional = true, default-features = false }
wgpu = { workspace = true, optional = true } wgpu = { workspace = true, optional = true }

2
crates/egui-winit/Cargo.toml
View File

@ -59,7 +59,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false, feature
"log", "log",
] } ] }
log = { version = "0.4", features = ["std"] } 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 web-time = { version = "0.2" } # We use web-time so we can (maybe) compile for web
winit = { version = "0.28", default-features = false } winit = { version = "0.28", default-features = false }

2
crates/egui_demo_app/Cargo.toml
View File

@ -73,6 +73,6 @@ rfd = { version = "0.11", optional = true }
# web: # web:
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "=0.2.87" wasm-bindgen = "=0.2.88"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"
web-sys = "0.3" web-sys = "0.3"

2
crates/egui_demo_app/src/web.rs
View File

@ -1,3 +1,5 @@
#![allow(clippy::mem_forget)] // False positives from #[wasm_bindgen] macro
use eframe::wasm_bindgen::{self, prelude::*}; use eframe::wasm_bindgen::{self, prelude::*};
use crate::WrapApp; use crate::WrapApp;

2
crates/egui_demo_lib/Cargo.toml
View File

@ -42,7 +42,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false }
egui_extras = { version = "0.23.0", path = "../egui_extras" } egui_extras = { version = "0.23.0", path = "../egui_extras" }
egui_plot = { version = "0.23.0", path = "../egui_plot" } egui_plot = { version = "0.23.0", path = "../egui_plot" }
log = { version = "0.4", features = ["std"] } 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 #! ### Optional dependencies
chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] } chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] }

6
crates/egui_glow/Cargo.toml
View File

@ -51,7 +51,7 @@ egui = { version = "0.23.0", path = "../egui", default-features = false, feature
bytemuck = "1.7" bytemuck = "1.7"
glow = "0.12" glow = "0.12"
log = { version = "0.4", features = ["std"] } log = { version = "0.4", features = ["std"] }
memoffset = "0.6" memoffset = "0.7"
#! ### Optional dependencies #! ### Optional dependencies
## Enable this when generating docs. ## Enable this when generating docs.
@ -69,8 +69,8 @@ wasm-bindgen = { version = "0.2" }
[dev-dependencies] [dev-dependencies]
glutin = "0.30" # examples/pure_glow glutin = "0.30" # examples/pure_glow
raw-window-handle = "0.5.0" raw-window-handle.workspace = true
glutin-winit = "0.3.0" glutin-winit = "0.3.0"

2
scripts/setup_web.sh
View File

@ -7,4 +7,4 @@ cd "$script_path/.."
rustup target add wasm32-unknown-unknown rustup target add wasm32-unknown-unknown
# For generating JS bindings: # For generating JS bindings:
cargo install wasm-bindgen-cli --version 0.2.87 cargo install wasm-bindgen-cli --version 0.2.88

Write Preview
Loading…
Cancel
Save