Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/serde_json-1.0.109
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jan 3, 2024
2 parents 19323c2 + 99a6ad4 commit 7f42ae5
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 59 deletions.
71 changes: 30 additions & 41 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/autonat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ release = false

[dependencies]
tokio = { version = "1.35", features = ["full"] }
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = ["tokio", "tcp", "noise", "yamux", "autonat", "identify", "macros"] }
tracing = "0.1.37"
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webrtc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
axum = "0.7.1"
libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
libp2p-webrtc = { workspace = true, features = ["tokio"] }
rust-embed = { version = "8.1.0", features = ["include-exclude", "interpolate-folder-path"] }
rust-embed = { version = "8.2.0", features = ["include-exclude", "interpolate-folder-path"] }
tokio = { version = "1.35", features = ["macros", "net", "rt", "signal"] }
tokio-util = { version = "0.7", features = ["compat"] }
tower = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
release = false

[dependencies]
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
futures = "0.3.30"
futures-timer = "3.0"
libp2p = { path = "../../libp2p", features = [ "dns", "dcutr", "identify", "macros", "noise", "ping", "quic", "relay", "rendezvous", "tcp", "tokio", "yamux"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/file-sharing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
serde = { version = "1.0", features = ["derive"] }
async-std = { version = "1.12", features = ["attributes"] }
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
either = "1.9"
futures = "0.3.30"
libp2p = { path = "../../libp2p", features = [ "async-std", "cbor", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ release = false
[dependencies]
tokio = { version = "1.35", features = ["rt-multi-thread", "macros"] }
async-trait = "0.1"
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
env_logger = "0.10"
futures = "0.3.30"
anyhow = "1.0.76"
Expand Down
2 changes: 1 addition & 1 deletion examples/relay-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ license = "MIT"
release = false

[dependencies]
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1"
futures = "0.3.30"
Expand Down
2 changes: 1 addition & 1 deletion interop-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mime_guess = "2.0"
redis = { version = "0.23.3", default-features = false, features = [
"tokio-comp",
] }
rust-embed = "8.1"
rust-embed = "8.2"
serde_json = "1"
thirtyfour = "=0.32.0-rc.8" # https://github.com/stevepryde/thirtyfour/issues/169
tokio = { version = "1.35.1", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion misc/keygen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
release = false

[dependencies]
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
zeroize = "1"
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.109"
Expand Down
2 changes: 1 addition & 1 deletion misc/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ license = "MIT"

[dependencies]
base64 = "0.21"
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
futures = "0.3"
futures-timer = "3"
hyper = { version = "0.14", features = ["server", "tcp", "http1"] }
Expand Down
2 changes: 1 addition & 1 deletion protocols/dcutr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ futures-bounded = { workspace = true }

[dev-dependencies]
async-std = { version = "1.12.0", features = ["attributes"] }
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
libp2p-dns = { workspace = true, features = ["async-std"] }
libp2p-identify = { workspace = true }
libp2p-noise = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion protocols/floodsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ quick-protobuf = "0.8"
quick-protobuf-codec = { workspace = true }
rand = "0.8"
smallvec = "1.11.2"
thiserror = "1.0.51"
thiserror = "1.0.53"
tracing = "0.1.37"

# Passing arguments to the docsrs builder in order to properly document cfg's.
Expand Down
2 changes: 1 addition & 1 deletion protocols/perf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]

[dependencies]
anyhow = "1"
clap = { version = "4.4.11", features = ["derive"] }
clap = { version = "4.4.12", features = ["derive"] }
futures = "0.3.30"
futures-bounded = { workspace = true }
futures-timer = "3.0"
Expand Down
2 changes: 1 addition & 1 deletion transports/noise/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ quick-protobuf = "0.8"
rand = "0.8.3"
sha2 = "0.10.8"
static_assertions = "1"
thiserror = "1.0.51"
thiserror = "1.0.53"
tracing = "0.1.37"
x25519-dalek = "2"
zeroize = "1"
Expand Down
2 changes: 1 addition & 1 deletion transports/quic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ parking_lot = "0.12.0"
quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
rand = "0.8.5"
rustls = { version = "0.21.9", default-features = false }
thiserror = "1.0.51"
thiserror = "1.0.53"
tokio = { version = "1.35.1", default-features = false, features = ["net", "rt", "time"], optional = true }
tracing = "0.1.37"
socket2 = "0.5.5"
Expand Down
2 changes: 1 addition & 1 deletion transports/tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
rcgen = "0.11.3"
ring = "0.16.20"
thiserror = "1.0.51"
thiserror = "1.0.53"
webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] }
x509-parser = "0.15.1"
yasna = "0.5.2"
Expand Down
2 changes: 1 addition & 1 deletion transports/uds/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tokio = { version = "1.35", default-features = false, features = ["net"], option
tracing = "0.1.37"

[dev-dependencies]
tempfile = "3.8"
tempfile = "3.9"

# Passing arguments to the docsrs builder in order to properly document cfg's.
# More information: https://docs.rs/about/builds#cross-compiling
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 @@ -18,7 +18,7 @@ libp2p-core = { workspace = true }
tracing = "0.1.37"
parking_lot = "0.12.1"
send_wrapper = "0.6.0"
thiserror = "1.0.51"
thiserror = "1.0.53"
wasm-bindgen = "0.2.89"
web-sys = { version = "0.3.66", features = ["BinaryType", "CloseEvent", "MessageEvent", "WebSocket", "Window", "WorkerGlobalScope"] }

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 @@ -22,7 +22,7 @@ libp2p-noise = { workspace = true }
multiaddr = { workspace = true }
multihash = { workspace = true }
send_wrapper = { version = "0.6.0", features = ["futures"] }
thiserror = "1.0.51"
thiserror = "1.0.53"
tracing = "0.1.37"
wasm-bindgen = "0.2.89"
wasm-bindgen-futures = "0.4.39"
Expand Down

0 comments on commit 7f42ae5

Please sign in to comment.