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.

1 files changed, 36 insertions, 71 deletions

diff --git a/Cargo.toml b/Cargo.toml
index b517a41a..cb86975f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,88 +1,53 @@
-[package]
-name = "atuin"
+[workspace]
+members = [
+    "atuin",
+    "atuin-client",
+    "atuin-server",
+    "atuin-common",
+]
+
+[workspace.package]
 version = "14.0.0"
 authors = ["Ellie Huxtable <ellie@elliehuxtable.com>"]
-edition = "2021"
 rust-version = "1.59"
 license = "MIT"
-description = "atuin - magical shell history"
 homepage = "https://atuin.sh"
 repository = "https://github.com/ellie/atuin"
 readme = "README.md"
 
-[package.metadata.binstall]
-pkg-url = "{ repo }/releases/download/v{ version }/{ name }-v{ version  }-{ target }.tar.gz"
-bin-dir = "{ name }-v{ version }-{ target }/{ bin }{ binary-ext }"
-pkg-fmt = "tgz"
-
-[package.metadata.deb]
-maintainer = "Ellie Huxtable <ellie@elliehuxtable.com>"
-copyright = "2021, Ellie Huxtable <ellie@elliehuxtable.com>"
-license-file = ["LICENSE"]
-depends = "$auto"
-section = "utility"
-
-[package.metadata.rpm]
-package = "atuin"
-
-[package.metadata.rpm.cargo]
-buildflags = ["--release"]
-
-[package.metadata.rpm.targets]
-atuin = { path = "/usr/bin/atuin" }
-
-[workspace]
-members = ["./atuin-client", "./atuin-server", "./atuin-common"]
-
-[features]
-# TODO(conradludgate)
-# Currently, this keeps the same default built behaviour for v0.8
-# We should rethink this by the time we hit a new breaking change
-default = ["client", "sync", "server"]
-client = ["atuin-client"]
-sync = ["atuin-client/sync"]
-server = ["atuin-server", "tracing-subscriber"]
-
-[dependencies]
-atuin-server = { path = "atuin-server", version = "14.0.0", optional = true }
-atuin-client = { path = "atuin-client", version = "14.0.0", optional = true, default-features = false }
-atuin-common = { path = "atuin-common", version = "14.0.0" }
-
+[workspace.dependencies]
+async-trait = "0.1.58"
+base64 = "0.21"
 log = "0.4"
-env_logger = "0.10.0"
 chrono = { version = "0.4", features = ["serde"] }
-eyre = "0.6"
+clap = { version = "4.0.18", features = ["derive"] }
+config = { version = "0.13", default-features = false, features = ["toml"] }
 directories = "4"
-indicatif = "0.17.1"
+eyre = "0.6"
+fs-err = "2.9"
+interim = { version = "0.1.0", features = ["chrono"] }
+itertools = "0.10.5"
+rand = { version = "0.8.5", features = ["std"] }
+semver = "1.0.14"
 serde = { version = "1.0.145", features = ["derive"] }
 serde_json = "1.0.86"
-crossterm = { version = "0.26", features = ["use-dev-tty"] }
-unicode-width = "0.1"
-itertools = "0.10.5"
+sodiumoxide = "0.2.6"
 tokio = { version = "1", features = ["full"] }
-async-trait = "0.1.58"
-interim = { version = "0.1.0", features = ["chrono"] }
-base64 = "0.20.0"
-crossbeam-channel = "0.5.1"
-clap = { version = "4.0.18", features = ["derive"] }
-clap_complete = "4.0.3"
-fs-err = "2.9"
+uuid = { version = "1.2", features = ["v4"] }
 whoami = "1.1.2"
-rpassword = "7.0"
-semver = "1.0.14"
-runtime-format = "0.1.2"
-tiny-bip39 = "1"
-futures-util = "0.3"
-fuzzy-matcher = "0.3.7"
-colored = "2.0.0"
-
-# ratatui
-bitflags = "1.3"
-cassowary = "0.3"
-unicode-segmentation = "1.2"
 
-[dependencies.tracing-subscriber]
-version = "0.3"
+[workspace.dependencies.reqwest]
+version = "0.11"
+features = [
+  "json",
+  "rustls-tls-native-roots",
+]
 default-features = false
-features = ["ansi", "fmt", "registry", "env-filter"]
-optional = true
+
+[workspace.dependencies.sqlx]
+version = "0.6"
+features = [
+  "runtime-tokio-rustls",
+  "chrono",
+  "postgres",
+]