From e0bcb58d36a3ddfdbd9c821c67afbe80650e5ab9 Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Fri, 14 May 2021 09:15:37 +0200
Subject: [PATCH] Tidy up dependencies

---
 Cargo.toml       | 38 ++++++++++++++++++++++++++------------
 app/Cargo.toml   | 22 +++++++++++++++-------
 model/Cargo.toml | 18 +++++++++++++++---
 3 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cf14f4a..0619f50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,34 +20,48 @@ actix-service = "2.0.0"
 actix-web = "4.0.0-beta.6"
 actix-web-httpauth = "0.6.0-beta.1"
 anyhow = "*"
-clap = "3.0.0-beta.2"
+async-trait = "0.1"
 chrono = { version = "*", features = [ "serde" ]}
+clap = "3.0.0-beta.2"
 futures = "*"
 futures-util = "*"
+hmac = "0.10"
 http = "*"
+jwt = "0.13"
 ldap3_server = "*"
+lldap_app = { path = "app" }
+lldap_model = { path = "model" }
 log = "*"
 serde = "*"
-sqlx = { version = "0.5", features = [ "runtime-actix-native-tls", "any", "sqlite", "mysql", "postgres", "macros" , "chrono"] }
+serde_json = "1"
+sha2 = "0.9"
 thiserror = "*"
+time = "0.2"
 tokio = { version = "1.2.0", features = ["full"] }
 tokio-util = "0.6.3"
 tracing = "*"
 tracing-actix-web = "0.3.0-beta.2"
 tracing-log = "*"
 tracing-subscriber = "*"
-async-trait = "0.1.48"
-sea-query = { version = "0.9.4", features = [ "with-chrono" ] }
-lldap_model = { path = "model" }
-lldap_app = { path = "app" }
-serde_json = "1.0.64"
-jwt = "0.13.0"
-hmac = "0.10"
-sha2 = "0.9.5"
-time = "0.2.26"
+
+[dependencies.sqlx]
+version = "0.5"
+features = [
+  "any",
+  "chrono",
+  "macros",
+  "mysql",
+  "postgres",
+  "runtime-actix-native-tls",
+  "sqlite",
+]
+
+[dependencies.sea-query]
+version = "0.9.4"
+features = ["with-chrono"]
 
 [dependencies.figment]
-features = ["toml", "env"]
+features = ["env", "toml"]
 version = "*"
 
 [dev-dependencies]
diff --git a/app/Cargo.toml b/app/Cargo.toml
index 9ca7d58..d2f0e77 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -5,16 +5,24 @@ authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@g
 edition = "2018"
 
 [dependencies]
-yew = "0.17"
-wasm-bindgen = "0.2"
-lldap_model = { path = "../model" }
 anyhow = "1"
-web-sys = { version = "0.3", features = [ "console", "Document", "Element", "HtmlDocument" ] }
-serde_json = "1"
-serde = "1"
+chrono = "*"
 http = "0.2.4"
 jwt = "0.13"
-chrono = "*"
+lldap_model = { path = "../model" }
+serde = "1"
+serde_json = "1"
+wasm-bindgen = "0.2"
+yew = "0.17"
+
+[dependencies.web-sys]
+version = "0.3"
+features = [
+  "Document",
+  "Element",
+  "HtmlDocument",
+  "console",
+]
 
 [lib]
 crate-type = ["cdylib"]
diff --git a/model/Cargo.toml b/model/Cargo.toml
index b3b1c59..e172cc3 100644
--- a/model/Cargo.toml
+++ b/model/Cargo.toml
@@ -8,8 +8,20 @@ edition = "2018"
 js = []
 
 [dependencies]
-chrono = { version = "*", features = [ "serde" ]}
 serde = "*"
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-sqlx = { version = "0.5", features = [ "runtime-actix-native-tls", "any", "sqlite", "mysql", "postgres", "macros" , "chrono"] }
+[dependencies.chrono]
+version = "*"
+features = [ "serde" ]
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.sqlx]
+version = "0.5"
+features = [
+  "any",
+  "chrono",
+  "macros",
+  "mysql",
+  "postgres",
+  "runtime-actix-native-tls",
+  "sqlite",
+]