diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-04 10:26:40 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-07 09:56:15 +0200 |
| commit | 44d07531a41fa07ab38d1c1af73f2f4bd568cd23 (patch) | |
| tree | 987f1ac17c30e6ad14b47f7be31f4f7d820eafc2 | |
| parent | 1523898a341b9f0a4285daffa1c5d7b7d8390b21 (diff) | |
| download | mullvadvpn-44d07531a41fa07ab38d1c1af73f2f4bd568cd23.tar.xz mullvadvpn-44d07531a41fa07ab38d1c1af73f2f4bd568cd23.zip | |
Make clap a workspace dependency and activate features used by all
Both mullvad-setup and mullvad-problem-report had not specified the
"derive" feature. Moving it to workspace dependency is probably nicer.
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-problem-report/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-setup/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-types/Cargo.toml | 2 |
6 files changed, 6 insertions, 5 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-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"] } |