Merge branch 'make-every-crate-compile-on-its-own'

8 files changed, 8 insertions, 7 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 4e89bfc736..8a0f97ccf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ prost-types = "0.11"
 windows-sys = "0.45.0"
 
 chrono = { version = "0.4.26", default-features = false}
+clap = { version = "4.2.7", features = ["cargo", "derive"] }
 
 
 [profile.release]
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index a8d9949306..3a340e69d9 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0"
 chrono = { workspace = true }
-clap = { version = "4.2.7", features = ["cargo", "derive"] }
+clap = { workspace = true }
 env_logger = "0.10.0"
 futures = "0.3"
 natord = "1.0.9"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 529e74b6e4..2b5a576ffd 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -39,7 +39,7 @@ talpid-platform-metadata = { path = "../talpid-platform-metadata" }
 talpid-time = { path = "../talpid-time" }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
-clap = { version = "4.2.7", features = ["cargo", "derive"] }
+clap = { workspace = true }
 log-panics = "2.0.0"
 mullvad-management-interface = { path = "../mullvad-management-interface" }
 mullvad-paths = { path = "../mullvad-paths" }
diff --git a/mullvad-fs/Cargo.toml b/mullvad-fs/Cargo.toml
index 5ebe3512a7..666dc4eac5 100644
--- a/mullvad-fs/Cargo.toml
+++ b/mullvad-fs/Cargo.toml
@@ -10,7 +10,7 @@ publish.workspace = true
 
 [dependencies]
 log = "0.4"
-tokio = { workspace = true, features = ["fs"] }
+tokio = { workspace = true, features = ["fs", "rt"] }
 uuid = { version = "1.4.1", features = ["v4"] }
 
 talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index b88c814013..5e8f8bfaee 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -24,7 +24,7 @@ talpid-types = { path = "../talpid-types" }
 talpid-platform-metadata = { path = "../talpid-platform-metadata" }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
-clap = { version = "4.2.7", features = ["cargo"] }
+clap = { workspace = true }
 env_logger = "0.10.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index a81ea4f477..7bcdc5f621 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -13,7 +13,7 @@ name = "mullvad-setup"
 path = "src/main.rs"
 
 [dependencies]
-clap = { version = "4.2.7", features = ["cargo"] }
+clap = { workspace = true }
 env_logger = "0.10.0"
 err-derive = "0.3.1"
 once_cell = "1.13"
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index 60cfa9c5f2..68d1e71aad 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -21,7 +21,7 @@ uuid = { version = "1.4.1", features = ["v4", "serde" ] }
 
 talpid-types = { path = "../talpid-types" }
 
-clap = { version = "4.2.7", features = ["derive"], optional = true }
+clap = { workspace = true , optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 jnix = { version = "0.5", features = ["derive"] }
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index a71c2582ed..af2e889b2c 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -23,7 +23,7 @@ talpid-types = { path = "../talpid-types" }
 talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }
 talpid-tunnel = { path = "../talpid-tunnel" }
 zeroize = "1"
-chrono = { workspace = true }
+chrono = { workspace = true, features = ["clock"] }
 tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 tunnel-obfuscation = { path = "../tunnel-obfuscation" }
 rand = "0.8.5"