From 660f57a15b22291cac8c798742bd4b7cd2742047 Mon Sep 17 00:00:00 2001 From: Rawi Sader Date: Sat, 5 Oct 2024 17:19:55 -0500 Subject: [PATCH 1/4] build(if-watch): changed if-watch to if-watch-plus that addresses ios cross compilation --- Cargo.lock | 41 +++++++++++++++++++++++++++--------- protocols/mdns/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 2 +- transports/webrtc/Cargo.toml | 2 +- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28107c00ee9..3d03d5ca733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2305,10 +2305,10 @@ dependencies = [ ] [[package]] -name = "if-watch" -version = "3.2.0" +name = "if-watch-plus" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" +checksum = "1ceea2310d74439e0cc58ef11ab033ffd2de9376fb2af5a3ed87e12d519393ea" dependencies = [ "async-io 2.3.3", "core-foundation", @@ -2319,7 +2319,7 @@ dependencies = [ "log", "rtnetlink", "smol", - "system-configuration", + "system-configuration 0.6.1", "tokio", "windows 0.51.1", ] @@ -2925,7 +2925,7 @@ dependencies = [ "data-encoding", "futures", "hickory-proto", - "if-watch", + "if-watch-plus", "libp2p-core", "libp2p-identity", "libp2p-noise", @@ -3138,7 +3138,7 @@ dependencies = [ "bytes", "futures", "futures-timer", - "if-watch", + "if-watch-plus", "libp2p-core", "libp2p-identity", "libp2p-muxer-test-harness", @@ -3353,7 +3353,7 @@ dependencies = [ "async-std", "futures", "futures-timer", - "if-watch", + "if-watch-plus", "libc", "libp2p-core", "libp2p-identity", @@ -3420,7 +3420,7 @@ dependencies = [ "futures", "futures-timer", "hex", - "if-watch", + "if-watch-plus", "libp2p-core", "libp2p-identity", "libp2p-noise", @@ -4954,7 +4954,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls", @@ -5876,7 +5876,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.4.1", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -5889,6 +5900,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" version = "3.10.1" diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 19ae5ce9f36..117aab7fa5e 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -15,7 +15,7 @@ async-std = { version = "1.12.0", optional = true } async-io = { version = "2.3.3", optional = true } data-encoding = "2.6.0" futures = { workspace = true } -if-watch = "3.2.0" +if-watch = {package = "if-watch-plus", version="1.0.0"} libp2p-core = { workspace = true } libp2p-swarm = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 42cc8e54edb..b7963a5c973 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -13,7 +13,7 @@ async-std = { version = "1.12.0", optional = true } bytes = "1.6.0" futures = { workspace = true } futures-timer = "3.0.3" -if-watch = "3.2.0" +if-watch = {package = "if-watch-plus", version="1.0.0"} libp2p-core = { workspace = true } libp2p-tls = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 03e7fac491c..f1564380e68 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] async-io = { version = "2.3.3", optional = true } futures = { workspace = true } futures-timer = "3.0" -if-watch = "3.2.0" +if-watch = {package="if-watch-plus", version="1.0.0"} libc = "0.2.155" libp2p-core = { workspace = true } libp2p-identity = { workspace = true } diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index fc2748d93c3..2086643022f 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -16,7 +16,7 @@ bytes = "1" futures = { workspace = true } futures-timer = "3" hex = "0.4" -if-watch = "3.2" +if-watch = {package = "if-watch-plus", version="1.0.0"} libp2p-core = { workspace = true } libp2p-noise = { workspace = true } libp2p-identity = { workspace = true } From 2058c37c31fed0d8792386c4f61f7cc126cf5b93 Mon Sep 17 00:00:00 2001 From: Rawi Sader Date: Sat, 5 Oct 2024 18:24:41 -0500 Subject: [PATCH 2/4] chore(release): bump versions --- protocols/mdns/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 2 +- transports/webrtc/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 117aab7fa5e..2295ce4f850 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -2,7 +2,7 @@ name = "libp2p-mdns" edition = "2021" rust-version = { workspace = true } -version = "0.46.0" +version = "0.46.1" description = "Implementation of the libp2p mDNS discovery method" authors = ["Parity Technologies "] license = "MIT" diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index b7963a5c973..918121a2223 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-quic" -version = "0.11.1" +version = "0.11.2" authors = ["Parity Technologies "] edition = "2021" rust-version = { workspace = true } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index f1564380e68..82220ba4337 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -3,7 +3,7 @@ name = "libp2p-tcp" edition = "2021" rust-version = { workspace = true } description = "TCP/IP transport protocol for libp2p" -version = "0.42.0" +version = "0.42.1" authors = ["Parity Technologies "] license = "MIT" repository = "https://github.com/libp2p/rust-libp2p" diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index 2086643022f..436ea9e2d82 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-webrtc" -version = "0.8.0-alpha" +version = "0.8.1-alpha" authors = ["Parity Technologies "] description = "WebRTC transport for libp2p" repository = "https://github.com/libp2p/rust-libp2p" From e9d30c9d0d448928e242f6010b954c1f42ba1946 Mon Sep 17 00:00:00 2001 From: Rawi Sader Date: Sat, 5 Oct 2024 18:25:52 -0500 Subject: [PATCH 3/4] chore(release): Update changelog --- protocols/mdns/CHANGELOG.md | 4 ++++ transports/quic/CHANGELOG.md | 4 ++++ transports/tcp/CHANGELOG.md | 4 ++++ transports/webrtc/CHANGELOG.md | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md index 67b1d669f60..b0a2a65145b 100644 --- a/protocols/mdns/CHANGELOG.md +++ b/protocols/mdns/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.46.1 +- Changed unmaintained `if-watch@3.2.0` to `if-watch-plus@1.0.0` +See [PR 5624](https://github.com/libp2p/rust-libp2p/pull/5624) + ## 0.46.0 diff --git a/transports/quic/CHANGELOG.md b/transports/quic/CHANGELOG.md index 6fc64c5df36..778c08dbcd6 100644 --- a/transports/quic/CHANGELOG.md +++ b/transports/quic/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.11.2 +- Changed unmaintained `if-watch@3.2.0` to `if-watch-plus@1.0.0` +See [PR 5624](https://github.com/libp2p/rust-libp2p/pull/5624) + ## 0.11.1 - Update `libp2p-tls` to version `0.5.0`, see [PR 5547] diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md index 107d0d13ece..a5ef55c512f 100644 --- a/transports/tcp/CHANGELOG.md +++ b/transports/tcp/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.42.1 +- Changed unmaintained `if-watch@3.2.0` to `if-watch-plus@1.0.0` +See [PR 5624](https://github.com/libp2p/rust-libp2p/pull/5624) + ## 0.42.0 - Implement refactored `Transport`. diff --git a/transports/webrtc/CHANGELOG.md b/transports/webrtc/CHANGELOG.md index 90d4ce83df3..1c70fb60116 100644 --- a/transports/webrtc/CHANGELOG.md +++ b/transports/webrtc/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.1-alpha +- Changed unmaintained `if-watch@3.2.0` to `if-watch-plus@1.0.0` +See [PR 5624](https://github.com/libp2p/rust-libp2p/pull/5624) + ## 0.8.0-alpha - Implement refactored `Transport`. From 4b6853c66e487f171609c0bb9df7a4b2646b691c Mon Sep 17 00:00:00 2001 From: Rawi Sader Date: Tue, 8 Oct 2024 12:45:26 -0500 Subject: [PATCH 4/4] chore(release): bump versions --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d03d5ca733..fe8738512ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2918,7 +2918,7 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.46.0" +version = "0.46.1" dependencies = [ "async-io 2.3.3", "async-std", @@ -3132,7 +3132,7 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.11.1" +version = "0.11.2" dependencies = [ "async-std", "bytes", @@ -3347,7 +3347,7 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.42.0" +version = "0.42.1" dependencies = [ "async-io 2.3.3", "async-std", @@ -3413,7 +3413,7 @@ dependencies = [ [[package]] name = "libp2p-webrtc" -version = "0.8.0-alpha" +version = "0.8.1-alpha" dependencies = [ "async-trait", "bytes", diff --git a/Cargo.toml b/Cargo.toml index cc677013fa9..ad6603c47a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ libp2p-gossipsub = { version = "0.47.1", path = "protocols/gossipsub" } libp2p-identify = { version = "0.45.1", path = "protocols/identify" } libp2p-identity = { version = "0.2.9" } libp2p-kad = { version = "0.47.0", path = "protocols/kad" } -libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" } +libp2p-mdns = { version = "0.46.1", path = "protocols/mdns" } libp2p-memory-connection-limits = { version = "0.3.0", path = "misc/memory-connection-limits" } libp2p-metrics = { version = "0.15.0", path = "misc/metrics" } libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" } @@ -96,7 +96,7 @@ libp2p-perf = { version = "0.4.0", path = "protocols/perf" } libp2p-ping = { version = "0.45.0", path = "protocols/ping" } libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" } libp2p-pnet = { version = "0.25.0", path = "transports/pnet" } -libp2p-quic = { version = "0.11.1", path = "transports/quic" } +libp2p-quic = { version = "0.11.2", path = "transports/quic" } libp2p-relay = { version = "0.18.0", path = "protocols/relay" } libp2p-rendezvous = { version = "0.15.0", path = "protocols/rendezvous" } libp2p-request-response = { version = "0.27.0", path = "protocols/request-response" } @@ -105,11 +105,11 @@ libp2p-stream = { version = "0.2.0-alpha", path = "protocols/stream" } libp2p-swarm = { version = "0.45.2", path = "swarm" } libp2p-swarm-derive = { version = "=0.35.0", path = "swarm-derive" } # `libp2p-swarm-derive` may not be compatible with different `libp2p-swarm` non-breaking releases. E.g. `libp2p-swarm` might introduce a new enum variant `FromSwarm` (which is `#[non-exhaustive]`) in a non-breaking release. Older versions of `libp2p-swarm-derive` would not forward this enum variant within the `NetworkBehaviour` hierarchy. Thus the version pinning is required. libp2p-swarm-test = { version = "0.4.0", path = "swarm-test" } -libp2p-tcp = { version = "0.42.0", path = "transports/tcp" } +libp2p-tcp = { version = "0.42.1", path = "transports/tcp" } libp2p-tls = { version = "0.5.0", path = "transports/tls" } libp2p-uds = { version = "0.41.0", path = "transports/uds" } libp2p-upnp = { version = "0.3.0", path = "protocols/upnp" } -libp2p-webrtc = { version = "0.8.0-alpha", path = "transports/webrtc" } +libp2p-webrtc = { version = "0.8.1-alpha", path = "transports/webrtc" } libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" } libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" } libp2p-websocket = { version = "0.44.0", path = "transports/websocket" }