Skip to content

Commit

Permalink
Update a lot of dependencies to be more generic workspace dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
carter committed Dec 18, 2024
1 parent b20b101 commit 4a472bb
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 32 deletions.
9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[workspace]

members = [
"example_package",
"example_package_macro",
Expand All @@ -16,3 +15,11 @@ members = [
"roslibrust_rosapi",
]
resolver = "2"

[workspace.dependencies]
log = "0.4"
tokio = {version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
# Someday we may move this crate into this workspace
# For now this is how we keep from repeating the verison everywhere
roslibrust_serde_rosmsg = "0.4"
6 changes: 3 additions & 3 deletions roslibrust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ roslibrust_mock = { path = "../roslibrust_mock", optional = true }
[dev-dependencies]
env_logger = "0.11"
test-log = "0.2"
log = "0.4"
tokio = { version = "1.20", features = ["macros", "rt-multi-thread"] }
serde = { version = "1.0", features = ["derive"] }
log = { workspace = true }
tokio = { workspace = true }
serde = { workspace = true }
# Used to generate messages for the examples
roslibrust_codegen = { path = "../roslibrust_codegen" }
roslibrust_codegen_macro = { path = "../roslibrust_codegen_macro" }
Expand Down
6 changes: 3 additions & 3 deletions roslibrust_codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ categories = ["science::robotics"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tokio = { workspace = true, optional = true}
log = { workspace = true }
serde = { workspace = true }
roslibrust_common = { path = "../roslibrust_common" }
lazy_static = "1.4"
log = "0.4"
md5 = "0.7"
proc-macro2 = "1.0"
quote = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
simple-error = "0.3"
syn = "1.0"
tokio = { version = "1.0", features = ["time", "signal"], optional = true}
walkdir = "2.3"
xml-rs = "0.8"
# Not a direct dependencies of the crate, but something generated code uses
Expand Down
4 changes: 2 additions & 2 deletions roslibrust_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
thiserror = "2.0"
anyhow = "1.0"
# Used as basis for serialization
serde = { version = "1.0", features = ["derive"] }
serde = { workspace = true }
# Used for md5sum calculation
md5 = "0.7"
# Used for async trait definitions
Expand All @@ -17,6 +17,6 @@ futures = "0.3"
# THESE DEPENDENCIES WILL BE REMOVED
# We're currently leaking these error types in the "generic error type"
# We'll clean this up
tokio = { version = "1.41", features = ["time"] }
tokio = { workspace = true }
tokio-tungstenite = { version = "0.17" }
serde_json = "1.0"
6 changes: 3 additions & 3 deletions roslibrust_genmsg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ name = "gencpp"
path = "src/main.rs"

[dependencies]
log = { workspace = true }
serde = { workspace = true }
roslibrust_codegen = { path = "../roslibrust_codegen", version = "0.11.0" }
clap = { version = "4.1", features = ["derive"] }
env_logger = "0.11"
itertools = "0.12"
lazy_static = "1.4"
log = "0.4"
minijinja = "2.0"
roslibrust_codegen = { path = "../roslibrust_codegen", version = "0.11.0" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions roslibrust_mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition = "2021"

[dependencies]
roslibrust_common = { path = "../roslibrust_common" }
tokio = { version = "1.41", features = ["sync", "rt-multi-thread", "macros"] }
tokio = { workspace = true }
# Used for serializing messages
bincode = "1.3"
# We add logging to aid in debugging tests
log = "0.4"
log = { workspace = true }

[dev-dependencies]
roslibrust_codegen = { path = "../roslibrust_codegen" }
Expand Down
8 changes: 5 additions & 3 deletions roslibrust_ros1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ edition = "2021"
# Provides common types and traits used throughout the roslibrust ecosystem.
roslibrust_common = { path = "../roslibrust_common" }

# Standard dependencies:
tokio = { workspace = true }
log = { workspace = true }
serde = { workspace = true }

# Should probably become workspace members:
tokio = { version = "1.41", features = ["rt-multi-thread", "sync", "macros"] }
log = "0.4"
lazy_static = "1.4"
abort-on-drop = "0.2"
test-log = "0.2"
serde = { version = "1.0" }

# These are definitely needed by this crate:
reqwest = { version = "0.11" }
Expand Down
2 changes: 1 addition & 1 deletion roslibrust_rosapi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ roslibrust_common = { path = "../roslibrust_common" }
# but can work with any backend that implements the ServiceProvider trait and has a RosApi node running

[dev-dependencies]
tokio = { version = "1.41" }
tokio = { workspace = true }
test-log = "0.2"
# Only backend we're currently testing with
roslibrust_rosbridge = { path = "../roslibrust_rosbridge" }
Expand Down
10 changes: 2 additions & 8 deletions roslibrust_rosbridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@ edition = "2021"

[dependencies]
roslibrust_common = { path = "../roslibrust_common" }
tokio = { version = "1.20", features = [
"net",
"macros",
"time",
"rt-multi-thread",
"sync",
] }
tokio = { workspace = true }
log = { workspace = true }
tokio-tungstenite = { version = "0.17" }
uuid = { version = "1.1", features = ["v4"] }
log = "0.4"
serde_json = "1.0"
anyhow = "1.0"
futures = "0.3"
Expand Down
6 changes: 3 additions & 3 deletions roslibrust_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ roslibrust_common = { path = "../roslibrust_common" }
# We can fix this by moving the generated types into a roslibrust_ros1_types crate
roslibrust_codegen = { path = "../roslibrust_codegen" }
lazy_static = "1.4"
tokio = { version = "1.20", features = ["net", "sync"] }
log = "0.4"
tokio = { workspace = true }
log = { workspace = true }

[dev-dependencies]
diffy = "0.3.0"
criterion = { version = "0.4", features = ["html_reports", "async_tokio"] }
pprof = { version = "0.11", features = ["flamegraph", "criterion"] }
tokio = { version = "1.24", features = ["full"] }
tokio = { workspace = true }

[[bin]]
path = "src/performance_ramp.rs"
Expand Down
6 changes: 3 additions & 3 deletions roslibrust_zenoh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tokio = { version = "1.41", features = ["rt-multi-thread", "sync", "macros"] }
roslibrust_serde_rosmsg = { workspace = true }
log = { workspace = true }
tokio = { workspace = true }
roslibrust_common = { path = "../roslibrust_common" }
zenoh = "1.0"
hex = "0.4"
anyhow = "1.0"
roslibrust_serde_rosmsg = "0.4"
log = "0.4"

[dev-dependencies]
env_logger = "0.11"
Expand Down

0 comments on commit 4a472bb

Please sign in to comment.