Skip to content

Commit 0ab81f0

Browse files
authored
Merge pull request #306 from 0x53A/dev
update all dependencies, fix one break with latest ros-z
2 parents 0d1cafe + 554c5da commit 0ab81f0

File tree

13 files changed

+77
-84
lines changed

13 files changed

+77
-84
lines changed

Cargo.lock

Lines changed: 47 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
[workspace]
2+
resolver = "2"
3+
package.rust-version = "1.90"
4+
25
members = [
36
"example_package",
47
"example_package_macro",
@@ -15,7 +18,6 @@ members = [
1518
"roslibrust_rosapi",
1619
"roslibrust_ros2",
1720
]
18-
resolver = "2"
1921

2022
[workspace.dependencies]
2123
log = "0.4"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ We uphold the rust lang [Code of Conduct](https://www.rust-lang.org/policies/cod
9999

100100
### Minimum Supported Rust Version / MSRV
101101

102-
MSRV is currently 1.85 to support edition 2024.
102+
MSRV is currently 1.90.

roslibrust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ roslibrust_codegen_macro = { path = "../roslibrust_codegen_macro" }
3434
# Slightly weird, but used in documentation examples
3535
roslibrust_test = { path = "../roslibrust_test" }
3636
# Slightly weird, but used in documentation examples
37-
zenoh = "1.0"
37+
zenoh = "1.7"
3838
# Provides test timeout
3939
ntest = "0.9"
4040

roslibrust_codegen/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ categories = ["science::robotics"]
1616
log = { workspace = true }
1717
serde = { workspace = true }
1818
roslibrust_common = { path = "../roslibrust_common", version = "0.19.0" }
19-
lazy_static = "1.4"
19+
lazy_static = "1.5"
2020
md5 = "0.7"
2121
proc-macro2 = "1.0"
2222
quote = "1.0"
2323
serde_json = "1.0"
2424
simple-error = "0.3"
2525
syn = "1.0"
26-
walkdir = "2.3"
26+
walkdir = "2.5"
2727
xml-rs = "0.8"
2828
# Not a direct dependencies of the crate, but something generated code uses
2929
# We include them as dependencies here and expose them with a `pub use`

roslibrust_common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ futures-core = "0.3"
2121
# Used for implementation of into_stream for subscribers
2222
async-stream = "0.3"
2323
# Used for validation of topic names
24-
regex = "1.9"
24+
regex = "1.12"

roslibrust_genmsg/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ path = "src/main.rs"
2121
log = { workspace = true }
2222
serde = { workspace = true }
2323
roslibrust_codegen = { path = "../roslibrust_codegen", version = "0.19" }
24-
clap = { version = "4.1", features = ["derive"] }
24+
clap = { version = "4.5", features = ["derive"] }
2525
env_logger = "0.11"
2626
itertools = "0.12"
27-
lazy_static = "1.4"
28-
minijinja = "2.0"
27+
lazy_static = "1.5"
28+
minijinja = "2.15"
2929
serde_json = "1"
3030

3131
[dev-dependencies]

roslibrust_ros1/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ log = { workspace = true }
1818
serde = { workspace = true }
1919

2020
# Should probably become workspace members:
21-
lazy_static = "1.4"
21+
lazy_static = "1.5"
2222
abort-on-drop = "0.2"
2323
test-log = { workspace = true }
2424

@@ -28,9 +28,9 @@ serde_xmlrpc = { version = "0.2" }
2828
roslibrust_serde_rosmsg = { workspace = true }
2929
hyper = { version = "0.14", features = ["server"] }
3030
gethostname = { version = "0.4" }
31-
regex = { version = "1.9" }
32-
byteorder = "1.4"
33-
bytes = "1.5"
31+
regex = { version = "1.12" }
32+
byteorder = "1.5"
33+
bytes = "1.11"
3434
thiserror = "2.0"
3535
anyhow = "1.0"
3636
getifs = "0.4"

roslibrust_ros2/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
zenoh = "1.5"
8+
zenoh = "1.7"
9+
zenoh-buffers = "1.7"
910
tokio = { workspace = true }
1011
env_logger = "0.11"
1112
cdr = "0.2"

0 commit comments

Comments
 (0)