From f6d1a580ea86b2e1fab5e23bf3d349213dfce34f Mon Sep 17 00:00:00 2001
From: Sehyo Chang <sehyo@fluvio.io>
Date: Fri, 16 Aug 2024 16:55:10 -0700
Subject: [PATCH] migrate nj-core to use workspace dep

---
 Cargo.toml          | 26 +++++++++++++++++++++-----
 examples/Cargo.lock | 29 ++++++++++++++++++++---------
 nj-core/Cargo.toml  | 24 ++++++++++++++----------
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f3047c2..bd7303a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,17 +16,33 @@ serde-json = ["nj-core/serde-json"]
 uuid = ["nj-core/convert-uuid"]
 
 [dependencies]
-nj-sys = { path = "nj-sys", version = "4.0.0", optional = true }
-nj-core = { path = "nj-core", version = "6.0.1", optional = true }
-nj-build = { path = "nj-build", version = "0.3.0", optional = true }
-nj-derive = { path = "nj-derive", version = "3.2.0", optional = true }
+
+nj-sys = { workspace = true, optional = true }
+nj-core = { workspace = true,  optional = true }
+nj-build = { workspace = true,  optional = true }
+nj-derive = { workspace = true,  optional = true }
+
 
 [workspace]
 resolver = "2"
 members = ["nj-build", "nj-cli", "nj-core", "nj-derive", "nj-sys"]
 
 [workspace.dependencies]
+tracing = "0.1.37"
+ctor = "0.2.4"
+libc = "0.2.66"
+inventory = "0.1.5"
+async-trait = "0.1.22"
+futures-lite = "2.0.0"
+pin-utils = "0.1.0"
+num-bigint = "0.4.0"
 serde_json = "1"
 serde = { version = "1", default-features = false }
 uuid = { version = "1.8.0" }
-fluvio-future =  { version = "0.7.0", default-features = false }
\ No newline at end of file
+
+fluvio-future =  { version = "0.7.0", default-features = false }
+
+nj-sys = { path = "nj-sys", version = "4.0.0"}
+nj-core = { path = "nj-core", version = "6.0.1" }
+nj-build = { path = "nj-build", version = "0.3.0" }
+nj-derive = { path = "nj-derive", version = "3.2.0" }
\ No newline at end of file
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
index d95dbf2..1065f4e 100644
--- a/examples/Cargo.lock
+++ b/examples/Cargo.lock
@@ -404,18 +404,29 @@ checksum = "d7bb78c21409e7d24567b9b8a0d880e13ae5ef8fbbfb2a514c3966cd83e078c9"
 dependencies = [
  "anyhow",
  "async-io 1.13.0",
- "async-std",
- "cfg-if",
  "fluvio-wasm-timer",
  "futures-lite 1.13.0",
  "log",
  "pin-project",
  "thiserror",
  "tracing",
- "tracing-subscriber",
  "ws_stream_wasm",
 ]
 
+[[package]]
+name = "fluvio-future"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a28090046453db33a8bace0e1f71350b9878cd7fb576e48592ae8284bc83c7e"
+dependencies = [
+ "anyhow",
+ "async-std",
+ "cfg-if",
+ "thiserror",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "fluvio-wasm-timer"
 version = "0.2.5"
@@ -766,7 +777,7 @@ version = "6.0.2"
 dependencies = [
  "async-trait",
  "ctor 0.2.8",
- "fluvio-future",
+ "fluvio-future 0.7.0",
  "futures-lite 2.3.0",
  "inventory",
  "libc",
@@ -799,7 +810,7 @@ dependencies = [
 name = "nj-example-async-cb"
 version = "0.0.0"
 dependencies = [
- "fluvio-future",
+ "fluvio-future 0.6.2",
  "node-bindgen",
  "tracing",
 ]
@@ -831,7 +842,7 @@ dependencies = [
 name = "nj-example-class-async"
 version = "0.0.0"
 dependencies = [
- "fluvio-future",
+ "fluvio-future 0.6.2",
  "node-bindgen",
 ]
 
@@ -890,7 +901,7 @@ dependencies = [
 name = "nj-example-option"
 version = "0.0.0"
 dependencies = [
- "fluvio-future",
+ "fluvio-future 0.6.2",
  "node-bindgen",
 ]
 
@@ -905,7 +916,7 @@ dependencies = [
 name = "nj-example-promise"
 version = "0.0.0"
 dependencies = [
- "fluvio-future",
+ "fluvio-future 0.6.2",
  "node-bindgen",
 ]
 
@@ -913,7 +924,7 @@ dependencies = [
 name = "nj-example-stream"
 version = "0.0.0"
 dependencies = [
- "fluvio-future",
+ "fluvio-future 0.6.2",
  "futures-lite 1.13.0",
  "node-bindgen",
 ]
diff --git a/nj-core/Cargo.toml b/nj-core/Cargo.toml
index 0bbcda7..822d5c8 100644
--- a/nj-core/Cargo.toml
+++ b/nj-core/Cargo.toml
@@ -16,15 +16,19 @@ serde-json = ["serde_json"]
 convert-uuid = ["uuid"]
 
 [dependencies]
-tracing = "0.1.37"
-ctor = "0.2.4"
-libc = "0.2.66"
-inventory = "0.1.5"
-async-trait = "0.1.22"
-futures-lite = "2.0.0"
-nj-sys = { version = "4.0.0", path = "../nj-sys" }
+async-trait = { workspace = true }
+ctor = { workspace = true }
+futures-lite =  { workspace = true }
+libc = { workspace = true }
+
+inventory = { workspace = true }
+tracing = { workspace = true }
+
+
 fluvio-future = { workspace = true, features=["task","subscriber"]}
-pin-utils = "0.1.0"
-num-bigint = "0.4.0"
+pin-utils = { workspace = true }
+num-bigint = { workspace = true }
 serde_json = { workspace = true, optional = true }
-uuid = { workspace = true, optional = true }
\ No newline at end of file
+uuid = { workspace = true, optional = true }
+
+nj-sys = { workspace = true }
\ No newline at end of file