Skip to content

Commit 48ddb3c

Browse files
authored
Migrate to dispatch2, decomission nym-apple-dispatch (#2644)
* Migrate to dispatch2, decomission nym-apple-dispatch * offline: keep ios interface consistent even though we do not return errors * monitor: rename MonitorHandleInner to ConnectivityHandleInner * Include dispatch2 in ios only under vpn-lib * Use Bool::as_bool() to convert to Rust bool * Update docs * Add https://github.com/madsmtm/objc2 to deny.toml
1 parent f4985ce commit 48ddb3c

File tree

18 files changed

+121
-404
lines changed

18 files changed

+121
-404
lines changed

nym-vpn-core/Cargo.lock

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

nym-vpn-core/Cargo.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"crates/nym-apple-dispatch",
54
"crates/nym-apple-network",
65
"crates/nym-authenticator-client",
76
"crates/nym-common",
@@ -99,7 +98,6 @@ base64-url = "3.0.0"
9998
bincode = "1.3.3"
10099
bip39 = "2.1"
101100
bitflags = "2"
102-
block2 = "0.5"
103101
bs58 = "0.5.1"
104102
bytes = "1.10"
105103
chrono = "0.4.40"
@@ -132,8 +130,6 @@ netlink-packet-route = "0.19.0"
132130
netlink-sys = "0.8.7"
133131
nftnl = "0.7.0"
134132
nix = "0.29"
135-
objc2 = "0.5"
136-
objc2-foundation = "0.2"
137133
once_cell = "1.21"
138134
pfctl = "0.6"
139135
pnet_packet = "0.35.0"
@@ -186,7 +182,13 @@ wmi = "0.14"
186182
x25519-dalek = "2.0"
187183
zeroize = "1.6.0"
188184

189-
nym-apple-dispatch = { path = "crates/nym-apple-dispatch" }
185+
# Switch these to the latest version once objc2 v0.6.1 released
186+
# https://github.com/madsmtm/objc2/milestone/7
187+
block2 = { git = "https://github.com/madsmtm/objc2", rev = "91a74f332f3db66378f457ad954f26c2d72277ca" }
188+
dispatch2 = { git = "https://github.com/madsmtm/objc2", rev = "91a74f332f3db66378f457ad954f26c2d72277ca" }
189+
objc2 = { git = "https://github.com/madsmtm/objc2", rev = "91a74f332f3db66378f457ad954f26c2d72277ca" }
190+
objc2-foundation = { git = "https://github.com/madsmtm/objc2", rev = "91a74f332f3db66378f457ad954f26c2d72277ca" }
191+
190192
nym-apple-network = { path = "crates/nym-apple-network" }
191193
nym-authenticator-client = { path = "crates/nym-authenticator-client" }
192194
nym-common = { path = "crates/nym-common" }

nym-vpn-core/crates/nym-apple-dispatch/Cargo.toml

Lines changed: 0 additions & 12 deletions
This file was deleted.

nym-vpn-core/crates/nym-apple-dispatch/src/lib.rs

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)