Move tonic and related crates to workspace dependencies

6 files changed, 25 insertions, 20 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 6d18bf4332..c3ec850f62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,12 @@ members = [
 
 [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
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index 3a506c27b5..01a48ca69a 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -14,10 +14,10 @@ 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 = { workspace = true, features =  ["rt"] }
@@ -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/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index d06a3097bc..24dfaca032 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -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,8 +107,7 @@ 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"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index f60cb32dbb..f7a4273b96 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -21,12 +21,12 @@ 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 b19f01a863..576f4e7558 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -33,8 +33,8 @@ shadowsocks-service = { git = "https://github.com/mullvad/shadowsocks-rust", rev
 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,7 +54,7 @@ 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]
diff --git a/talpid-tunnel-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml
index c1139c2043..0359f5dc22 100644
--- a/talpid-tunnel-config-client/Cargo.toml
+++ b/talpid-tunnel-config-client/Cargo.toml
@@ -12,9 +12,9 @@ publish.workspace = true
 log = "0.4"
 rand = "0.8"
 talpid-types = { path = "../talpid-types" }
-tonic = "0.8"
-prost = "0.11"
-tower = "0.4"
+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"] }
@@ -30,4 +30,4 @@ windows-sys = { version = "0.45.0", features = [
 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"] }