Skip to content

Commit f468e25

Browse files
hecrjhecrj
committed
Use workspace dependencies and package inheritance
We are also taking this as a chance to synchronize the versions of all the crates! Because of this, we will skip the `0.11` version.
1 parent a56b25b commit f468e25

File tree

59 files changed

+456
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+456
-432
lines changed

‎Cargo.toml

+99-36
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
[package]
22
name = "iced"
3-
version = "0.10.0"
4-
authors = ["Héctor Ramón Jiménez <[email protected]>"]
5-
edition = "2021"
63
description = "A cross-platform GUI library inspired by Elm"
7-
license = "MIT"
8-
repository = "https://github.com/iced-rs/iced"
9-
documentation = "https://docs.rs/iced"
10-
readme = "README.md"
11-
keywords = ["gui", "ui", "graphics", "interface", "widgets"]
12-
categories = ["gui"]
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
9+
homepage.workspace = true
10+
categories.workspace = true
11+
keywords.workspace = true
12+
13+
[package.metadata.docs.rs]
14+
rustdoc-args = ["--cfg", "docsrs"]
15+
all-features = true
16+
17+
[badges]
18+
maintenance = { status = "actively-developed" }
1319

1420
[features]
1521
default = ["wgpu"]
1622
# Enable the `wgpu` GPU-accelerated renderer backend
1723
wgpu = ["iced_renderer/wgpu"]
1824
# Enables the `Image` widget
19-
image = ["iced_widget/image", "image_rs"]
25+
image = ["iced_widget/image", "dep:image"]
2026
# Enables the `Svg` widget
2127
svg = ["iced_widget/svg"]
2228
# Enables the `Canvas` widget
@@ -44,8 +50,28 @@ webgl = ["iced_renderer/webgl"]
4450
# Enables the advanced module
4551
advanced = []
4652

47-
[badges]
48-
maintenance = { status = "actively-developed" }
53+
[dependencies]
54+
iced_core.workspace = true
55+
iced_futures.workspace = true
56+
iced_renderer.workspace = true
57+
iced_widget.workspace = true
58+
iced_winit.features = ["application"]
59+
iced_winit.workspace = true
60+
61+
thiserror.workspace = true
62+
63+
image.workspace = true
64+
image.optional = true
65+
66+
[profile.release-opt]
67+
inherits = "release"
68+
codegen-units = 1
69+
debug = false
70+
lto = true
71+
incremental = false
72+
opt-level = 3
73+
overflow-checks = false
74+
strip = "debuginfo"
4975

