From 9df36ce0435771b60a4b95466ae1b01a6d1f71c4 Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Tue, 6 Aug 2024 16:08:09 +0200 Subject: [PATCH] Promote serde(_json) to workspace dependencies --- Cargo.toml | 2 ++ android/translations-converter/Cargo.toml | 2 +- mullvad-api/Cargo.toml | 4 ++-- mullvad-cli/Cargo.toml | 4 ++-- mullvad-daemon/Cargo.toml | 4 ++-- mullvad-relay-selector/Cargo.toml | 2 +- mullvad-types/Cargo.toml | 2 +- talpid-core/Cargo.toml | 4 ++-- talpid-types/Cargo.toml | 2 +- test/Cargo.lock | 13 +++++++------ test/connection-checker/Cargo.toml | 2 +- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac63e1a4ca2e..c3b1185cbbda 100644 --- 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 index 57deb26a57a2..9bf902b17229 100644 --- 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 index 6958abb5bb6c..10b1cddce1ce 100644 --- 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 index 2a95f743af8f..5be2adfd5757 100644 --- 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 index ca7c46d8ca31..41172ad48674 100644 --- 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 index 0fb700d1f5c2..7f8436bacb24 100644 --- 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 index 864a7465e6e5..033743506407 100644 --- 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 index f7c67b9be72d..22515b3cc212 100644 --- 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 index e9e989f36bc4..d6e9ddc69f7c 100644 --- 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 index 7632b6d903b3..b2c01ff0696b 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -2904,18 +2904,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -2924,11 +2924,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] diff --git a/test/connection-checker/Cargo.toml b/test/connection-checker/Cargo.toml index d579510bd1e8..a09292e42650 100644 --- 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"] }