Skip to content

Commit

Permalink
Switch to workspace deps; remove num_derive (#141)
Browse files Browse the repository at this point in the history
This makes it easier to update dependencies in a single place.

Closes #139
  • Loading branch information
mkeeter committed Jun 8, 2024
1 parent de21ead commit ce80347
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 74 deletions.
12 changes: 0 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,33 @@ opt-level = 1
[profile.fast-test]
inherits = "test"
opt-level = 0

[workspace.dependencies]
anyhow = "1"
arrayvec = "0.7"
bimap = "0.6.3"
bincode = "1.3.3"
clap = { version = "4", features = ["derive"] }
crossbeam-channel = "0.5"
crossbeam-deque = "0.8"
document-features = "0.2"
dynasmrt = { version = "2.0" }
eframe = { version = "0.27", default-features = false, features = [ "default_fonts", "glow"] }
env_logger = "0.11.2"
getrandom = { version = "0.2", features = ["js"] }
ieee754 = "0.2"
image = { version = "0.24", default-features = false, features = ["png"] }
libc = "0.2"
log = "0.4"
nalgebra = "0.32"
notify = "5.0"
num-traits = "0.2"
ordered-float = "3"
rand = "0.8.5"
rhai = { version = "1.17", features = ["sync"] }
serde = { version = "1.0", features = ["derive", "rc"] }
static_assertions = "1"
thiserror = "1"
wasm-bindgen = "0.2.92"
wasm-bindgen-futures = "0.4"
windows = { version = "0.54.0", features = ["Win32_Foundation", "Win32_System_Memory"] }
14 changes: 7 additions & 7 deletions demos/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ version = "0.1.0"
edition = "2021"

[dependencies]
fidget = { path = "../../fidget", default-features = false, features = ["render", "mesh"] }
anyhow.workspace = true
clap.workspace = true
env_logger.workspace = true
image.workspace = true
log.workspace = true
nalgebra.workspace = true

anyhow = "1"
clap = { version = "4", features = ["derive"] }
env_logger = "0.11.2"
image = { version = "0.24", default-features = false, features = ["png"] }
log = "0.4"
nalgebra = "0.32"
fidget = { path = "../../fidget", default-features = false, features = ["render", "mesh"] }
workspace-hack = { version = "0.1", path = "../../workspace-hack" }

[features]
Expand Down
13 changes: 5 additions & 8 deletions demos/constraints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0"
eframe = { version = "0.27", default-features = false, features = [
"default_fonts", # Embed the default egui fonts.
"glow", # Use the glow rendering backend. Alternative: "wgpu".
] }
anyhow.workspace = true
eframe.workspace = true
log.workspace = true

fidget = { path = "../../fidget", default-features = false, features = ["solver"] }
log = "0.4"
workspace-hack = { version = "0.1", path = "../../workspace-hack" }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
env_logger = "0.11.2"
env_logger.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen-futures = "0.4"
wasm-bindgen-futures.workspace = true
23 changes: 9 additions & 14 deletions demos/viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@ version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0"
clap = { version = "4.1.6", features = ["derive"] }
crossbeam-channel = "0.5"
eframe = { version = "0.27", default-features = false, features = [
#"accesskit", # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
"default_fonts", # Embed the default egui fonts.
"glow", # Use the glow rendering backend. Alternative: "wgpu".
#"wgpu"
] }
env_logger = "0.11.2"
anyhow.workspace = true
clap.workspace = true
crossbeam-channel.workspace = true
eframe.workspace = true
env_logger.workspace = true
log.workspace = true
nalgebra.workspace = true
notify.workspace = true
rhai.workspace = true

fidget = { path = "../../fidget", default-features = false, features = ["render", "rhai"] }
log = "0.4"
nalgebra = "0.32"
notify = "5.0"
rhai = "1.10"
workspace-hack = { version = "0.1", path = "../../workspace-hack" }

[features]
Expand Down
18 changes: 5 additions & 13 deletions demos/web-editor/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion demos/web-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ crate-type = ["cdylib"]

[dependencies]
bincode = "1.3.3"
fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]}
wasm-bindgen = "0.2.92"
nalgebra = "0.32"

fidget = {path = "../../fidget", default-features = false, features = ["rhai", "mesh", "render"]}

# Take advantage of feature unification to turn on wasm-bindgen here
rhai = { version = "*", features = ["wasm-bindgen"] }
2 changes: 1 addition & 1 deletion demos/web-editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions fidget/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@ authors = ["Matt Keeter <matt.j.keeter@gmail.com"]
readme = "../README.md"

[dependencies]
arrayvec = "0.7"
bimap = "0.6.3"
document-features = "0.2"
ieee754 = "0.2"
nalgebra = "0.32"
num-derive = "0.3"
num-traits = "0.2"
ordered-float = "3"
rand = "0.8.5"
static_assertions = "1"
thiserror = "1"
arrayvec.workspace = true
bimap.workspace = true
document-features.workspace = true
ieee754.workspace = true
nalgebra.workspace = true
num-traits.workspace = true
ordered-float.workspace = true
rand.workspace = true
static_assertions.workspace = true
thiserror.workspace = true
serde.workspace = true

workspace-hack = { version = "0.1", path = "../workspace-hack" }
serde = { version = "1.0", features = ["derive", "rc"] }

# JIT
dynasmrt = { version = "2.0", optional = true }
libc = { version = "0.2", optional = true }
dynasmrt = { workspace = true, optional = true }
libc = { workspace = true, optional = true }

# Rhai
rhai = { version = "1.17", optional = true, features = ["sync"] }
rhai = { workspace = true, optional = true }

# Meshing
crossbeam-deque = { version = "0.8", optional = true }
crossbeam-deque = { workspace = true, optional = true }

[target.'cfg(target_os = "windows")'.dependencies]
windows = { version = "0.54.0", features = ["Win32_Foundation", "Win32_System_Memory"] }
windows.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { version = "0.2", features = ["js"] }
getrandom.workspace = true

[features]
default = ["jit", "rhai", "render", "mesh", "solver"]
Expand Down

0 comments on commit ce80347

Please sign in to comment.