skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put all egui crates as workspace crates (#3976) 

Second attempty
This commit is contained in:
Emil Ernerfeldt 2024-02-05 12:59:49 +01:00 committed by GitHub
parent bcebfecb84
commit d02491425c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 82 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.toml
View File

@ -48,6 +48,18 @@ opt-level = 2
[workspace.dependencies] [workspace.dependencies]
emath = { version = "0.25.0", path = "crates/emath", default-features = false }
ecolor = { version = "0.25.0", path = "crates/ecolor", default-features = false }
epaint = { version = "0.25.0", path = "crates/epaint", default-features = false }
egui = { version = "0.25.0", path = "crates/egui", default-features = false }
egui_plot = { version = "0.25.0", path = "crates/egui_plot", default-features = false }
egui-winit = { version = "0.25.0", path = "crates/egui-winit", default-features = false }
egui_extras = { version = "0.25.0", path = "crates/egui_extras", default-features = false }
egui-wgpu = { version = "0.25.0", path = "crates/egui-wgpu", default-features = false }
egui_demo_lib = { version = "0.25.0", path = "crates/egui_demo_lib", default-features = false }
egui_glow = { version = "0.25.0", path = "crates/egui_glow", default-features = false }
eframe = { version = "0.25.0", path = "crates/eframe", default-features = false }
#TODO(emilk): make more things workspace dependencies #TODO(emilk): make more things workspace dependencies
ahash = { version = "0.8.6", default-features = false, features = [ ahash = { version = "0.8.6", default-features = false, features = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead

10
crates/eframe/Cargo.toml
View File

@ -121,7 +121,7 @@ x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11"]
__screenshot = [] __screenshot = []
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [ egui = { workspace = true, default-features = false, features = [
"bytemuck", "bytemuck",
"log", "log",
] } ] }
@ -136,7 +136,7 @@ web-time.workspace = true
# Optional dependencies # Optional dependencies
egui_glow = { version = "0.25.0", path = "../egui_glow", optional = true, default-features = false } egui_glow = { workspace = true, optional = true, default-features = false }
glow = { workspace = true, optional = true } glow = { workspace = true, optional = true }
# glutin stuck on old version of raw-window-handle: # glutin stuck on old version of raw-window-handle:
rwh_05 = { package = "raw-window-handle", version = "0.5.2", optional = true, features = [ rwh_05 = { package = "raw-window-handle", version = "0.5.2", optional = true, features = [
@ -148,7 +148,7 @@ serde = { version = "1", optional = true, features = ["derive"] }
# ------------------------------------------- # -------------------------------------------
# native: # native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", default-features = false, features = [ egui-winit = { workspace = true, default-features = false, features = [
"clipboard", "clipboard",
"links", "links",
] } ] }
@ -159,7 +159,7 @@ winit = { workspace = true, default-features = false, features = ["rwh_06"] }
# optional native: # optional native:
directories-next = { version = "2", optional = true } directories-next = { version = "2", optional = true }
egui-wgpu = { version = "0.25.0", path = "../egui-wgpu", optional = true, features = [ egui-wgpu = { workspace = true, optional = true, features = [
"winit", "winit",
] } # if wgpu is used, use it with winit ] } # if wgpu is used, use it with winit
pollster = { version = "0.3", optional = true } # needed for wgpu pollster = { version = "0.3", optional = true } # needed for wgpu
@ -238,5 +238,5 @@ web-sys = { version = "0.3.58", features = [
] } ] }
# optional web: # optional web:
egui-wgpu = { version = "0.25.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit egui-wgpu = { workspace = true, optional = true } # if wgpu is used, use it without (!) winit
wgpu = { workspace = true, optional = true } wgpu = { workspace = true, optional = true }

8
crates/egui-wgpu/Cargo.toml
View File

@ -28,6 +28,8 @@ all-features = true
[features] [features]
default = []
## Enable profiling with the [`puffin`](https://docs.rs/puffin) crate. ## Enable profiling with the [`puffin`](https://docs.rs/puffin) crate.
puffin = ["dep:puffin"] puffin = ["dep:puffin"]
@ -42,10 +44,8 @@ x11 = ["winit?/x11"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false } egui = { workspace = true, default-features = false }
epaint = { version = "0.25.0", path = "../epaint", default-features = false, features = [ epaint = { workspace = true, default-features = false, features = ["bytemuck"] }
"bytemuck",
] }
bytemuck = "1.7" bytemuck = "1.7"
document-features.workspace = true document-features.workspace = true

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

@ -55,9 +55,7 @@ wayland = ["winit/wayland", "bytemuck"]
x11 = ["winit/x11", "bytemuck"] x11 = ["winit/x11", "bytemuck"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [ egui = { workspace = true, default-features = false, features = ["log"] }
"log",
] }
log.workspace = true log.workspace = true
raw-window-handle.workspace = true raw-window-handle.workspace = true
web-time.workspace = true web-time.workspace = true

2
crates/egui/Cargo.toml
View File

@ -81,7 +81,7 @@ unity = ["epaint/unity"]
[dependencies] [dependencies]
epaint = { version = "0.25.0", path = "../epaint", default-features = false } epaint = { workspace = true, default-features = false }
ahash.workspace = true ahash.workspace = true
nohash-hasher.workspace = true nohash-hasher.workspace = true

13
crates/egui_demo_app/Cargo.toml
View File

@ -38,20 +38,17 @@ chrono = { version = "0.4", default-features = false, features = [
"js-sys", "js-sys",
"wasmbind", "wasmbind",
] } ] }
eframe = { version = "0.25.0", path = "../eframe", default-features = false, features = [ eframe = { workspace = true, default-features = false, features = [
"web_screen_reader", "web_screen_reader",
] } ] }
egui = { version = "0.25.0", path = "../egui", features = [ egui = { workspace = true, features = [
"callstack", "callstack",
"default",
"extra_debug_asserts", "extra_debug_asserts",
"log", "log",
] } ] }
egui_demo_lib = { version = "0.25.0", path = "../egui_demo_lib", features = [ egui_demo_lib = { workspace = true, features = ["default", "chrono"] }
"chrono", egui_extras = { workspace = true, features = ["default", "image"] }
] }
egui_extras = { version = "0.25.0", path = "../egui_extras", features = [
"image",
] }
log.workspace = true log.workspace = true
# Optional dependencies: # Optional dependencies:

9
crates/egui_demo_lib/Cargo.toml
View File

@ -38,11 +38,12 @@ syntect = ["egui_extras/syntect"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false } egui = { workspace = true, default-features = false }
egui_extras = { version = "0.25.0", path = "../egui_extras" } egui_extras = { workspace = true, features = ["default"] }
egui_plot = { version = "0.25.0", path = "../egui_plot" } egui_plot = { workspace = true, features = ["default"] }
log.workspace = true log.workspace = true
unicode_names2 = { version = "0.6.0", default-features = false } # this old version has fewer dependencies 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"] }

5
crates/egui_extras/Cargo.toml
View File

@ -60,9 +60,8 @@ syntect = ["dep:syntect"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [ egui = { workspace = true, default-features = false, features = ["serde"] }
"serde",
] }
enum-map = { version = "2", features = ["serde"] } enum-map = { version = "2", features = ["serde"] }
log.workspace = true log.workspace = true
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }

6
crates/egui_glow/Cargo.toml
View File

@ -50,9 +50,7 @@ x11 = ["winit?/x11"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [ egui = { workspace = true, default-features = false, features = ["bytemuck"] }
"bytemuck",
] }
bytemuck = "1.7" bytemuck = "1.7"
glow.workspace = true glow.workspace = true
@ -69,7 +67,7 @@ document-features = { workspace = true, optional = true }
# Native: # Native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", optional = true, default-features = false } egui-winit = { workspace = true, optional = true, default-features = false }
puffin = { workspace = true, optional = true } puffin = { workspace = true, optional = true }
winit = { workspace = true, optional = true, default-features = false, features = [ winit = { workspace = true, optional = true, default-features = false, features = [
"rwh_05", # glutin stuck on old version of raw-window-handle "rwh_05", # glutin stuck on old version of raw-window-handle

2
crates/egui_plot/Cargo.toml
View File

@ -32,7 +32,7 @@ serde = ["dep:serde", "egui/serde"]
[dependencies] [dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false } egui = { workspace = true, default-features = false }
#! ### Optional dependencies #! ### Optional dependencies

4
crates/epaint/Cargo.toml
View File

@ -80,8 +80,8 @@ serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde"]
unity = [] unity = []
[dependencies] [dependencies]
emath = { version = "0.25.0", path = "../emath" } emath.workspace = true
ecolor = { version = "0.25.0", path = "../ecolor" } ecolor.workspace = true
ab_glyph = "0.2.11" ab_glyph = "0.2.11"
ahash.workspace = true ahash.workspace = true

3
examples/confirm_exit/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/custom_3d_glow/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/custom_font/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/custom_font_style/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

5
examples/custom_plot_manipulation/Cargo.toml
View File

@ -9,10 +9,11 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
egui_plot = { path = "../../crates/egui_plot" } egui_plot.workspace = true
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [
"auto-color", "auto-color",
"humantime", "humantime",

3
examples/custom_window_frame/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/file_dialog/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

5
examples/hello_world/Cargo.toml
View File

@ -9,12 +9,13 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
# For image support: # For image support:
egui_extras = { path = "../../crates/egui_extras", features = ["image"] } egui_extras = { workspace = true, features = ["default", "image"] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [
"auto-color", "auto-color",

2
examples/hello_world_par/Cargo.toml
View File

@ -9,7 +9,7 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", default-features = false, features = [ eframe = { workspace = true, default-features = false, features = [
# accesskit struggles with threading # accesskit struggles with threading
"default_fonts", "default_fonts",
"wgpu", "wgpu",

3
examples/hello_world_simple/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

5
examples/images/Cargo.toml
View File

@ -9,10 +9,11 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
egui_extras = { path = "../../crates/egui_extras", features = ["all_loaders"] } egui_extras = { workspace = true, features = ["default", "all_loaders"] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [
"auto-color", "auto-color",
"humantime", "humantime",

3
examples/keyboard_events/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/multiple_viewports/Cargo.toml
View File

@ -11,7 +11,8 @@ publish = false
wgpu = ["eframe/wgpu"] wgpu = ["eframe/wgpu"]
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/puffin_profiler/Cargo.toml
View File

@ -13,7 +13,8 @@ wgpu = ["eframe/wgpu"]
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"puffin", "puffin",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }

5
examples/save_plot/Cargo.toml
View File

@ -8,10 +8,11 @@ rust-version = "1.72"
publish = false publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
egui_plot = { path = "../../crates/egui_plot" } egui_plot.workspace = true
image = { version = "0.24", default-features = false, features = ["png"] } image = { version = "0.24", default-features = false, features = ["png"] }
rfd = "0.11.0" rfd = "0.11.0"
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/screenshot/Cargo.toml
View File

@ -12,7 +12,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
"wgpu", "wgpu",
] } ] }

3
examples/serial_windows/Cargo.toml
View File

@ -9,7 +9,8 @@ publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

2
examples/test_inline_glow_paint/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe" } eframe = { workspace = true, features = ["default"] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [
"auto-color", "auto-color",
"humantime", "humantime",

3
examples/test_viewports/Cargo.toml
View File

@ -11,7 +11,8 @@ publish = false
wgpu = ["eframe/wgpu"] wgpu = ["eframe/wgpu"]
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [

3
examples/user_attention/Cargo.toml
View File

@ -8,7 +8,8 @@ rust-version = "1.72"
publish = false publish = false
[dependencies] [dependencies]
eframe = { path = "../../crates/eframe", features = [ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] } ] }
env_logger = { version = "0.10", default-features = false, features = [ env_logger = { version = "0.10", default-features = false, features = [