Skip to content

Commit 33e5c29

Browse files
JoshuaBattyJoshuaBatty
authored
Merge pull request #1018 from JoshuaBatty/workspace_deps
Update workspace dependencies structure
2 parents 9c7a998 + 6a30545 commit 33e5c29

File tree

21 files changed

+163
-130
lines changed

21 files changed

+163
-130
lines changed

‎Cargo.lock

+4-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+44-2
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,60 @@ members = [
1919
"scripts/set_version",
2020
]
2121

22+
[workspace.package]
23+
edition = "2021"
24+
license = "MIT OR Apache-2.0"
25+
version = "0.1.0"
26+
homepage = "https://nannou.cc"
27+
repository = "https://github.com/nannou-org/nannou.git"
28+
2229
# Required for wgpu v0.10 feature resolution.
2330
resolver = "2"
2431

2532
[workspace.dependencies]
33+
audrey = "0.3"
2634
bevy = { version = "0.15", default-features = false }
35+
bevy_common_assets = "0.12.0"
2736
bevy_egui = "0.32.0"
2837
bevy-inspector-egui = "0.29.0"
38+
bitflags = "2.6"
39+
bytemuck = "1"
40+
cpal = "0.13"
41+
dasp_sample = "0.11"
42+
ether-dream = "~0.2.5"
43+
evalexpr = "12"
44+
find_folder = "0.3"
45+
futures = "0.3"
46+
glam = { version = "0.29", default-features = false }
47+
hound = "3.4"
48+
hrtf = "0.2"
49+
ilda-idtf = "0.1"
2950
image = { version = "0.25", default-features = false }
51+
isf = "0.1.0"
52+
lasy = "0.4"
53+
lyon = "1.0"
54+
noise = "0.7"
55+
notosans = "0.1"
56+
num-traits = {version = "0.2", default-features = false }
57+
pennereq = "0.3"
58+
quote = "1.0"
59+
rand = {version = "0.8", default-features = false }
3060
rayon = "1.10"
31-
bevy_common_assets = "0.12.0"
61+
ringbuf = "0.2"
62+
rosc = "0.10"
63+
rusttype = "0.8"
64+
semver = "0.9"
3265
serde = "1"
3366
serde_json = "1"
34-
toml = "0.8"
3567
serde_yaml = "0.9"
68+
syn = "1"
69+
thiserror = "1"
70+
tokio = "1"
71+
toml = "0.8"
72+
toml_edit = "0.1"
73+
usvg = "0.4"
74+
uuid = "1.8"
75+
video-rs = "0.8"
76+
walkdir = "2"
3677
wgpu = "23.0.1"
78+
wikipedia = "0.3"

‎bevy_nannou/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "bevy_nannou"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
55

