Merge branch 'use-workspace-dependencies'

22 files changed, 53 insertions, 45 deletions

diff --git a/Cargo.toml b/Cargo.toml
index c75e9cd472..c3ec850f62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,15 @@ members = [
     "tunnel-obfuscation",
 ]
 
+[workspace.dependencies]
+tokio = { version = "1.8" }
+# Tonic and related crates
+tonic = "0.8"
+tonic-build = { version = "0.8", default-features = false }
+tower = "0.4"
+prost = "0.11"
+prost-types = "0.11"
+
 [profile.release]
 opt-level = 3
 lto = true
diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
index cc6337bd69..083b8cfa3f 100644
--- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
+++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml
@@ -16,7 +16,7 @@ shadowsocks-service.git = "https://github.com/mullvad/shadowsocks-rust"
 shadowsocks-service.rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36"
 shadowsocks-service.features = [ "local", "stream-cipher", "local-http", "local-tunnel" ]
 
-tokio = "1"
+tokio = { workspace = true }
 libc = "0.2"
 log = "0.4"
 
diff --git a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
index 0dff320f35..9faa931e41 100644
--- a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
+++ b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
@@ -13,7 +13,7 @@ bench = false
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tunnel-obfuscation = { path = "../../../tunnel-obfuscation" }
-tokio = { version = "1", features = ["sync"] }
+tokio = { workspace = true, features = ["sync"] }
 libc = "0.2"
 log = "0.4"
 oslog = "0.2"
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
index 555eb13774..1133b6ff6a 100644
--- a/mullvad-api/Cargo.toml
+++ b/mullvad-api/Cargo.toml
@@ -23,7 +23,7 @@ log = "0.4"
 regex = "1"
 serde = "1"
 serde_json = "1.0"
-tokio = { version = "1.8", features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
+tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
 tokio-rustls = "0.23"
 rustls-pemfile = "0.2"
 once_cell = "1.13"
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 0b3c194005..1e5d121e91 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -30,7 +30,7 @@ mullvad-version = { path = "../mullvad-version" }
 talpid-types = { path = "../talpid-types" }
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
-tokio = { version = "1.8", features =  [ "rt-multi-thread" ] }
+tokio = { workspace = true, features =  [ "rt-multi-thread" ] }
 
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 clap_complete = { version = "4.2.1" }
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 3ebbcb6de0..92ba1570bd 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -27,7 +27,7 @@ rand = "0.8.5"
 regex = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.8", features =  ["fs", "io-util", "rt-multi-thread", "sync", "time"] }
+tokio = { workspace = true, features =  ["fs", "io-util", "rt-multi-thread", "sync", "time"] }
 tokio-stream = "0.1"
 uuid = { version = "0.8", features = ["v4"] }
 
diff --git a/mullvad-fs/Cargo.toml b/mullvad-fs/Cargo.toml
index c4800b283b..f3a6465798 100644
--- a/mullvad-fs/Cargo.toml
+++ b/mullvad-fs/Cargo.toml
@@ -10,7 +10,7 @@ publish.workspace = true
 
 [dependencies]
 log = "0.4"
-tokio = { version = "1.8", features = ["fs"] }
+tokio = { workspace = true, features = ["fs"] }
 uuid = { version = "0.8", features = ["v4"] }
 
 talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index dbaf5c12d4..edb21d437a 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -25,7 +25,7 @@ log = "0.4"
 log-panics = "2"
 nix = "0.23"
 rand = "0.8.5"
-tokio = "1.8"
+tokio = { workspace = true }
 
 mullvad-daemon = { path = "../mullvad-daemon" }
 mullvad-paths = { path = "../mullvad-paths" }
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index ed38d28f87..01a48ca69a 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -14,13 +14,13 @@ err-derive = "0.3.1"
 mullvad-types = { path = "../mullvad-types" }
 mullvad-paths = { path = "../mullvad-paths" }
 talpid-types = { path = "../talpid-types" }
-tonic = "0.8"
-tower = "0.4"
-prost = "0.11"
-prost-types = "0.11"
+tonic = { workspace = true }
+tower = { workspace = true }
+prost = { workspace = true }
+prost-types = { workspace = true }
 parity-tokio-ipc = "0.9"
 futures = "0.3"
-tokio = { version = "1.8", features =  ["rt"] }
+tokio = { workspace = true, features =  ["rt"] }
 log = "0.4"
 
 [target.'cfg(unix)'.dependencies]
@@ -28,4 +28,4 @@ nix = "0.23"
 lazy_static = "1.0"
 
 [build-dependencies]
-tonic-build = { version = "0.8", default-features = false, features = ["transport", "prost"] }
+tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index b920097eda..c73f260da2 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -15,7 +15,7 @@ lazy_static = "1.0"
 log = "0.4"
 regex = "1.0"
 uuid = { version = "0.8", features = ["v4"] }
-tokio = { version = "1.8", features = ["rt"] }
+tokio = { workspace = true, features = ["rt"] }
 
 mullvad-paths = { path = "../mullvad-paths" }
 mullvad-api = { path = "../mullvad-api" }
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index f62a6a6a54..1ae5e33e79 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -18,7 +18,7 @@ parking_lot = "0.12.0"
 rand = "0.8.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.8", features =  ["fs", "io-util", "time"] }
