Skip to content

Commit c096fa0

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 2c51e34 commit c096fa0

59 files changed

Lines changed: 458 additions & 432 deletions

File tree

Some content is hidden

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

‎Cargo.toml‎

Lines changed: 99 additions & 36 deletions
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 <hector0193@gmail.com>"]
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
@@ -42,8 +48,28 @@ web-colors = ["iced_renderer/web-colors"]
4248
# Enables the advanced module
4349
advanced = []
4450

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

4874
[workspace]
4975
members = [
@@ -60,29 +86,66 @@ members = [
6086
"examples/*",
6187
]
6288

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

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

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

‎core/Cargo.toml‎

Lines changed: 16 additions & 14 deletions
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 <hector0193@gmail.com>"]
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 4 additions & 2 deletions
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)