Promote serde(_json) to workspace dependencies

mullvad · Aug 7, 2024 · 9df36ce · 9df36ce
1 parent 9f13cbd
commit 9df36ce
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -83,6 +83,8 @@ windows-sys = "0.52.0"
 chrono = { version = "0.4.26", default-features = false }
 clap = { version = "4.4.18", features = ["cargo", "derive"] }
 once_cell = "1.13"
+serde = "1.0.204"
+serde_json = "1.0.122"
 
 ipnetwork = "0.20"
 

diff --git a/android/translations-converter/Cargo.toml b/android/translations-converter/Cargo.toml
@@ -15,5 +15,5 @@ thiserror = { workspace = true }
 htmlize = { version = "1.0.2", features = ["unescape"] }
 once_cell = { workspace = true }
 regex = "1"
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 quick-xml = { version = "0.27.1", features = ["serialize"] }
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
@@ -23,8 +23,8 @@ http = "0.2"
 hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }
 ipnetwork = { workspace = true }
 log = { workspace = true }
-serde = "1"
-serde_json = "1.0"
+serde = { workspace = true }
+serde_json = { workspace = true }
 tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
 tokio-rustls = "0.24.1"
 tokio-socks = "0.5.1"

diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
@@ -29,8 +29,8 @@ talpid-types = { path = "../talpid-types" }
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
 tokio = { workspace = true, features =  ["macros", "rt-multi-thread", "fs"] }
-serde_json = "1.0.122"
-serde = "1.0.204"
+serde = { workspace = true }
+serde_json = { workspace = true }
 
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 clap_complete = { version = "4.4.8" }

diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
@@ -23,8 +23,8 @@ once_cell = { workspace = true }
 libc = "0.2"
 log = { workspace = true }
 regex = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 tokio = { workspace = true, features =  ["fs", "io-util", "rt-multi-thread", "sync", "time"] }
 tokio-stream = "0.1"
 

diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
@@ -18,7 +18,7 @@ itertools = "0.12"
 log = { workspace = true }
 once_cell = { workspace = true }
 rand = "0.8.5"
-serde_json = "1.0"
+serde_json = { workspace = true }
 
 talpid-types = { path = "../talpid-types" }
 mullvad-types = { path = "../mullvad-types" }

diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
@@ -17,7 +17,7 @@ ipnetwork = { workspace = true }
 once_cell = { workspace = true }
 log = { workspace = true }
 regex = "1"
-serde = { version = "1.0", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 uuid = { version = "1.4.1", features = ["v4", "serde" ] }
 
 talpid-types = { path = "../talpid-types" }

diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
@@ -58,8 +58,8 @@ pcap = { version = "2.0", features = ["capture-stream"] }
 pnet_packet = "0.34"
 tun = { version = "0.5.5", features = ["async"] }
 nix = { version = "0.28", features = ["socket"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 bitflags = "1.2"

diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
@@ -11,7 +11,7 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 ipnetwork = { workspace = true }
 base64 = "0.22.0"
 x25519-dalek = { version = "2.0.1", features = ["static_secrets", "zeroize", "getrandom"] }

diff --git a/test/Cargo.lock b/test/Cargo.lock
diff --git a/test/connection-checker/Cargo.toml b/test/connection-checker/Cargo.toml
@@ -16,5 +16,5 @@ color-eyre = "0.6.2"
 eyre = "0.6.12"
 ping = "0.5.2"
 reqwest = { version = "0.11.24", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 socket2 = { version = "0.5.4", features = ["all"] }