+tokio = { workspace = true, features =  ["fs", "io-util", "time"] }
 tokio-stream = "0.1"
 
 talpid-core = { path = "../talpid-core" }
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index b122deb235..5959a4d486 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -20,7 +20,7 @@ lazy_static = "1.1.0"
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
 
-tokio = { version = "1.8", features =  ["rt-multi-thread"] }
+tokio = { workspace = true, features =  ["rt-multi-thread"] }
 
 mullvad-daemon = { path = "../mullvad-daemon" }
 mullvad-paths = { path = "../mullvad-paths" }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index e62da78dcf..24dfaca032 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -31,7 +31,7 @@ talpid-tunnel = { path = "../talpid-tunnel" }
 talpid-wireguard = { path = "../talpid-wireguard" }
 zeroize = "1"
 chrono = "0.4.21"
-tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
+tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 rand = "0.8.5"
 
 [target.'cfg(not(target_os="android"))'.dependencies]
@@ -39,11 +39,11 @@ byteorder = "1"
 internet-checksum = "0.2"
 shell-escape = "0.1"
 socket2 = { version = "0.4.2", features = ["all"] }
-prost = "0.11"
 parity-tokio-ipc = "0.9"
 talpid-openvpn = { path = "../talpid-openvpn" }
 triggered = "0.1.1"
-tonic = "0.8"
+tonic = { workspace = true }
+prost = { workspace = true }
 uuid = { version = "0.8", features = ["v4"] }
 
 [target.'cfg(unix)'.dependencies]
@@ -107,11 +107,10 @@ features = [
 ]
 
 [build-dependencies]
-tonic-build = { version = "0.8", default-features = false, features = ["transport", "prost"] }
-
+tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
 
 [dev-dependencies]
 tempfile = "3.0"
 quickcheck = { version = "1.0", default-features = false }
 quickcheck_macros = "1.0"
-tokio = { version = "1", features = [ "test-util" ] }
+tokio = { workspace = true, features = [ "test-util" ] }
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index cb4439ec9f..4aac7f62ef 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -13,4 +13,4 @@ err-derive = "0.3.1"
 lazy_static = "1.0"
 log = "0.4"
 libc = "0.2"
-tokio = { version = "1.8", features = ["rt"] }
+tokio = { workspace = true, features = ["rt"] }
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index d18511889f..f7a4273b96 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -16,17 +16,17 @@ err-derive = "0.3.1"
 log = "0.4"
 env_logger = "0.10.0"
 parity-tokio-ipc = "0.9"
-tokio = { version = "1.8", features =  ["rt"] }
+tokio = { workspace = true, features =  ["rt"] }
 
 openvpn-plugin = { version = "0.4.2", features = ["serde", "log", "auth-failed-event"] }
 talpid-types = { path = "../talpid-types" }
 
-tonic = "0.8"
-tower = "0.4"
-prost = "0.11"
+tonic = { workspace = true }
+tower = { workspace = true }
+prost = { workspace = true }
 
 [build-dependencies]
-tonic-build = { version = "0.8", default-features = false, features = ["transport", "prost"] }
+tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
 
 
 [target.'cfg(windows)'.build-dependencies]
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index 71ab1c218d..576f4e7558 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -26,15 +26,15 @@ talpid-routing = { path = "../talpid-routing" }
 talpid-tunnel = { path = "../talpid-tunnel" }
 talpid-types = { path = "../talpid-types" }
 uuid = { version = "0.8", features = ["v4"] }
-tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
+tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 shadowsocks-service = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36",  features = [ "local", "stream-cipher" ] }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
 socket2 = { version = "0.4.2", features = ["all"] }
 parity-tokio-ipc = "0.9"
 triggered = "0.1.1"
