Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/clap-4.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 13, 2023
2 parents 40734bc + bded9aa commit d4f332d
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 153 deletions.
202 changes: 59 additions & 143 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hole-punching-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ license = "MIT"

[dependencies]
anyhow = "1"
env_logger = "0.10.0"
env_logger = "0.10.1"
futures = "0.3.29"
libp2p = { path = "../libp2p", features = ["tokio", "dcutr", "identify", "macros", "noise", "ping", "relay", "tcp", "yamux", "quic"] }
tracing = "0.1.37"
redis = { version = "0.23.0", default-features = false, features = ["tokio-comp"] }
tokio = { version = "1.29.1", features = ["full"] }
serde = { version = "1.0.190", features = ["derive"] }
serde = { version = "1.0.192", features = ["derive"] }
serde_json = "1.0.108"
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 @@ -15,7 +15,7 @@ release = false
[dependencies]
clap = { version = "4.4.8", features = ["derive"] }
zeroize = "1"
serde = { version = "1.0.190", features = ["derive"] }
serde = { version = "1.0.192", features = ["derive"] }
serde_json = "1.0.108"
libp2p-core = { workspace = true }
base64 = "0.21.5"
Expand Down
2 changes: 1 addition & 1 deletion misc/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ futures-timer = "3"
hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
libp2p = { workspace = true, features = ["autonat", "dns", "tokio", "noise", "tcp", "yamux", "identify", "kad", "ping", "relay", "metrics", "rsa", "macros", "quic"] }
prometheus-client = { workspace = true }
serde = "1.0.190"
serde = "1.0.192"
serde_derive = "1.0.125"
serde_json = "1.0"
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
Expand Down
2 changes: 1 addition & 1 deletion protocols/gossipsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ either = "1.9"
fnv = "1.0.7"
futures = "0.3.29"
futures-ticker = "0.0.3"
getrandom = "0.2.9"
getrandom = "0.2.11"
hex_fmt = "0.3.0"
instant = "0.1.12"
libp2p-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion swarm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ either = "1.9.0"
fnv = "1.0"
futures = "0.3.29"
futures-timer = "3.0.2"
getrandom = { version = "0.2.9", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
getrandom = { version = "0.2.11", features = ["js"], optional = true } # Explicit dependency to be used in `wasm-bindgen` feature
instant = "0.1.12"
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion transports/noise/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ x25519-dalek = "2"
zeroize = "1"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
snow = { version = "0.9.2", features = ["ring-resolver"], default-features = false }
snow = { version = "0.9.4", features = ["ring-resolver"], default-features = false }

[target.'cfg(target_arch = "wasm32")'.dependencies]
snow = { version = "0.9.2", features = ["default-resolver"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion transports/webrtc-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish = true
bytes = "1"
futures = "0.3"
futures-timer = "3"
getrandom = { version = "0.2.9", features = ["js"] }
getrandom = { version = "0.2.11", features = ["js"] }
hex = "0.4.3"
js-sys = { version = "0.3" }
libp2p-core = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions wasm-tests/webtransport-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release = false

[dependencies]
futures = "0.3.29"
getrandom = { version = "0.2.9", features = ["js"] }
getrandom = { version = "0.2.11", features = ["js"] }
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true, features = ["rand"] }
libp2p-noise = { workspace = true }
Expand All @@ -19,7 +19,7 @@ multiaddr = { workspace = true }
multihash = { workspace = true }
wasm-bindgen = "0.2.88"
wasm-bindgen-futures = "0.4.38"
wasm-bindgen-test = "0.3.37"
wasm-bindgen-test = "0.3.38"
web-sys = { version = "0.3.65", features = ["Response", "Window"] }

[lints]
Expand Down

0 comments on commit d4f332d

Please sign in to comment.