From 765667a645acad2866cbf61fd0011cf6e6bb3d5c Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Sat, 2 Sep 2023 12:50:25 -0400
Subject: [PATCH] fix: use path dependencies instead of workspace deps (#28)

---
 Cargo.toml                                                | 8 ++++----
 crates/loam-cli/Cargo.toml                                | 2 +-
 crates/loam-core/Cargo.toml                               | 2 +-
 crates/loam-ft/Cargo.toml                                 | 2 +-
 crates/loam-sdk-macro/Cargo.toml                          | 2 +-
 crates/loam-sdk/Cargo.toml                                | 4 ++--
 crates/{loam-soroban => loam-soroban-sdk}/.gitignore      | 0
 crates/{loam-soroban => loam-soroban-sdk}/CHANGELOG.md    | 0
 crates/{loam-soroban => loam-soroban-sdk}/Cargo.toml      | 2 +-
 crates/{loam-soroban => loam-soroban-sdk}/README.md       | 0
 crates/{loam-soroban => loam-soroban-sdk}/src/into_key.rs | 0
 crates/{loam-soroban => loam-soroban-sdk}/src/lib.rs      | 0
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename crates/{loam-soroban => loam-soroban-sdk}/.gitignore (100%)
 rename crates/{loam-soroban => loam-soroban-sdk}/CHANGELOG.md (100%)
 rename crates/{loam-soroban => loam-soroban-sdk}/Cargo.toml (87%)
 rename crates/{loam-soroban => loam-soroban-sdk}/README.md (100%)
 rename crates/{loam-soroban => loam-soroban-sdk}/src/into_key.rs (100%)
 rename crates/{loam-soroban => loam-soroban-sdk}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 2680cdd6..a963786b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,11 +5,11 @@ exclude = ["test/*"]
 
 [workspace.dependencies]
 loam-sdk = { path = "./crates/loam-sdk" }
-loam-build = { path = "./crates/loam-build"}
+loam-build = { path = "./crates/loam-build" }
 loam-sdk-core-riff = { path = "./crates/loam-core" }
-loam-soroban-sdk = { path = "./crates/loam-soroban"}
-loam-sdk-macro = { path = "./crates/loam-sdk-macro"}
-loam-sdk-ft = { path = "./crates/loam-ft"}
+loam-soroban-sdk = { path = "./crates/loam-soroban-sdk" }
+loam-sdk-macro = { path = "./crates/loam-sdk-macro" }
+loam-sdk-ft = { path = "./crates/loam-ft" }
 
 cargo_metadata = "0.15.4"
 thiserror = "1.0.38"
diff --git a/crates/loam-cli/Cargo.toml b/crates/loam-cli/Cargo.toml
index dd9c29bd..f9d656a8 100644
--- a/crates/loam-cli/Cargo.toml
+++ b/crates/loam-cli/Cargo.toml
@@ -27,7 +27,7 @@ path = "src/lib.rs"
 doctest = false
 
 [dependencies]
-loam-build = { workspace = true, version = "0.6.4" }
+loam-build = { path = "../loam-build", version = "0.6.4" }
 clap = { version = "4.1.8", features = [
     "derive",
     "env",
diff --git a/crates/loam-core/Cargo.toml b/crates/loam-core/Cargo.toml
index 3d3a8c34..8caed676 100644
--- a/crates/loam-core/Cargo.toml
+++ b/crates/loam-core/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 
 [dependencies]
-loam-sdk = { workspace = true, version = "0.6.3", features = [
+loam-sdk = { path = "../loam-sdk", version = "0.6.3", features = [
     "loam-soroban-sdk",
 ] }
 
diff --git a/crates/loam-ft/Cargo.toml b/crates/loam-ft/Cargo.toml
index 64dc0e63..0cbb1aef 100644
--- a/crates/loam-ft/Cargo.toml
+++ b/crates/loam-ft/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 
 [dependencies]
-loam-sdk = { workspace = true, version = "0.6.3", features = [
+loam-sdk = { path = "../loam-sdk", version = "0.6.3", features = [
     "loam-soroban-sdk",
 ] }
 
diff --git a/crates/loam-sdk-macro/Cargo.toml b/crates/loam-sdk-macro/Cargo.toml
index 26aa8b60..a6fd9d25 100644
--- a/crates/loam-sdk-macro/Cargo.toml
+++ b/crates/loam-sdk-macro/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 proc-macro = true
 
 [dependencies]
-loam-build = { workspace = true, version = "0.6.4" }
+loam-build = { path = "../loam-build", version = "0.6.5" }
 proc-macro2 = "1.0"
 syn = { version = "2", features = ["full", "fold", "extra-traits", "visit"] }
 quote = "1.0"
diff --git a/crates/loam-sdk/Cargo.toml b/crates/loam-sdk/Cargo.toml
index 520ebbad..09a57e69 100644
--- a/crates/loam-sdk/Cargo.toml
+++ b/crates/loam-sdk/Cargo.toml
@@ -12,8 +12,8 @@ crate-type = ["rlib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-loam-sdk-macro = { workspace = true, version = "0.6.3" }
-loam-soroban-sdk = { workspace = true, version = "0.6.3", optional = true }
+loam-sdk-macro = { path = "../loam-sdk-macro", version = "0.6.4" }
+loam-soroban-sdk = { path = "../loam-soroban-sdk", version = "0.6.4", optional = true }
 
 
 [features]
diff --git a/crates/loam-soroban/.gitignore b/crates/loam-soroban-sdk/.gitignore
similarity index 100%
rename from crates/loam-soroban/.gitignore
rename to crates/loam-soroban-sdk/.gitignore
diff --git a/crates/loam-soroban/CHANGELOG.md b/crates/loam-soroban-sdk/CHANGELOG.md
similarity index 100%
rename from crates/loam-soroban/CHANGELOG.md
rename to crates/loam-soroban-sdk/CHANGELOG.md
diff --git a/crates/loam-soroban/Cargo.toml b/crates/loam-soroban-sdk/Cargo.toml
similarity index 87%
rename from crates/loam-soroban/Cargo.toml
rename to crates/loam-soroban-sdk/Cargo.toml
index 14043f12..73b74cd4 100644
--- a/crates/loam-soroban/Cargo.toml
+++ b/crates/loam-soroban-sdk/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["rlib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-loam-sdk-macro = { workspace = true, version = "0.6.3" }
+loam-sdk-macro = { path = "../loam-sdk-macro", version = "0.6.4" }
 
 [dependencies.soroban-sdk]
 version = "0.9.2"
diff --git a/crates/loam-soroban/README.md b/crates/loam-soroban-sdk/README.md
similarity index 100%
rename from crates/loam-soroban/README.md
rename to crates/loam-soroban-sdk/README.md
diff --git a/crates/loam-soroban/src/into_key.rs b/crates/loam-soroban-sdk/src/into_key.rs
similarity index 100%
rename from crates/loam-soroban/src/into_key.rs
rename to crates/loam-soroban-sdk/src/into_key.rs
diff --git a/crates/loam-soroban/src/lib.rs b/crates/loam-soroban-sdk/src/lib.rs
similarity index 100%
rename from crates/loam-soroban/src/lib.rs
rename to crates/loam-soroban-sdk/src/lib.rs