From 05e4697514158d4e17260f8285a284eec3d7f8cd Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Fri, 1 May 2026 13:25:35 -0700
Subject: [PATCH] Move relative path deps to workspace

---
 Cargo.toml                             |  6 ++++--
 core/conversations/Cargo.toml          | 10 ++++++----
 core/double-ratchets/Cargo.toml        |  4 +++-
 core/integration_tests_core/Cargo.toml |  4 ++--
 core/sqlite/Cargo.toml                 |  6 ++++--
 core/storage/Cargo.toml                |  4 +++-
 crates/client/Cargo.toml               |  2 +-
 7 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 05efa50..509fb55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,10 +28,12 @@ default-members = [
 
 [workspace.dependencies]
 # Internal Workspace dependency declarations (sorted)
+chat-sqlite = { path = "core/sqlite" }
+components = { path = "extensions/components" }
 crypto = { path = "core/crypto" }
 libchat = { path = "core/conversations" }
-logoschat_components = {package = "components", path = "extensions/components"}
-sqlite = { path = "core/sqlite" }
+logoschat_components = { package = "components", path = "extensions/components" } # TODO: Remove alias 
+sqlite = { package = "chat-sqlite", path = "core/sqlite" } # TODO: remove alias
 storage = { path = "core/storage" }
 
 # External Workspace dependency declarations (sorted)
diff --git a/core/conversations/Cargo.toml b/core/conversations/Cargo.toml
index 42d1f91..f91ae8d 100644
--- a/core/conversations/Cargo.toml
+++ b/core/conversations/Cargo.toml
@@ -9,11 +9,13 @@ crate-type = ["rlib","staticlib"]
 [dependencies]
 # Workspace dependencies (sorted)
 blake2 = { workspace = true }
+crypto = { workspace = true }
+sqlite = { workspace = true }
+storage = { workspace = true }
 
 # External dependencies (sorted)
 base64 = "0.22"
 chat-proto = { git = "https://github.com/logos-messaging/chat_proto" }
-crypto = { path = "../crypto" }
 double-ratchets = { path = "../double-ratchets" }
 hex = "0.4.3"
 openmls = { version = "0.8.1", features = ["libcrux-provider"] }
@@ -22,12 +24,12 @@ openmls_traits = "0.5.0"
 prost = "0.14.1"
 rand_core = { version = "0.6" }
 safer-ffi = "0.1.13"
-sqlite = { package = "chat-sqlite", path = "../sqlite" }
-storage = { path = "../storage" }
 thiserror = "2.0.17"
 x25519-dalek = { version = "2.0.1", features = ["static_secrets", "reusable_secrets", "getrandom"] }
 
 [dev-dependencies]
+# Workspace dependencies (sorted)
+components = { workspace = true }
+
 # External dependencies (sorted)
-components = { package = "components", path = "../../extensions/components" }
 tempfile = "3"
diff --git a/core/double-ratchets/Cargo.toml b/core/double-ratchets/Cargo.toml
index ce9da38..e9d48e7 100644
--- a/core/double-ratchets/Cargo.toml
+++ b/core/double-ratchets/Cargo.toml
@@ -22,6 +22,8 @@ x25519-dalek = { version = "2.0.1", features = ["static_secrets"] }
 zeroize = "1.8.2"
 
 [dev-dependencies]
+# Workspace dependencies (sorted)
+sqlite = { workspace = true }
+
 # External dependencies (sorted)
-sqlite = { package = "chat-sqlite", path = "../sqlite" }
 tempfile = "3"
diff --git a/core/integration_tests_core/Cargo.toml b/core/integration_tests_core/Cargo.toml
index 46fa3ae..7b90b0a 100644
--- a/core/integration_tests_core/Cargo.toml
+++ b/core/integration_tests_core/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2024"
 
 [dev-dependencies]
 # Workspace dependencies (sorted)
+components = { workspace = true }
 libchat = { workspace = true }
+sqlite = { workspace = true }
 storage = { workspace = true }
 
 # External dependencies (sorted)
-components = { path = "../../extensions/components" }
-sqlite = { package = "chat-sqlite", path = "../sqlite" }
 tempfile = "3"
diff --git a/core/sqlite/Cargo.toml b/core/sqlite/Cargo.toml
index 3e1727a..4fabf33 100644
--- a/core/sqlite/Cargo.toml
+++ b/core/sqlite/Cargo.toml
@@ -5,11 +5,13 @@ edition = "2024"
 description = "SQLite storage implementation for libchat"
 
 [dependencies]
+# Workspace dependencies (sorted)
+crypto = { workspace = true }
+storage = { workspace = true }
+
 # External dependencies (sorted)
-crypto = { path = "../crypto" }
 hex = "0.4.3"
 rusqlite = { version = "0.35", features = ["bundled-sqlcipher-vendored-openssl"] }
-storage = { path = "../storage" }
 zeroize = { version = "1.8.2", features = ["derive"] }
 
 [dev-dependencies]
diff --git a/core/storage/Cargo.toml b/core/storage/Cargo.toml
index 7357d39..0c0775c 100644
--- a/core/storage/Cargo.toml
+++ b/core/storage/Cargo.toml
@@ -5,6 +5,8 @@ edition = "2024"
 description = "Shared storage layer for libchat"
 
 [dependencies]
+# Workspace dependencies (sorted)
+crypto = { workspace = true }
+
 # External dependencies (sorted)
-crypto = { path = "../crypto" }
 thiserror = "2"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 4dc08f6..eea2e3b 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -8,11 +8,11 @@ crate-type = ["rlib"]
 
 [dependencies]
 # Workspace dependencies (sorted)
+chat-sqlite = { workspace = true }
 libchat = { workspace = true }
 logoschat_components = { workspace = true} 
 
 # External dependencies (sorted)
-chat-sqlite = { path = "../../core/sqlite" }
 thiserror = "2"
 
 [dev-dependencies]