5076
[workspace]
5177
members = [
@@ -62,29 +88,66 @@ members = [
6288
"examples/*",
6389
]
6490

65-
[dependencies]
66-
iced_core = { version = "0.10", path = "core" }
67-
iced_futures = { version = "0.7", path = "futures" }
68-
iced_renderer = { version = "0.1", path = "renderer" }
69-
iced_widget = { version = "0.1", path = "widget" }
70-
iced_winit = { version = "0.10", path = "winit", features = ["application"] }
71-
thiserror = "1"
91+
[workspace.package]
92+
version = "0.12.0"
93+
authors = ["Héctor Ramón Jiménez <[email protected]>"]
94+
edition = "2021"
95+
license = "MIT"
96+
repository = "https://github.com/iced-rs/iced"
97+
homepage = "https://iced.rs"
98+
categories = ["gui"]
99+
keywords = ["gui", "ui", "graphics", "interface", "widgets"]
72100

73-
[dependencies.image_rs]
74-
version = "0.24"
75-
package = "image"
76-
optional = true
101+
[workspace.dependencies]
102+
iced = { version = "0.12", path = "." }
103+
iced_core = { version = "0.12", path = "core" }
104+
iced_futures = { version = "0.12", path = "futures" }
105+
iced_graphics = { version = "0.12", path = "graphics" }
106+
iced_renderer = { version = "0.12", path = "renderer" }
107+
iced_runtime = { version = "0.12", path = "runtime" }
108+
iced_style = { version = "0.12", path = "style" }
109+
iced_tiny_skia = { version = "0.12", path = "tiny_skia" }
110+
iced_wgpu = { version = "0.12", path = "wgpu" }
111+
iced_widget = { version = "0.12", path = "widget" }
112+
iced_winit = { version = "0.12", path = "winit" }
77113

78-
[package.metadata.docs.rs]
79-
rustdoc-args = ["--cfg", "docsrs"]
80-
all-features = true
81-
82-
[profile.release-opt]
83-
inherits = "release"
84-
codegen-units = 1
85-
debug = false
86-
lto = true
87-
incremental = false
88-
opt-level = 3
89-
overflow-checks = false
90-
strip = "debuginfo"
114+
async-std = "1.0"
115+
bitflags = "1.0"
116+
bytemuck = { version = "1.0", features = ["derive"] }
117+
cosmic-text = "0.9"
118+
futures = "0.3"
119+
glam = "0.24"
120+
glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "20f0f8fa80e0d0df4c63634ce9176fa489546ca9" }
121+
guillotiere = "0.6"
122+
half = "2.2"
123+
image = "0.24"
124+
instant = "0.1"
125+
kamadak-exif = "0.5"
126+
kurbo = "0.9"
127+
log = "0.4"
128+
lyon = "1.0"
129+
lyon_path = "1.0"
130+
num-traits = "0.2"
131+
once_cell = "1.0"
132+
ouroboros = "0.17"
133+
palette = "0.7"
134+
qrcode = { version = "0.12", default-features = false }
135+
raw-window-handle = "0.5"
136+
resvg = "0.35"
137+
rustc-hash = "1.0"
138+
smol = "1.0"
139+
softbuffer = "0.2"
140+
sysinfo = "0.28"
141+
thiserror = "1.0"
142+
tiny-skia = "0.10"
143+
tokio = "1.0"
144+
tracing = "0.1"
145+
twox-hash = { version = "1.0", default-features = false }
146+
unicode-segmentation = "1.0"
147+
wasm-bindgen-futures = "0.4"
148+
wasm-timer = "0.2"
149+
web-sys = "0.3"
150+
wgpu = "0.17"
151+
winapi = "0.3"
152+
window_clipboard = "0.3"
153+
winit = { git = "https://github.com/iced-rs/winit.git", rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e", default-features = false }

‎core/Cargo.toml

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
[package]
22
name = "iced_core"
3-
version = "0.10.0"
4-
authors = ["Héctor Ramón Jiménez <[email protected]>"]
5-
edition = "2021"
6-
description = "The essential concepts of Iced"
7-
license = "MIT"
8-
repository = "https://github.com/iced-rs/iced"
3+
description = "The essential ideas of iced"
4+
version.workspace = true
5+
edition.workspace = true
6+
authors.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
9+
homepage.workspace = true
10+
categories.workspace = true
11+
keywords.workspace = true
912

1013
[dependencies]
11-
bitflags = "1.2"
12-
thiserror = "1"
13-
log = "0.4.17"
14-
twox-hash = { version = "1.5", default-features = false }
14+
bitflags.workspace = true
15+
log.workspace = true
16+
thiserror.workspace = true
17+
twox-hash.workspace = true
1518

16-
[dependencies.palette]
17-
version = "0.7"
18-
optional = true
19+
palette.workspace = true
20+
palette.optional = true
1921

2022
[target.'cfg(target_arch = "wasm32")'.dependencies]
21-
instant = "0.1"
23+
instant.workspace = true
2224

2325
[dev-dependencies]
2426
approx = "0.5"

‎examples/arc/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
9+
iced.workspace = true
10+
iced.features = ["canvas", "tokio", "debug"]

‎examples/bezier_tool/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["canvas"] }
9+
iced.workspace = true
10+
iced.features = ["canvas"]

‎examples/checkbox/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../.." }
9+
iced.workspace = true

‎examples/clock/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
10-
time = { version = "0.3.5", features = ["local-offset"] }
9+
iced.workspace = true
10+
iced.features = ["canvas", "tokio", "debug"]
11+
12+
time = { version = "0.3", features = ["local-offset"] }

