From f7bf27ce7d026c3902495bc399a4c0b9b6006be2 Mon Sep 17 00:00:00 2001 From: Connor Slade Date: Thu, 25 Jul 2024 00:27:24 -0400 Subject: [PATCH] Define all crate versions in workspace toml --- Cargo.toml | 35 +++++++++++++++++++++++++++++++++++ TODO.md | 2 +- common/Cargo.toml | 2 +- mslicer/Cargo.toml | 42 +++++++++++++++++++++--------------------- remote_send/Cargo.toml | 20 ++++++++++---------- slicer/Cargo.toml | 16 ++++++++-------- 6 files changed, 76 insertions(+), 41 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3d902a0..1feaf54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,38 @@ [workspace] resolver = "2" members = ["common", "goo_format", "mslicer", "remote_send", "slicer"] + +[workspace.dependencies] +afire = "3.0.0-alpha.3" +anyhow = "1.0.86" +bitflags = "2.5.0" +bytemuck = "1.16.1" +chrono = "0.4.38" +clone-macro = "0.1.0" +const_format = "0.2.32" +criterion = "0.5.1" +eframe = { version = "0.27.2", features = ["wgpu"] } +egui = "0.27.2" +egui_dock = "0.12.0" +egui-modal = "0.3.6" +egui-phosphor = "0.5.0" +egui-wgpu = "0.27.2" +encase = { version = "0.8.0", features = ["nalgebra"] } +image = "0.25.1" +itertools = "0.13.0" +md5 = "0.7.0" +nalgebra = "0.32.6" +obj-rs = "0.7.1" +ordered-float = "4.2.0" +parking_lot = "0.12.3" +plexus = "0.0.11" +rand = "0.8.5" +rayon = "1.10.0" +rfd = "0.14.1" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.120" +soon = { git = "https://github.com/connorslade/misc" } +stl_io = "0.7.0" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" +wgpu = "0.19.4" diff --git a/TODO.md b/TODO.md index eea6344..ce18701 100644 --- a/TODO.md +++ b/TODO.md @@ -47,4 +47,4 @@ - [x] Disable slice button while slicing - [x] Use egui_dock to get a more clean look - [x] Align to bed button -- [ ] Define all crate versions in workspace toml +- [x] Define all crate versions in workspace toml diff --git a/common/Cargo.toml b/common/Cargo.toml index bac9a2b..3524e8f 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -4,4 +4,4 @@ version = "0.1.0" edition = "2021" [dependencies] -nalgebra = "0.32.6" +nalgebra.workspace = true diff --git a/mslicer/Cargo.toml b/mslicer/Cargo.toml index a383d3a..056d41a 100644 --- a/mslicer/Cargo.toml +++ b/mslicer/Cargo.toml @@ -4,27 +4,27 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0.86" -bytemuck = "1.16.1" -clone-macro = "0.1.0" -const_format = "0.2.32" -eframe = { version = "0.27.2", features = ["wgpu"] } -egui = "0.27.2" -egui_dock = "0.12.0" -egui-modal = "0.3.6" -egui-phosphor = "0.5.0" -egui-wgpu = "0.27.2" -encase = { version = "0.8.0", features = ["nalgebra"] } -image = "0.25.1" -nalgebra = "0.32.6" -parking_lot = "0.12.3" -plexus = "0.0.11" -rand = "0.8.5" -rfd = "0.14.1" -serde_json = "1.0.120" -tracing = "0.1.40" -tracing-subscriber = "0.3.18" -wgpu = "0.19.4" +anyhow.workspace = true +bytemuck.workspace = true +clone-macro.workspace = true +const_format.workspace = true +eframe.workspace = true +egui.workspace = true +egui_dock.workspace = true +egui-modal.workspace = true +egui-phosphor.workspace = true +egui-wgpu.workspace = true +encase.workspace = true +image.workspace = true +nalgebra.workspace = true +parking_lot.workspace = true +plexus.workspace = true +rand.workspace = true +rfd.workspace = true +serde_json.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +wgpu.workspace = true common = { path = "../common" } goo_format = { path = "../goo_format" } diff --git a/remote_send/Cargo.toml b/remote_send/Cargo.toml index fe41838..ed94460 100644 --- a/remote_send/Cargo.toml +++ b/remote_send/Cargo.toml @@ -4,15 +4,15 @@ version = "0.1.0" edition = "2021" [dependencies] -afire = "3.0.0-alpha.3" -anyhow = "1.0.86" -bitflags = "2.5.0" -chrono = "0.4.38" -md5 = "0.7.0" -parking_lot = "0.12.3" -rand = "0.8.5" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -soon = { git = "https://github.com/connorslade/misc" } +afire.workspace = true +anyhow.workspace = true +bitflags.workspace = true +chrono.workspace = true +md5.workspace = true +parking_lot.workspace = true +rand.workspace = true +serde.workspace = true +serde_json.workspace = true +soon.workspace = true common = { path = "../common" } diff --git a/slicer/Cargo.toml b/slicer/Cargo.toml index c05ea7e..6d68dbc 100644 --- a/slicer/Cargo.toml +++ b/slicer/Cargo.toml @@ -4,19 +4,19 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0.86" -itertools = "0.13.0" -nalgebra = "0.32.6" -obj-rs = "0.7.1" -ordered-float = "4.2.0" -rayon = "1.10.0" -stl_io = "0.7.0" +anyhow.workspace = true +itertools.workspace = true +nalgebra.workspace = true +obj-rs.workspace = true +ordered-float.workspace = true +rayon.workspace = true +stl_io.workspace = true common = { path = "../common" } goo_format = { path = "../goo_format" } [dev-dependencies] -criterion = "0.5.1" +criterion.workspace = true [[bench]] name = "benchmark"