summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSebastian Holmin <sebastian.holmin@mullvad.net>2024-09-24 09:00:14 +0200
committerSebastian Holmin <sebastian.holmin@mullvad.net>2024-09-25 09:41:27 +0200
commit1c69b721b61b08ab93cd9d7186a3a2983b2aedf2 (patch)
tree1d32c13c5f8b6f405ec95dd822161fcda279c10e
parent0bee6e8104f4a5d2726919031444eeebabb8f5c5 (diff)
downloadmullvadvpn-1c69b721b61b08ab93cd9d7186a3a2983b2aedf2.tar.xz
mullvadvpn-1c69b721b61b08ab93cd9d7186a3a2983b2aedf2.zip
Add `futures` to workspace dependencies
-rw-r--r--Cargo.toml1
-rw-r--r--mullvad-api/Cargo.toml2
-rw-r--r--mullvad-cli/Cargo.toml2
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-jni/Cargo.toml2
-rw-r--r--mullvad-management-interface/Cargo.toml2
-rw-r--r--talpid-core/Cargo.toml2
-rw-r--r--talpid-openvpn/Cargo.toml2
-rw-r--r--talpid-routing/Cargo.toml2
-rw-r--r--talpid-tunnel/Cargo.toml2
-rw-r--r--talpid-windows/Cargo.toml2
-rw-r--r--talpid-wireguard/Cargo.toml2
12 files changed, 12 insertions, 11 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 565d52466d..2be4cf2b8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +67,7 @@ unused_async = "deny"
[workspace.dependencies]
tokio = { version = "1.8" }
parity-tokio-ipc = "0.9"
+futures = "0.3.15"
# Tonic and related crates
tonic = "0.10.0"
tonic-build = { version = "0.10.0", default-features = false }
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
index dacb6a7978..c181694a4b 100644
--- a/mullvad-api/Cargo.toml
+++ b/mullvad-api/Cargo.toml
@@ -18,7 +18,7 @@ api-override = []
libc = "0.2"
chrono = { workspace = true }
thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
http = "0.2"
hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }
ipnetwork = { workspace = true }
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 5be2adfd57..9c43a875cc 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0"
chrono = { workspace = true }
clap = { workspace = true }
thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
itertools = "0.10"
natord = "1.0.9"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 7a231ff69e..9342062d36 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -19,7 +19,7 @@ chrono = { workspace = true }
thiserror = { workspace = true }
either = "1.11"
fern = { version = "0.6", features = ["colored"] }
-futures = "0.3"
+futures = { workspace = true }
libc = "0.2"
log = { workspace = true }
regex = "1.0"
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 09cca45886..6af0c9c12b 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -21,7 +21,7 @@ crate-type = ["cdylib"]
tokio = { workspace = true, features = ["rt"] }
thiserror = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
ipnetwork = { workspace = true }
jnix = { version = "0.5.1", features = ["derive"] }
log = { workspace = true }
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index 004d5a4d56..5577ae941d 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -22,7 +22,7 @@ tonic = { workspace = true }
tower = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
tokio = { workspace = true, features = ["rt"] }
parity-tokio-ipc = { workspace = true }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index d4d02f14f7..5fab3022ab 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
[dependencies]
chrono = { workspace = true, features = ["clock"] }
thiserror = { workspace = true }
-futures = "0.3.15"
+futures = { workspace = true }
ipnetwork = { workspace = true }
libc = "0.2"
log = { workspace = true }
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index 3d62366bab..34df09becf 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
[dependencies]
async-trait = "0.1"
thiserror = { workspace = true }
-futures = "0.3.15"
+futures = { workspace = true }
log = { workspace = true }
shell-escape = "0.1"
talpid-routing = { path = "../talpid-routing" }
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index 2c8b99a00b..14f30b8333 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
[dependencies]
thiserror = { workspace = true }
-futures = "0.3.15"
+futures = { workspace = true }
ipnetwork = { workspace = true }
log = { workspace = true }
tokio = { workspace = true, features = ["process", "rt-multi-thread", "net", "io-util", "time"] }
diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml
index 21312912f4..8fcd270370 100644
--- a/talpid-tunnel/Cargo.toml
+++ b/talpid-tunnel/Cargo.toml
@@ -16,7 +16,7 @@ cfg-if = "1.0"
ipnetwork = { workspace = true }
talpid-routing = { path = "../talpid-routing" }
talpid-types = { path = "../talpid-types" }
-futures = "0.3.15"
+futures = { workspace = true }
tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
[target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
diff --git a/talpid-windows/Cargo.toml b/talpid-windows/Cargo.toml
index c786ac7a66..a44229b61d 100644
--- a/talpid-windows/Cargo.toml
+++ b/talpid-windows/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
[target.'cfg(windows)'.dependencies]
thiserror = { workspace = true }
socket2 = { version = "0.5.3" }
-futures = "0.3.15"
+futures = { workspace = true }
talpid-types = { path = "../talpid-types" }
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index f9ed018562..b4b5e11481 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
[dependencies]
thiserror = { workspace = true }
-futures = "0.3.15"
+futures = { workspace = true }
hex = "0.4"
ipnetwork = { workspace = true }
once_cell = { workspace = true }