From 00cd671ad8db895438f66b8995ea05199a9333ed Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 1 Feb 2024 20:23:11 +0100 Subject: [PATCH] Use workspace dependencies for the egui crates --- Cargo.toml | 12 ++++++++++++ crates/eframe/Cargo.toml | 10 +++++----- crates/egui-wgpu/Cargo.toml | 6 ++---- crates/egui-winit/Cargo.toml | 2 +- crates/egui/Cargo.toml | 2 +- crates/egui_demo_app/Cargo.toml | 8 ++++---- crates/egui_demo_lib/Cargo.toml | 6 +++--- crates/egui_extras/Cargo.toml | 2 +- crates/egui_glow/Cargo.toml | 4 ++-- crates/egui_plot/Cargo.toml | 2 +- crates/epaint/Cargo.toml | 4 ++-- examples/confirm_exit/Cargo.toml | 2 +- examples/custom_3d_glow/Cargo.toml | 2 +- examples/custom_font/Cargo.toml | 2 +- examples/custom_font_style/Cargo.toml | 2 +- examples/custom_plot_manipulation/Cargo.toml | 4 ++-- examples/custom_window_frame/Cargo.toml | 2 +- examples/file_dialog/Cargo.toml | 2 +- examples/hello_world/Cargo.toml | 4 ++-- examples/hello_world_par/Cargo.toml | 2 +- examples/hello_world_simple/Cargo.toml | 2 +- examples/images/Cargo.toml | 4 ++-- examples/keyboard_events/Cargo.toml | 2 +- examples/multiple_viewports/Cargo.toml | 2 +- examples/puffin_profiler/Cargo.toml | 2 +- examples/save_plot/Cargo.toml | 4 ++-- examples/screenshot/Cargo.toml | 2 +- examples/serial_windows/Cargo.toml | 2 +- examples/test_inline_glow_paint/Cargo.toml | 2 +- examples/test_viewports/Cargo.toml | 2 +- examples/user_attention/Cargo.toml | 2 +- 31 files changed, 58 insertions(+), 48 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0ed6d93a9..a91bf042e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,18 @@ opt-level = 2 [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 } + criterion = { version = "0.5.1", default-features = false } glow = "0.13" puffin = "0.19" diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index baa087a8f..147c4ac1e 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -121,7 +121,7 @@ x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11"] __screenshot = [] [dependencies] -egui = { path = "../egui", default-features = false, features = [ +egui = { workspace = true, default-features = false, features = [ "bytemuck", "log", ] } @@ -136,7 +136,7 @@ web-time.workspace = true ## Enable this when generating docs. document-features = { version = "0.2", optional = true } -egui_glow = { path = "../egui_glow", optional = true, default-features = false } +egui_glow = { workspace = true, optional = true, default-features = false } glow = { workspace = true, optional = true } # glutin stuck on old version of raw-window-handle: 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: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -egui-winit = { path = "../egui-winit", default-features = false, features = [ +egui-winit = { workspace = true, default-features = false, features = [ "clipboard", "links", ] } @@ -159,7 +159,7 @@ winit = { workspace = true, default-features = false, features = ["rwh_06"] } # optional native: directories-next = { version = "2", optional = true } -egui-wgpu = { path = "../egui-wgpu", optional = true, features = [ +egui-wgpu = { workspace = true, optional = true, features = [ "winit", ] } # if wgpu is used, use it with winit pollster = { version = "0.3", optional = true } # needed for wgpu @@ -238,5 +238,5 @@ web-sys = { version = "0.3.58", features = [ ] } # optional web: -egui-wgpu = { 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 } diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index 198a80243..4292aed7c 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -42,10 +42,8 @@ x11 = ["winit?/x11"] [dependencies] -egui = { path = "../egui", default-features = false } -epaint = { path = "../epaint", default-features = false, features = [ - "bytemuck", -] } +egui = { workspace = true, default-features = false } +epaint = { workspace = true, default-features = false, features = ["bytemuck"] } bytemuck = "1.7" log = { version = "0.4", features = ["std"] } diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 41dc06dc3..77e9f1905 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -55,7 +55,7 @@ wayland = ["winit/wayland", "bytemuck"] x11 = ["winit/x11", "bytemuck"] [dependencies] -egui = { path = "../egui", default-features = false, features = ["log"] } +egui = { workspace = true, default-features = false, features = ["log"] } log = { version = "0.4", features = ["std"] } raw-window-handle.workspace = true web-time.workspace = true diff --git a/crates/egui/Cargo.toml b/crates/egui/Cargo.toml index 21ce73a24..2e005f370 100644 --- a/crates/egui/Cargo.toml +++ b/crates/egui/Cargo.toml @@ -81,7 +81,7 @@ unity = ["epaint/unity"] [dependencies] -epaint = { path = "../epaint", default-features = false } +epaint = { workspace = true, default-features = false } 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 diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 68ac22a03..e01cdc967 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -38,16 +38,16 @@ chrono = { version = "0.4", default-features = false, features = [ "js-sys", "wasmbind", ] } -eframe = { path = "../eframe", default-features = false, features = [ +eframe = { workspace = true, default-features = false, features = [ "web_screen_reader", ] } -egui = { path = "../egui", features = [ +egui = { workspace = true, features = [ "callstack", "extra_debug_asserts", "log", ] } -egui_demo_lib = { path = "../egui_demo_lib", features = ["chrono"] } -egui_extras = { path = "../egui_extras", features = ["image"] } +egui_demo_lib = { workspace = true, features = ["chrono"] } +egui_extras = { workspace = true, features = ["image"] } log = { version = "0.4", features = ["std"] } # Optional dependencies: diff --git a/crates/egui_demo_lib/Cargo.toml b/crates/egui_demo_lib/Cargo.toml index 2fca8ede4..b9326e088 100644 --- a/crates/egui_demo_lib/Cargo.toml +++ b/crates/egui_demo_lib/Cargo.toml @@ -38,9 +38,9 @@ syntect = ["egui_extras/syntect"] [dependencies] -egui = { path = "../egui", default-features = false } -egui_extras = { path = "../egui_extras" } -egui_plot = { path = "../egui_plot" } +egui = { workspace = true, default-features = false } +egui_extras.workspace = true +egui_plot.workspace = true log = { version = "0.4", features = ["std"] } unicode_names2 = { version = "0.6.0", default-features = false } # this old version has fewer dependencies diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml index a3af4f3c9..1c2306bcd 100644 --- a/crates/egui_extras/Cargo.toml +++ b/crates/egui_extras/Cargo.toml @@ -60,7 +60,7 @@ syntect = ["dep:syntect"] [dependencies] -egui = { path = "../egui", default-features = false, features = ["serde"] } +egui = { workspace = true, default-features = false, features = ["serde"] } enum-map = { version = "2", features = ["serde"] } log = { version = "0.4", features = ["std"] } serde = { version = "1", features = ["derive"] } diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index a50c3b94f..3db93bc0a 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -50,7 +50,7 @@ x11 = ["winit?/x11"] [dependencies] -egui = { path = "../egui", default-features = false, features = ["bytemuck"] } +egui = { workspace = true, default-features = false, features = ["bytemuck"] } bytemuck = "1.7" glow.workspace = true @@ -67,7 +67,7 @@ document-features = { version = "0.2", optional = true } # Native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -egui-winit = { path = "../egui-winit", optional = true, default-features = false } +egui-winit = { workspace = true, optional = true, default-features = false } puffin = { workspace = true, optional = true } winit = { workspace = true, optional = true, default-features = false, features = [ "rwh_05", # glutin stuck on old version of raw-window-handle diff --git a/crates/egui_plot/Cargo.toml b/crates/egui_plot/Cargo.toml index 3230b07d9..12f78c17b 100644 --- a/crates/egui_plot/Cargo.toml +++ b/crates/egui_plot/Cargo.toml @@ -32,7 +32,7 @@ serde = ["dep:serde", "egui/serde"] [dependencies] -egui = { path = "../egui", default-features = false } +egui = { workspace = true, default-features = false } #! ### Optional dependencies diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml index 52f69dd43..1dc860e9d 100644 --- a/crates/epaint/Cargo.toml +++ b/crates/epaint/Cargo.toml @@ -80,8 +80,8 @@ serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde"] unity = [] [dependencies] -emath = { path = "../emath" } -ecolor = { path = "../ecolor" } +emath.workspace = true +ecolor.workspace = true ab_glyph = "0.2.11" ahash = { version = "0.8.1", default-features = false, features = [ diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml index 2b0fae85d..bda7720fc 100644 --- a/examples/confirm_exit/Cargo.toml +++ b/examples/confirm_exit/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml index 0d268759c..8427fbab8 100644 --- a/examples/custom_3d_glow/Cargo.toml +++ b/examples/custom_3d_glow/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml index 0eec65cd4..f3412fe87 100644 --- a/examples/custom_font/Cargo.toml +++ b/examples/custom_font/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml index a429303bb..16441a45a 100644 --- a/examples/custom_font_style/Cargo.toml +++ b/examples/custom_font_style/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/custom_plot_manipulation/Cargo.toml b/examples/custom_plot_manipulation/Cargo.toml index 15943555f..17dd3f8a5 100644 --- a/examples/custom_plot_manipulation/Cargo.toml +++ b/examples/custom_plot_manipulation/Cargo.toml @@ -9,10 +9,10 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__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 = [ "auto-color", "humantime", diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml index 6dc91e4e5..b84c14431 100644 --- a/examples/custom_window_frame/Cargo.toml +++ b/examples/custom_window_frame/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml index 0ad331dff..468929472 100644 --- a/examples/file_dialog/Cargo.toml +++ b/examples/file_dialog/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index fb2ca48c9..84c5a3b12 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -9,12 +9,12 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } # For image support: -egui_extras = { path = "../../crates/egui_extras", features = ["image"] } +egui_extras = { workspace = true, features = ["image"] } env_logger = { version = "0.10", default-features = false, features = [ "auto-color", diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml index 46d6aa741..442f671e3 100644 --- a/examples/hello_world_par/Cargo.toml +++ b/examples/hello_world_par/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", default-features = false, features = [ +eframe = { workspace = true, default-features = false, features = [ # accesskit struggles with threading "default_fonts", "wgpu", diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml index 36efecdda..ec73a4d26 100644 --- a/examples/hello_world_simple/Cargo.toml +++ b/examples/hello_world_simple/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml index bddc9afbf..9d2e2305e 100644 --- a/examples/images/Cargo.toml +++ b/examples/images/Cargo.toml @@ -9,10 +9,10 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__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 = ["all_loaders"] } env_logger = { version = "0.10", default-features = false, features = [ "auto-color", "humantime", diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml index 4f12579e0..d205f9ee1 100644 --- a/examples/keyboard_events/Cargo.toml +++ b/examples/keyboard_events/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml index 1e77e32ea..cc69d0d0a 100644 --- a/examples/multiple_viewports/Cargo.toml +++ b/examples/multiple_viewports/Cargo.toml @@ -11,7 +11,7 @@ publish = false wgpu = ["eframe/wgpu"] [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index 4b7b2e9b4..3f8a8c427 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -13,7 +13,7 @@ wgpu = ["eframe/wgpu"] [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "puffin", "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } diff --git a/examples/save_plot/Cargo.toml b/examples/save_plot/Cargo.toml index 49a46f580..65fc30865 100644 --- a/examples/save_plot/Cargo.toml +++ b/examples/save_plot/Cargo.toml @@ -8,10 +8,10 @@ rust-version = "1.72" publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__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"] } rfd = "0.11.0" env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml index f7a65a8bf..6a9c3990b 100644 --- a/examples/screenshot/Cargo.toml +++ b/examples/screenshot/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO "wgpu", ] } diff --git a/examples/serial_windows/Cargo.toml b/examples/serial_windows/Cargo.toml index e3ba3159a..eb235ddd1 100644 --- a/examples/serial_windows/Cargo.toml +++ b/examples/serial_windows/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/test_inline_glow_paint/Cargo.toml b/examples/test_inline_glow_paint/Cargo.toml index 472935ed5..b72645fbb 100644 --- a/examples/test_inline_glow_paint/Cargo.toml +++ b/examples/test_inline_glow_paint/Cargo.toml @@ -10,7 +10,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -eframe = { path = "../../crates/eframe" } +eframe.workspace = true env_logger = { version = "0.10", default-features = false, features = [ "auto-color", "humantime", diff --git a/examples/test_viewports/Cargo.toml b/examples/test_viewports/Cargo.toml index 9ebebae20..2e339b600 100644 --- a/examples/test_viewports/Cargo.toml +++ b/examples/test_viewports/Cargo.toml @@ -11,7 +11,7 @@ publish = false wgpu = ["eframe/wgpu"] [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [ diff --git a/examples/user_attention/Cargo.toml b/examples/user_attention/Cargo.toml index 91103635d..b45420161 100644 --- a/examples/user_attention/Cargo.toml +++ b/examples/user_attention/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.72" publish = false [dependencies] -eframe = { path = "../../crates/eframe", features = [ +eframe = { workspace = true, features = [ "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO ] } env_logger = { version = "0.10", default-features = false, features = [