From 36dd0078e32c9feb33027e16e8ce6e0b480e270b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Fri, 8 Sep 2023 16:51:41 +0200
Subject: [PATCH] Move log depedency to workspace toml file

---
 Cargo.toml                              | 1 +
 mullvad-api/Cargo.toml                  | 2 +-
 mullvad-daemon/Cargo.toml               | 2 +-
 mullvad-fs/Cargo.toml                   | 2 +-
 mullvad-jni/Cargo.toml                  | 2 +-
 mullvad-management-interface/Cargo.toml | 2 +-
 mullvad-paths/Cargo.toml                | 2 +-
 mullvad-problem-report/Cargo.toml       | 2 +-
 mullvad-relay-selector/Cargo.toml       | 2 +-
 mullvad-types/Cargo.toml                | 2 +-
 talpid-core/Cargo.toml                  | 2 +-
 talpid-dbus/Cargo.toml                  | 2 +-
 talpid-openvpn-plugin/Cargo.toml        | 2 +-
 talpid-openvpn/Cargo.toml               | 2 +-
 talpid-routing/Cargo.toml               | 2 +-
 talpid-tunnel-config-client/Cargo.toml  | 2 +-
 talpid-tunnel/Cargo.toml                | 2 +-
 talpid-wireguard/Cargo.toml             | 2 +-
 18 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 63faa4a8d792..ffa8d8784a33 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ prost-types = "0.12.0"
 
 env_logger = "0.10.0"
 err-derive = "0.3.1"
+log = "0.4"
 
 shadowsocks = { version = "1.16" }
 shadowsocks-service = { version = "1.16" }
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
index 59adb7da3e26..32d725a2c6fa 100644
--- a/mullvad-api/Cargo.toml
+++ b/mullvad-api/Cargo.toml
@@ -19,7 +19,7 @@ futures = "0.3"
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }
 ipnetwork = "0.16"
-log = "0.4"
+log = { workspace = true }
 serde = "1"
 serde_json = "1.0"
 tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "net", "io-std", "io-util", "fs"] }
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 05892dcf78df..0198ae1a15e7 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -19,7 +19,7 @@ fern = { version = "0.6", features = ["colored"] }
 futures = "0.3"
 once_cell = "1.13"
 libc = "0.2"
-log = "0.4"
+log = { workspace = true }
 parking_lot = "0.12.0"
 regex = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/mullvad-fs/Cargo.toml b/mullvad-fs/Cargo.toml
index 666dc4eac559..76fbd3d7d4ef 100644
--- a/mullvad-fs/Cargo.toml
+++ b/mullvad-fs/Cargo.toml
@@ -9,7 +9,7 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-log = "0.4"
+log = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt"] }
 uuid = { version = "1.4.1", features = ["v4"] }
 
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 002832762967..289b6e19275d 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -20,7 +20,7 @@ err-derive = { workspace = true }
 futures = "0.3"
 ipnetwork = "0.16"
 jnix = { version = "0.5", features = ["derive"] }
-log = "0.4"
+log = { workspace = true }
 log-panics = "2"
 nix = "0.23"
 rand = "0.8.5"
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index 34f8f80b9d97..5a36da5a2952 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -21,7 +21,7 @@ prost-types = { workspace = true }
 parity-tokio-ipc = "0.9"
 futures = "0.3"
 tokio = { workspace = true, features =  ["rt"] }
-log = "0.4"
+log = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.23"
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index 6a17d43b6a5c..3b4e01792026 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -12,7 +12,7 @@ publish.workspace = true
 err-derive = { workspace = true }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
-log = "0.4"
+log = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 widestring = "1.0"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index 2461afceb1e0..5bddff56408f 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -12,7 +12,7 @@ publish.workspace = true
 dirs = "5.0.1"
 err-derive = { workspace = true }
 once_cell = "1.13"
-log = "0.4"
+log = { workspace = true }
 regex = "1.0"
 uuid = { version = "1.4.1", features = ["v4"] }
 tokio = { workspace = true, features = ["rt"] }
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index 56a6807db46b..6574b866a4a2 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -13,7 +13,7 @@ chrono = { workspace = true }
 err-derive = { workspace = true }
 futures = "0.3"
 ipnetwork = "0.16"
-log = "0.4"
+log = { workspace = true }
 parking_lot = "0.12.0"
 rand = "0.8.5"
 serde_json = "1.0"
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index b603e4e03e90..db300ef00cd2 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -13,7 +13,7 @@ chrono = { workspace = true, features = ["clock", "serde"] }
 err-derive = { workspace = true }
 ipnetwork = "0.16"
 once_cell = "1.13"
-log = "0.4"
+log = { workspace = true }
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.4.1", features = ["v4", "serde" ] }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 44fee73f19b3..b8c730a1bc35 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.15"
 ipnetwork = "0.16"
 once_cell = "1.13"
 libc = "0.2"
-log = "0.4"
+log = { workspace = true }
 parking_lot = "0.12.0"
 talpid-routing = { path = "../talpid-routing" }
 talpid-types = { path = "../talpid-types" }
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index 2b463b410e23..aa37b3264037 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -11,6 +11,6 @@ publish.workspace = true
 dbus = "0.9"
 err-derive = { workspace = true }
 once_cell = "1.13"
-log = "0.4"
+log = { workspace = true }
 libc = "0.2"
 tokio = { workspace = true, features = ["rt"] }
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index cdf312907bbf..39315775ba29 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -13,7 +13,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 err-derive = { workspace = true }
-log = "0.4"
+log = { workspace = true }
 env_logger = { workspace = true }
 parity-tokio-ipc = "0.9"
 tokio = { workspace = true, features =  ["rt"] }
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index e5d6dcc78d70..259bfa9b66fe 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -16,7 +16,7 @@ err-derive = { workspace = true }
 futures = "0.3.15"
 is-terminal = "0.4.2"
 once_cell = "1.13"
-log = "0.4"
+log = { workspace = true }
 os_pipe = "1.1.4"
 parking_lot = "0.12.0"
 shell-escape = "0.1"
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index d4bb319cd1f0..223182947539 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -13,7 +13,7 @@ publish.workspace = true
 err-derive = { workspace = true }
 futures = "0.3.15"
 ipnetwork = "0.16"
-log = "0.4"
+log = { workspace = true }
 tokio = { workspace = true, features = ["process", "rt-multi-thread", "net"] }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
diff --git a/talpid-tunnel-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml
index 83e645f2bb51..751366ff6624 100644
--- a/talpid-tunnel-config-client/Cargo.toml
+++ b/talpid-tunnel-config-client/Cargo.toml
@@ -9,7 +9,7 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-log = "0.4"
+log = { workspace = true }
 rand = "0.8"
 talpid-types = { path = "../talpid-types" }
 tonic = { workspace = true }
diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml
index bf0a2fc834ba..1e8bbd939537 100644
--- a/talpid-tunnel/Cargo.toml
+++ b/talpid-tunnel/Cargo.toml
@@ -23,7 +23,7 @@ nix = "0.23"
 
 [target.'cfg(target_os = "android")'.dependencies]
 jnix = { version = "0.5", features = ["derive"] }
-log = "0.4"
+log = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tun = "0.5.1"
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index ee04a4cfe77c..04ea3fc00bc2 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -16,7 +16,7 @@ hex = "0.4"
 ipnetwork = "0.16"
 once_cell = "1.13"
 libc = "0.2"
-log = "0.4"
+log = { workspace = true }
 parking_lot = "0.12.0"
 talpid-routing = { path = "../talpid-routing" }
 talpid-types = { path = "../talpid-types" }