Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/tokio-1.37.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 1, 2024
2 parents 68c1439 + 7580147 commit 0f852e4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion examples/browser-webrtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tower-http = { version = "0.5.2", features = ["cors"] }
mime_guess = "2.0.4"

[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = "0.3.67"
js-sys = "0.3.69"
libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen"] }
libp2p-webrtc-websys = { workspace = true }
tracing-wasm = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion hole-punching-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ tracing = "0.1.37"
redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
tokio = { version = "1.37.0", features = ["full"] }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
serde_json = "1.0.115"
either = "1.9.0"
2 changes: 1 addition & 1 deletion misc/keygen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ release = false
clap = { version = "4.5.4", features = ["derive"] }
zeroize = "1"
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
serde_json = "1.0.115"
libp2p-core = { workspace = true }
base64 = "0.21.7"
libp2p-identity = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/request-response/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ libp2p-swarm = { workspace = true }
libp2p-identity = { workspace = true }
rand = "0.8"
serde = { version = "1.0", optional = true}
serde_json = { version = "1.0.114", optional = true }
serde_json = { version = "1.0.115", optional = true }
smallvec = "1.13.2"
tracing = "0.1.37"
void = "1.0.2"
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
[dependencies]
bytes = "1.6.0"
futures = "0.3.30"
js-sys = "0.3.67"
js-sys = "0.3.69"
libp2p-core = { workspace = true }
tracing = "0.1.37"
parking_lot = "0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion transports/webtransport-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
futures = "0.3.30"
js-sys = "0.3.67"
js-sys = "0.3.69"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
libp2p-noise = { workspace = true }
Expand Down

0 comments on commit 0f852e4

Please sign in to comment.