From fb3ebf0c73c91bbd181581e8fcfed7ba83a53a43 Mon Sep 17 00:00:00 2001 From: Sehz Date: Mon, 19 Aug 2024 18:23:20 -0700 Subject: [PATCH] chore: move to workspace dep (#316) * move to workspace dep * revert nj-derive --- Cargo.lock | 1 - Cargo.toml | 12 +++- examples/Cargo.lock | 100 ++++-------------------------- examples/Cargo.toml | 2 +- examples/array/Cargo.toml | 4 +- examples/async-cb/Cargo.toml | 4 +- examples/bigint/Cargo.toml | 6 +- examples/buffer/Cargo.toml | 4 +- examples/cb/Cargo.toml | 6 +- examples/class-async/Cargo.toml | 8 ++- examples/class-simple/Cargo.toml | 6 +- examples/class-wrapper/Cargo.toml | 6 +- examples/cleanup/Cargo.toml | 6 +- examples/electron/Cargo.toml | 6 +- examples/function/Cargo.toml | 6 +- examples/js-env/Cargo.toml | 6 +- examples/json/Cargo.toml | 2 +- examples/logging/Cargo.toml | 6 +- examples/option/Cargo.toml | 8 ++- examples/param/Cargo.toml | 6 +- examples/promise/Cargo.toml | 8 ++- examples/stream/Cargo.toml | 8 ++- examples/tuples/Cargo.toml | 6 +- nj-build/Cargo.toml | 4 +- nj-cli/Cargo.toml | 7 +-- 25 files changed, 99 insertions(+), 139 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26d1ac00..0ef043ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -832,7 +832,6 @@ name = "nj-cli" version = "0.4.4" dependencies = [ "cargo_metadata", - "log", "serde", "structopt", "toml 0.8.14", diff --git a/Cargo.toml b/Cargo.toml index bd7303a4..b606c442 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,16 +28,21 @@ resolver = "2" members = ["nj-build", "nj-cli", "nj-core", "nj-derive", "nj-sys"] [workspace.dependencies] -tracing = "0.1.37" +cargo_metadata = "0.18.0" +cc = "1.0.58" ctor = "0.2.4" libc = "0.2.66" +http_req = "0.12.0" inventory = "0.1.5" async-trait = "0.1.22" futures-lite = "2.0.0" -pin-utils = "0.1.0" num-bigint = "0.4.0" +pin-utils = "0.1.0" serde_json = "1" serde = { version = "1", default-features = false } +structopt = { version = "0.3.18", default-features = false } +toml = "0.8.0" +tracing = "0.1.37" uuid = { version = "1.8.0" } fluvio-future = { version = "0.7.0", default-features = false } @@ -45,4 +50,5 @@ 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 +nj-derive = { path = "nj-derive", version = "3.2.0" } +node-bindgen = { path = "." } diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 1065f4ea..d1990fbd 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -216,17 +216,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -396,23 +385,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" -[[package]] -name = "fluvio-future" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bb78c21409e7d24567b9b8a0d880e13ae5ef8fbbfb2a514c3966cd83e078c9" -dependencies = [ - "anyhow", - "async-io 1.13.0", - "fluvio-wasm-timer", - "futures-lite 1.13.0", - "log", - "pin-project", - "thiserror", - "tracing", - "ws_stream_wasm", -] - [[package]] name = "fluvio-future" version = "0.7.0" @@ -420,8 +392,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a28090046453db33a8bace0e1f71350b9878cd7fb576e48592ae8284bc83c7e" dependencies = [ "anyhow", + "async-io 2.3.3", "async-std", "cfg-if", + "fluvio-wasm-timer", + "futures-lite 2.3.0", + "pin-project", "thiserror", "tracing", "tracing-subscriber", @@ -611,9 +587,9 @@ checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "http_req" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd68fe813419e7fd8982607f1b39e2a393226a98cf4cc905e716ba328e2a488f" +checksum = "92208b0986f414edaca8ede2c6962c979309346a9e8e19d07d0a7879aae1549e" dependencies = [ "native-tls", "unicase", @@ -777,7 +753,7 @@ version = "6.0.2" dependencies = [ "async-trait", "ctor 0.2.8", - "fluvio-future 0.7.0", + "fluvio-future", "futures-lite 2.3.0", "inventory", "libc", @@ -810,7 +786,7 @@ dependencies = [ name = "nj-example-async-cb" version = "0.0.0" dependencies = [ - "fluvio-future 0.6.2", + "fluvio-future", "node-bindgen", "tracing", ] @@ -842,7 +818,7 @@ dependencies = [ name = "nj-example-class-async" version = "0.0.0" dependencies = [ - "fluvio-future 0.6.2", + "fluvio-future", "node-bindgen", ] @@ -901,7 +877,7 @@ dependencies = [ name = "nj-example-option" version = "0.0.0" dependencies = [ - "fluvio-future 0.6.2", + "fluvio-future", "node-bindgen", ] @@ -916,7 +892,7 @@ dependencies = [ name = "nj-example-promise" version = "0.0.0" dependencies = [ - "fluvio-future 0.6.2", + "fluvio-future", "node-bindgen", ] @@ -924,8 +900,8 @@ dependencies = [ name = "nj-example-stream" version = "0.0.0" dependencies = [ - "fluvio-future 0.6.2", - "futures-lite 1.13.0", + "fluvio-future", + "futures-lite 2.3.0", "node-bindgen", ] @@ -1083,16 +1059,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - [[package]] name = "pin-project" version = "1.1.5" @@ -1244,15 +1210,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.37.27" @@ -1324,18 +1281,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "send_wrapper" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" - [[package]] name = "serde" version = "1.0.203" @@ -1829,22 +1774,3 @@ name = "windows_x86_64_msvc" version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "ws_stream_wasm" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" -dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] diff --git a/examples/Cargo.toml b/examples/Cargo.toml index d411f7c5..f4ba18e0 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -32,5 +32,5 @@ futures-lite = "2.0.0" uuid = "1.8.0" tracing = "0.1.37" -node-bindgen = { path = "..", features = ["default"]} +node-bindgen = { path = "..", default-features = false } fluvio-future = { version = "0.7.0", features = ["timer"] } diff --git a/examples/array/Cargo.toml b/examples/array/Cargo.toml index ec30f96e..fc8653f8 100644 --- a/examples/array/Cargo.toml +++ b/examples/array/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = ["build"] } diff --git a/examples/async-cb/Cargo.toml b/examples/async-cb/Cargo.toml index 53b88b49..e567bca4 100644 --- a/examples/async-cb/Cargo.toml +++ b/examples/async-cb/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] tracing = { workspace = true } -node-bindgen = { workspace = true} fluvio-future = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = ["build"] } \ No newline at end of file diff --git a/examples/bigint/Cargo.toml b/examples/bigint/Cargo.toml index 8fea2949..0becbe9c 100644 --- a/examples/bigint/Cargo.toml +++ b/examples/bigint/Cargo.toml @@ -10,8 +10,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/buffer/Cargo.toml b/examples/buffer/Cargo.toml index 272e9348..0c6a2887 100644 --- a/examples/buffer/Cargo.toml +++ b/examples/buffer/Cargo.toml @@ -13,8 +13,8 @@ crate-type = ["cdylib"] [dependencies] serde = { workspace = true } serde_json = { workspace = true } -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = ["build"] } diff --git a/examples/cb/Cargo.toml b/examples/cb/Cargo.toml index b25e53d2..04046255 100644 --- a/examples/cb/Cargo.toml +++ b/examples/cb/Cargo.toml @@ -10,7 +10,9 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/class-async/Cargo.toml b/examples/class-async/Cargo.toml index 112feca9..11594dec 100644 --- a/examples/class-async/Cargo.toml +++ b/examples/class-async/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} -fluvio-future = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } +fluvio-future = { workspace = true } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/class-simple/Cargo.toml b/examples/class-simple/Cargo.toml index b58231b6..ef44776e 100644 --- a/examples/class-simple/Cargo.toml +++ b/examples/class-simple/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/class-wrapper/Cargo.toml b/examples/class-wrapper/Cargo.toml index e8ff3c23..acefb38f 100644 --- a/examples/class-wrapper/Cargo.toml +++ b/examples/class-wrapper/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/cleanup/Cargo.toml b/examples/cleanup/Cargo.toml index 76822112..065bb77e 100644 --- a/examples/cleanup/Cargo.toml +++ b/examples/cleanup/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/electron/Cargo.toml b/examples/electron/Cargo.toml index 6ae1c25b..61ae7208 100644 --- a/examples/electron/Cargo.toml +++ b/examples/electron/Cargo.toml @@ -10,8 +10,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/function/Cargo.toml b/examples/function/Cargo.toml index 1fba271b..5272dae3 100644 --- a/examples/function/Cargo.toml +++ b/examples/function/Cargo.toml @@ -11,7 +11,9 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/js-env/Cargo.toml b/examples/js-env/Cargo.toml index 0d99135d..ebe002cf 100644 --- a/examples/js-env/Cargo.toml +++ b/examples/js-env/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/json/Cargo.toml b/examples/json/Cargo.toml index 03ed8072..18395b08 100644 --- a/examples/json/Cargo.toml +++ b/examples/json/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true, features = ["serde-json"]} +node-bindgen = { workspace = true, features = ["default","serde-json"]} serde_json = { workspace = true } diff --git a/examples/logging/Cargo.toml b/examples/logging/Cargo.toml index 6035d6a0..b6479b59 100644 --- a/examples/logging/Cargo.toml +++ b/examples/logging/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } tracing = { workspace = true } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/option/Cargo.toml b/examples/option/Cargo.toml index 320e0fd4..47b36972 100644 --- a/examples/option/Cargo.toml +++ b/examples/option/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} -fluvio-future = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } +fluvio-future = { workspace = true } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/param/Cargo.toml b/examples/param/Cargo.toml index e6deb943..3cb546e1 100644 --- a/examples/param/Cargo.toml +++ b/examples/param/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/promise/Cargo.toml b/examples/promise/Cargo.toml index df8b09dd..e78164f4 100644 --- a/examples/promise/Cargo.toml +++ b/examples/promise/Cargo.toml @@ -11,8 +11,10 @@ crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} -fluvio-future = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } +fluvio-future = { workspace = true } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml index a99bcb98..40a8421d 100644 --- a/examples/stream/Cargo.toml +++ b/examples/stream/Cargo.toml @@ -12,9 +12,11 @@ crate-type = ["cdylib"] [dependencies] futures-lite = { workspace = true } -node-bindgen = { workspace = true} -fluvio-future = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } +fluvio-future = { workspace = true } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } \ No newline at end of file +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/examples/tuples/Cargo.toml b/examples/tuples/Cargo.toml index 827edfc4..6f57d9bd 100644 --- a/examples/tuples/Cargo.toml +++ b/examples/tuples/Cargo.toml @@ -9,7 +9,9 @@ publish = false crate-type = ["cdylib"] [dependencies] -node-bindgen = { workspace = true} +node-bindgen = { workspace = true, features = ["default"] } [build-dependencies] -node-bindgen = { path = "../../", default-features = false, features = ["build"] } +node-bindgen = { workspace = true, default-features = false, features = [ + "build", +] } diff --git a/nj-build/Cargo.toml b/nj-build/Cargo.toml index 60e483b6..01f5bc91 100644 --- a/nj-build/Cargo.toml +++ b/nj-build/Cargo.toml @@ -8,5 +8,5 @@ repository = "https://github.com/infinyon/node-bindgen" license = "Apache-2.0" [target.'cfg(windows)'.dependencies] -http_req = "0.12.0" -cc = "1.0.58" +http_req = { workspace = true } +cc = { workspace = true } diff --git a/nj-cli/Cargo.toml b/nj-cli/Cargo.toml index 2f740689..05050bfb 100644 --- a/nj-cli/Cargo.toml +++ b/nj-cli/Cargo.toml @@ -8,8 +8,7 @@ repository = "https://github.com/infinyon/node-bindgen" license = "Apache-2.0" [dependencies] -cargo_metadata = "0.18.0" -log = "0.4.8" +cargo_metadata = { workspace = true } serde = { workspace = true, features = ["derive"] } -structopt = { version = "0.3.18", default-features = false } -toml = "0.8.0" +structopt = { workspace = true } +toml = { workspace = true }