Skip to content

Commit

Permalink
Remove version field for path-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Feb 1, 2024
1 parent 520b28c commit dda9f79
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 43 deletions.
22 changes: 7 additions & 15 deletions crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,7 @@ puffin = [
]

## Enables wayland support and fixes clipboard issue.
wayland = [
"egui-winit/wayland",
"egui-wgpu?/wayland",
"egui_glow?/wayland",
]
wayland = ["egui-winit/wayland", "egui-wgpu?/wayland", "egui_glow?/wayland"]

## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web.
##
Expand All @@ -118,18 +114,14 @@ web_screen_reader = [
wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster"]

## Enables compiling for x11.
x11 = [
"egui-winit/x11",
"egui-wgpu?/x11",
"egui_glow?/x11",
]
x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11"]

## If set, eframe will look for the env-var `EFRAME_SCREENSHOT_TO` and write a screenshot to that location, and then quit.
## This is used to generate images for examples.
__screenshot = []

[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [
egui = { path = "../egui", default-features = false, features = [
"bytemuck",
"log",
] }
Expand All @@ -144,7 +136,7 @@ web-time.workspace = true
## Enable this when generating docs.
document-features = { version = "0.2", optional = true }

egui_glow = { version = "0.25.0", path = "../egui_glow", optional = true, default-features = false }
egui_glow = { path = "../egui_glow", 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 = [
Expand All @@ -156,7 +148,7 @@ serde = { version = "1", optional = true, features = ["derive"] }
# -------------------------------------------
# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", default-features = false, features = [
egui-winit = { path = "../egui-winit", default-features = false, features = [
"clipboard",
"links",
] }
Expand All @@ -167,7 +159,7 @@ winit = { workspace = true, default-features = false, features = ["rwh_06"] }

# optional native:
directories-next = { version = "2", optional = true }
egui-wgpu = { version = "0.25.0", path = "../egui-wgpu", optional = true, features = [
egui-wgpu = { path = "../egui-wgpu", optional = true, features = [
"winit",
] } # if wgpu is used, use it with winit
pollster = { version = "0.3", optional = true } # needed for wgpu
Expand Down Expand Up @@ -246,5 +238,5 @@ web-sys = { version = "0.3.58", features = [
] }

# optional web:
egui-wgpu = { version = "0.25.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
egui-wgpu = { path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
wgpu = { workspace = true, optional = true }
4 changes: 2 additions & 2 deletions crates/egui-wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ x11 = ["winit?/x11"]


[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false }
epaint = { version = "0.25.0", path = "../epaint", default-features = false, features = [
egui = { path = "../egui", default-features = false }
epaint = { path = "../epaint", default-features = false, features = [
"bytemuck",
] }

Expand Down
4 changes: 1 addition & 3 deletions crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ wayland = ["winit/wayland", "bytemuck"]
x11 = ["winit/x11", "bytemuck"]

[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [
"log",
] }
egui = { path = "../egui", default-features = false, features = ["log"] }
log = { version = "0.4", features = ["std"] }
raw-window-handle.workspace = true
web-time.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ unity = ["epaint/unity"]


[dependencies]
epaint = { version = "0.25.0", path = "../epaint", default-features = false }
epaint = { path = "../epaint", 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
Expand Down
12 changes: 4 additions & 8 deletions crates/egui_demo_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,16 @@ chrono = { version = "0.4", default-features = false, features = [
"js-sys",
"wasmbind",
] }
eframe = { version = "0.25.0", path = "../eframe", default-features = false, features = [
eframe = { path = "../eframe", default-features = false, features = [
"web_screen_reader",
] }
egui = { version = "0.25.0", path = "../egui", features = [
egui = { path = "../egui", features = [
"callstack",
"extra_debug_asserts",
"log",
] }
egui_demo_lib = { version = "0.25.0", path = "../egui_demo_lib", features = [
"chrono",
] }
egui_extras = { version = "0.25.0", path = "../egui_extras", features = [
"image",
] }
egui_demo_lib = { path = "../egui_demo_lib", features = ["chrono"] }
egui_extras = { path = "../egui_extras", features = ["image"] }
log = { version = "0.4", features = ["std"] }

# Optional dependencies:
Expand Down
8 changes: 4 additions & 4 deletions crates/egui_demo_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ syntect = ["egui_extras/syntect"]


[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false }
egui_extras = { version = "0.25.0", path = "../egui_extras" }
egui_plot = { version = "0.25.0", path = "../egui_plot" }
egui = { path = "../egui", default-features = false }
egui_extras = { path = "../egui_extras" }
egui_plot = { path = "../egui_plot" }
log = { version = "0.4", features = ["std"] }
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
chrono = { version = "0.4", optional = true, features = ["js-sys", "wasmbind"] }
Expand Down
4 changes: 1 addition & 3 deletions crates/egui_extras/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ syntect = ["dep:syntect"]


[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [
"serde",
] }
egui = { path = "../egui", default-features = false, features = ["serde"] }
enum-map = { version = "2", features = ["serde"] }
log = { version = "0.4", features = ["std"] }
serde = { version = "1", features = ["derive"] }
Expand Down
6 changes: 2 additions & 4 deletions crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ x11 = ["winit?/x11"]


[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false, features = [
"bytemuck",
] }
egui = { path = "../egui", default-features = false, features = ["bytemuck"] }

bytemuck = "1.7"
glow.workspace = true
Expand All @@ -69,7 +67,7 @@ document-features = { version = "0.2", optional = true }

# Native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", optional = true, default-features = false }
egui-winit = { path = "../egui-winit", 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
Expand Down
2 changes: 1 addition & 1 deletion crates/egui_plot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ serde = ["dep:serde", "egui/serde"]


[dependencies]
egui = { version = "0.25.0", path = "../egui", default-features = false }
egui = { path = "../egui", default-features = false }


#! ### Optional dependencies
Expand Down
4 changes: 2 additions & 2 deletions crates/epaint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde"]
unity = []

[dependencies]
emath = { version = "0.25.0", path = "../emath" }
ecolor = { version = "0.25.0", path = "../ecolor" }
emath = { path = "../emath" }
ecolor = { path = "../ecolor" }

ab_glyph = "0.2.11"
ahash = { version = "0.8.1", default-features = false, features = [
Expand Down

0 comments on commit dda9f79

Please sign in to comment.