-tonic = "0.8"
-prost = "0.11"
+tonic = { workspace = true }
+prost = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 which = { version = "4.0", default-features = false }
@@ -54,8 +54,8 @@ features = [
 ]
 
 [build-dependencies]
-tonic-build = { version = "0.8", default-features = false, features = ["transport", "prost"] }
+tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
 
 
 [dev-dependencies]
-tokio = { version = "1", features = [ "test-util" ] }
+tokio = { workspace = true, features = [ "test-util" ] }
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index eda64c029b..49e461dbd9 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.15"
 ipnetwork = "0.16"
 log = "0.4"
 talpid-types = { path = "../talpid-types" }
-tokio = { version = "1.8", features = ["process", "rt-multi-thread", "net"] }
+tokio = { workspace = true, features = ["process", "rt-multi-thread", "net"] }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
 talpid-types = { path = "../talpid-types" }
@@ -46,4 +46,4 @@ windows-sys = { version = "0.45.0", features = [
 ]}
 
 [dev-dependencies]
-tokio = { version = "1", features = [ "test-util" ] }
+tokio = { workspace = true, features = [ "test-util" ] }
diff --git a/talpid-time/Cargo.toml b/talpid-time/Cargo.toml
index c8ebca968b..7bd49722ec 100644
--- a/talpid-time/Cargo.toml
+++ b/talpid-time/Cargo.toml
@@ -9,5 +9,5 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-tokio = { version = "1.8", features = ["time"] }
+tokio = { workspace = true, features = ["time"] }
 libc = "0.2"
diff --git a/talpid-tunnel-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml
index 6a6140513e..0359f5dc22 100644
--- a/talpid-tunnel-config-client/Cargo.toml
+++ b/talpid-tunnel-config-client/Cargo.toml
@@ -12,10 +12,10 @@ publish.workspace = true
 log = "0.4"
 rand = "0.8"
 talpid-types = { path = "../talpid-types" }
-tonic = "0.8"
-prost = "0.11"
-tower = "0.4"
-tokio = "1"
+tonic = { workspace = true }
+tower = { workspace = true }
+prost = { workspace = true }
+tokio = { workspace = true }
 classic-mceliece-rust = { version = "2.0.0", features = ["mceliece460896f", "zeroize"] }
 pqc_kyber = { version = "0.4.0", features = ["std", "kyber1024", "zeroize"] }
 zeroize = "1.5.7"
@@ -27,7 +27,7 @@ windows-sys = { version = "0.45.0", features = [
 ]}
 
 [dev-dependencies]
-tokio = { version = "1", features = ["rt-multi-thread"] }
+tokio = { workspace = true, features = ["rt-multi-thread"] }
 
 [build-dependencies]
-tonic-build = { version = "0.8", default-features = false, features = ["transport", "prost"] }
+tonic-build = { workspace = true, default-features = false, features = ["transport", "prost"] }
diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml
index d2314a86c2..4e58162d6f 100644
--- a/talpid-tunnel/Cargo.toml
+++ b/talpid-tunnel/Cargo.toml
@@ -15,7 +15,7 @@ ipnetwork = "0.16"
 talpid-routing = { path = "../talpid-routing" }
 talpid-types = { path = "../talpid-types" }
 futures = "0.3.15"
-tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
+tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 duct = "0.13"
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index e7e3d77e22..c4410771b7 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -24,7 +24,7 @@ talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }
 talpid-tunnel = { path = "../talpid-tunnel" }
 zeroize = "1"
 chrono = "0.4.21"
-tokio = { version = "1.8", features = ["process", "rt-multi-thread", "fs"] }
+tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 tunnel-obfuscation = { path = "../tunnel-obfuscation" }
 rand = "0.8.5"
 
diff --git a/tunnel-obfuscation/Cargo.toml b/tunnel-obfuscation/Cargo.toml
index d3aa56fbcd..0c209d2532 100644
--- a/tunnel-obfuscation/Cargo.toml
+++ b/tunnel-obfuscation/Cargo.toml
@@ -12,5 +12,5 @@ publish.workspace = true
 async-trait = "0.1"
 err-derive = "0.3.0"
 futures = "0.3.5"
-tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "net", "io-util"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros", "net", "io-util"] }
 udp-over-tcp = { git = "https://github.com/mullvad/udp-over-tcp", rev = "87936ac29b68b902565955f138ab02294bcc8593" }