‎examples/color_palette/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["canvas", "palette"] }
10-
palette = "0.7.0"
9+
iced.workspace = true
10+
iced.features = ["canvas", "palette"]
11+
12+
palette.workspace = true

‎examples/combo_box/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["debug"] }
9+
iced.workspace = true
10+
iced.features = ["debug"]

‎examples/component/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["debug", "lazy"] }
9+
iced.workspace = true
10+
iced.features = ["debug", "lazy"]

‎examples/counter/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../.." }
9+
iced.workspace = true

‎examples/custom_quad/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["advanced"] }
9+
iced.workspace = true
10+
iced.features = ["advanced"]

‎examples/custom_widget/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["advanced"] }
9+
iced.workspace = true
10+
iced.features = ["advanced"]

‎examples/download_progress/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["tokio"] }
9+
iced.workspace = true
10+
iced.features = ["tokio"]
1011

1112
[dependencies.reqwest]
1213
version = "0.11"

‎examples/events/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["debug"] }
9+
iced.workspace = true
10+
iced.features = ["debug"]

‎examples/exit/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
iced = { path = "../.." }
8+
iced.workspace = true

‎examples/game_of_life/Cargo.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
10-
tokio = { version = "1.0", features = ["sync"] }
9+
iced.workspace = true
10+
iced.features = ["debug", "canvas", "tokio"]
11+
1112
itertools = "0.9"
12-
rustc-hash = "1.1"
13-
env_logger = "0.10"
13+
rustc-hash.workspace = true
14+
tokio = { workspace = true, features = ["sync"] }
15+
tracing-subscriber = "0.3"

‎examples/game_of_life/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use iced::{
1818
use std::time::{Duration, Instant};
1919

2020
pub fn main() -> iced::Result {
21-
env_logger::builder().format_timestamp(None).init();
21+
tracing_subscriber::fmt::init();
2222

2323
GameOfLife::run(Settings {
2424
antialiasing: true,

‎examples/geometry/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["advanced"] }
9+
iced.workspace = true
10+
iced.features = ["advanced"]

‎examples/integration/Cargo.toml

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced_winit = { path = "../../winit" }
10-
iced_wgpu = { path = "../../wgpu" }
11-
iced_widget = { path = "../../widget" }
12-
iced_renderer = { path = "../../renderer", features = ["wgpu"] }
13-
env_logger = "0.10"
9+
iced_winit.workspace = true
10+
iced_wgpu.workspace = true
11+
iced_widget.workspace = true
12+
13+
tracing-subscriber = "0.3"
1414

1515
[target.'cfg(target_arch = "wasm32")'.dependencies]
1616
console_error_panic_hook = "0.1.7"
1717
console_log = "0.2.0"
18-
log = "0.4"
18+
log.workspace = true
1919
wasm-bindgen = "0.2"
2020
web-sys = { version = "0.3", features = ["Element", "HtmlCanvasElement", "Window", "Document"] }
21+
2122
# This dependency a little bit quirky, it is deep in the tree and without `js` feature it
2223
# refuses to work with `wasm32-unknown-unknown target`. Unfortunately, we need this patch
2324
# to make it work

‎examples/integration/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
4141
};
4242

4343
#[cfg(not(target_arch = "wasm32"))]
44-
env_logger::init();
44+
tracing_subscriber::fmt::init();
4545

4646
// Initialize winit
4747
let event_loop = EventLoop::new();

‎examples/lazy/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["debug", "lazy"] }
9+
iced.workspace = true
10+
iced.features = ["debug", "lazy"]

‎examples/loading_spinners/Cargo.toml

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["advanced", "canvas"] }
10-
lyon_algorithms = "1"
11-
once_cell = "1"
9+
iced.workspace = true
10+
iced.features = ["advanced", "canvas"]
11+
12+
lyon_algorithms = "1.0"
13+
once_cell.workspace = true

‎examples/modal/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ edition = "2021"
66
publish = false
77

88
[dependencies]
9-
iced = { path = "../..", features = ["advanced"] }
9+
iced.workspace = true
10+
iced.features = ["advanced"]

0 commit comments

Comments
 (0)