Move deps around

Author: pinkisemils

Cargo.toml

@@ -87,6 +87,8 @@ unused_async = "deny"
 wildcard_dependencies = "deny"
 
 [workspace.dependencies]
+# Should follow whatever tokio uses
+bytes = "^1.2"
 dirs = "6.0.0"
 tokio = { version = "1.44" }
 tokio-util = "0.7"
@@ -97,6 +99,7 @@ sha2 = "0.10"
 chrono = { version = "0.4.26", default-features = false }
 clap = { version = "4.4.18", features = ["cargo", "derive"] }
 once_cell = "1.16"
+papaya = "0.2"
 serde = "1.0.204"
 serde_json = "1.0.122"
 widestring = "1.2"
@@ -117,6 +120,8 @@ rustls = { version = "0.23", default-features = false }
 rustls-pki-types = "1.13.1"
 webpki-roots = "1.0.4"
 
+
+
 rtnetlink = "0.18"
 netlink-packet-core = "0.8.0"
 netlink-packet-route = "0.25"

mullvad-api/Cargo.toml

@@ -61,9 +61,9 @@ clap = { workspace = true, features = ["cargo", "derive"] }
 tracing-subscriber = { workspace = true }
 shadowsocks = { workspace = true, features = ["stream-cipher"] }
 
-papaya = "0.2"
+papaya = { workspace = true }
 # Should follow whatever tokio uses
-bytes = "^1.2"
+bytes = { workspace = true }
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]
 mullvad-update = { path = "../mullvad-update", features = ["client"] }

test/Cargo.lock

@@ -43,8 +43,10 @@ unused_async = "deny"
 wildcard_dependencies = "deny"
 
 [workspace.dependencies]
+bytes = "^1.2"
 dirs = "6.0.0"
 futures = "0.3"
+papaya = "0.2"
 tokio = { version = "1.44", features = [
   "macros",
   "rt",
@@ -79,7 +81,6 @@ colored = "2.0.0"
 windows-sys = "0.52.0"
 chrono = { version = "0.4.26", default-features = false }
 clap = { version = "4.2.7", features = ["cargo", "derive"] }
-bytes = "1.3.0"
 async-trait = "0.1.58"
 socket2 = "0.5.7"
 surge-ping = "0.8"