From c05d2850420a2c163b8f62c33a6cef7c0ae1ad8d Mon Sep 17 00:00:00 2001
From: Vladislav Stepanov <8uk.8ak@gmail.com>
Date: Fri, 14 Apr 2023 23:18:58 +0400
Subject: Workspace reorder (#868)

* Try different workspace structure

Move main crate (atuin) to be on the same level with other crates in
this workspace

* extract common dependencies to the workspace definition

* fix base64 v0.21 deprecation warning

* questionable: update deps & fix chrono deprecations

possible panic sites are unchanged, they're just more visible now

* Revert "questionable: update deps & fix chrono deprecations"

This reverts commit 993e60f8dea81a1625a04285a617959ad09a0866.
---
 atuin-server/Cargo.toml | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

(limited to 'atuin-server')

diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml
index 9b4df477a..9a32f0d2f 100644
--- a/atuin-server/Cargo.toml
+++ b/atuin-server/Cargo.toml
@@ -1,41 +1,35 @@
 [package]
 name = "atuin-server"
-version = "14.0.0"
-authors = ["Ellie Huxtable <ellie@elliehuxtable.com>"]
 edition = "2018"
-license = "MIT"
 description = "server library for atuin"
-homepage = "https://atuin.sh"
-repository = "https://github.com/ellie/atuin"
+
+version = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
 
 [dependencies]
 atuin-common = { path = "../atuin-common", version = "14.0.0" }
 
 tracing = "0.1"
-chrono = { version = "0.4", features = ["serde"] }
-eyre = "0.6"
-uuid = { version = "1.2", features = ["v4"] }
-whoami = "1.1.2"
-config = { version = "0.13", default-features = false, features = ["toml"] }
-serde = { version = "1.0.145", features = ["derive"] }
-serde_json = "1.0.86"
-sodiumoxide = "0.2.6"
-base64 = "0.21.0"
-rand = "0.8.4"
-tokio = { version = "1", features = ["full"] }
-sqlx = { version = "0.6", features = [
-  "runtime-tokio-rustls",
-  "chrono",
-  "postgres",
-] }
-async-trait = "0.1.58"
+chrono = { workspace = true }
+eyre = { workspace = true }
+uuid = { workspace = true }
+whoami = { workspace = true }
+config = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+sodiumoxide = { workspace = true }
+base64 = { workspace = true }
+rand = { workspace = true }
+tokio = { workspace = true }
+sqlx = { workspace = true }
+async-trait = { workspace = true }
 axum = "0.6.4"
 http = "0.2"
-fs-err = "2.9"
+fs-err = { workspace = true }
 chronoutil = "0.2.3"
 tower = "0.4"
 tower-http = { version = "0.3", features = ["trace"] }
-reqwest = { version = "0.11", features = [
-  "json",
-  "rustls-tls-native-roots",
-], default-features = false }
+reqwest = { workspace = true }
-- 
cgit v1.2.3