66
[dependencies]
77
bevy = { workspace = true, default-features = false, features = [

‎bevy_nannou_derive/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[package]
22
name = "bevy_nannou_derive"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
55

66
[lib]
77
proc-macro = true
88

99
[dependencies]
10-
syn = { version = "1", features = ["full"] }
11-
quote = "1.0"
10+
syn = { workspace = true, features = ["full"] }
11+
quote.workspace = true
1212

1313
[dev-dependencies]
14-
bevy = { workspace = true }
14+
bevy.workspace = true
1515
bevy_nannou_draw = { path = "../bevy_nannou_draw" }

‎bevy_nannou_draw/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "bevy_nannou_draw"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
55

66
[dependencies]
77
bevy = { workspace = true, default-features = false, features = [
@@ -13,13 +13,13 @@ bevy = { workspace = true, default-features = false, features = [
1313
"bevy_ui", # needed for `BackgroundColor`
1414
"tonemapping_luts",
1515
]}
16-
lyon = "1.0"
16+
lyon.workspace = true
1717
nannou_core = { path = "../nannou_core" }
18-
notosans = { version = "0.1", optional = true }
19-
rusttype = { version = "0.8", features = ["gpu_cache"] }
20-
rayon = { workspace = true }
21-
uuid = "1.8"
22-
bitflags = "2.6.0"
18+
notosans = { workspace = true, optional = true }
19+
rusttype = { workspace = true, features = ["gpu_cache"] }
20+
rayon.workspace = true
21+
uuid.workspace = true
22+
bitflags.workspace = true
2323

2424
[features]
2525
nightly = []

‎bevy_nannou_isf/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "bevy_nannou_isf"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
55

66
[dependencies]
77
bevy = { workspace = true, features = ["shader_format_glsl"] }
88
bevy-inspector-egui = { workspace = true }
9-
isf = "0.1.0"
10-
thiserror = "1"
11-
bytemuck = "1"
12-
evalexpr = "12"
9+
isf.workspace = true
10+
thiserror.workspace = true
11+
bytemuck.workspace = true
12+
evalexpr.workspace = true

‎bevy_nannou_video/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "bevy_nannou_video"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
55

66
[dependencies]
7-
bevy = { workspace = true }
8-
video-rs = "0.8.1"
9-
thiserror = "1"
10-
rayon = { workspace = true }
11-
serde = { version = "1.0.204", features = ["derive"] }
7+
bevy.workspace = true
8+
video-rs.workspace = true
9+
thiserror.workspace = true
10+
rayon.workspace = true
11+
serde = { workspace = true, features = ["derive"] }

‎examples/Cargo.toml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
[package]
22
name = "examples"
3-
version = "0.1.0"
3+
version.workspace = true
44
authors = [
55
"mitchmindtree <[email protected]>",
66
"JoshuaBatty <[email protected]>",
77
]
88
description = "A suite examples for nannou, the creative coding framework."
99
readme = "README.md"
1010
keywords = ["creative", "sketch", "graphics", "audio", "example"]
11-
license = "MIT"
12-
repository = "https://github.com/nannou-org/nannou.git"
13-
homepage = "https://github.com/nannou-org/nannou"
14-
edition = "2018"
11+
repository.workspace = true
12+
homepage.workspace = true
13+
license.workspace = true
14+
edition.workspace = true
1515

1616
[dev-dependencies]
17-
audrey = "0.3"
18-
bevy = { workspace = true }
17+
audrey.workspace = true
18+
bevy.workspace = true
1919
bevy_nannou = { path = "../bevy_nannou" }
20-
hrtf = "0.2"
21-
nannou = { version ="0.19.0", path = "../nannou" }
22-
nannou_audio = { version ="0.19.0", path = "../nannou_audio" }
23-
nannou_laser = { version ="0.19.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
24-
nannou_osc = { version ="0.19.0", path = "../nannou_osc" }
25-
walkdir = "2"
26-
hound = "3.4.0"
27-
ringbuf = "0.2.2"
28-
futures = "0.3"
29-
bytemuck = "1"
20+
hrtf.workspace = true
21+
nannou = { version = "0.19.0", path = "../nannou" }
22+
nannou_audio = { version = "0.19.0", path = "../nannou_audio" }
23+
nannou_laser = { version = "0.19.0", features = ["ffi", "ilda-idtf"], path = "../nannou_laser" }
24+
nannou_osc = { version = "0.19.0", path = "../nannou_osc" }
25+
walkdir.workspace = true
26+
hound.workspace = true
27+
ringbuf.workspace = true
28+
futures.workspace = true
29+
bytemuck.workspace = true
3030

3131
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
3232
tokio = { version = "1", features = ["full"]}

‎generative_design/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[package]
22
name = "generative_design"
3-
version = "0.1.0"
3+
version.workspace = true
44
authors = [
55
"JoshuaBatty <[email protected]>",
66
"mitchmindtree <[email protected]>",
77
]
88
description = "An implementation of the Generative Gestaltung examples."
99
readme = "README.md"
1010
keywords = ["creative", "sketch", "generative", "design", "gestaltung"]
11-
license = "MIT"
12-
repository = "https://github.com/nannou-org/nannou.git"
13-
homepage = "https://github.com/nannou-org/nannou"
14-
edition = "2018"
11+
repository.workspace = true
12+
homepage.workspace = true
13+
license.workspace = true
14+
edition.workspace = true
1515

1616
[dev-dependencies]
17-
nannou = { version ="0.19.0", path = "../nannou" }
18-
usvg = "0.4"
19-
wikipedia = "0.3"
17+
nannou = { version = "0.19.0", path = "../nannou" }
18+
usvg.workspace = true
19+
wikipedia.workspace = true
2020

2121
# Color
2222
[[example]]

‎guide/book_tests/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = 'book_tests'
33
version = '0.1.0'
44
authors = ['mitchmindtree <[email protected]>']
5-
edition = '2018'
5+
edition.workspace = true
66
description = 'For testing the nannou-guide, while including the nannou dependencies.'
77

88
[build-dependencies]

‎guide/src/getting_started/create_a_project.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ create a new project with just a few small steps:
2828
name = "my_project"
2929
version = "0.1.0"
3030
authors = ["mitchmindtree <[email protected]>"]
31-
edition = "2018"
31+
edition = "2021"
3232

3333
[dependencies]
3434
nannou = "0.17"

‎nannou/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
[package]
22
name = "nannou"
3-
version ="0.19.0"
3+
version = "0.19.0"
44
authors = ["mitchmindtree <[email protected]>"]
55
description = "A Creative Coding Framework for Rust."
66
readme = "README.md"
77
keywords = ["creative", "sketch", "graphics", "audio"]
8-
license = "MIT"
9-
repository = "https://github.com/nannou-org/nannou.git"
10-
homepage = "https://github.com/nannou-org/nannou"
11-
edition = "2018"
8+
repository.workspace = true
9+
homepage.workspace = true
10+
license.workspace = true
11+
edition.workspace = true
1212

1313
[dependencies]
1414
bevy = { workspace = true }
1515
bevy-inspector-egui = { workspace = true, optional = true }
1616
bevy_egui = { workspace = true, optional = true }
1717
bevy_common_assets = { workspace = true, optional = true }
1818
bevy_nannou = { version = "0.1.0", path = "../bevy_nannou" }
19-
find_folder = "0.3"
20-
lyon = "1.0"
19+
find_folder = { workspace = true }
20+
lyon = { workspace = true }
2121
nannou_core = { version ="0.19.0", path = "../nannou_core", features = ["std"] }
2222
nannou_wgpu = { version = "0.19.0", path = "../nannou_wgpu", features = ["capturer"]}
23-
noise = "0.7"
24-
pennereq = "0.3"
23+
noise = { workspace = true }
24+
pennereq = { workspace = true }
2525
serde = { workspace = true, features = ["derive"], optional = true }
2626
serde_json = { workspace = true, optional = true }
2727
toml = { workspace = true, optional = true }
28-
walkdir = "2"
28+
walkdir = { workspace = true }
2929
wgpu = { workspace = true }
3030

3131
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

‎nannou_audio/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ authors = ["mitchmindtree <[email protected]>"]
55
description = "The audio API for Nannou, the creative coding framework."
66
readme = "README.md"
77
keywords = ["audio", "stream", "cross-platform", "dsp", "pcm"]
8-
license = "MIT"
9-
repository = "https://github.com/nannou-org/nannou_audio.git"
10-
homepage = "https://nannou.cc"
11-
edition = "2018"
8+
repository.workspace = true
9+
homepage.workspace = true
10+
license.workspace = true
11+
edition.workspace = true
1212

1313
[dependencies]
14-
cpal = "0.13.1"
15-
dasp_sample = "0.11.0"
16-
thiserror = "1"
14+
cpal.workspace = true
15+
dasp_sample.workspace = true
16+
thiserror.workspace = true
1717

1818
[features]
1919
asio = ["cpal/asio"]

0 commit comments

Comments
 (0)