From c175fd80edc895dcabf5e37fbb162b1b0b37d464 Mon Sep 17 00:00:00 2001 From: Mees Delzenne Date: Tue, 19 Nov 2024 15:04:01 +0100 Subject: [PATCH] Reorganize dependencies and bump version --- Cargo.toml | 35 +++++++++++--------------- core/Cargo.toml | 65 ++++++++++++++---------------------------------- macro/Cargo.toml | 40 ++++++++--------------------- sys/Cargo.toml | 2 +- 4 files changed, 44 insertions(+), 98 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21727ccc..ffec66d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rquickjs" -version = "0.8.0" +version = "0.8.1" authors = ["Mees Delzenne ", "K. "] edition = "2021" rust-version = "1.65" @@ -11,25 +11,6 @@ keywords = ["quickjs", "ecmascript", "javascript", "es6", "es2020"] categories = ["api-bindings"] repository = "https://github.com/DelSkayn/rquickjs.git" -[dependencies.rquickjs-core] -version = "0.8.0" -path = "core" - -[dependencies.rquickjs-macro] -version = "0.8.0" -path = "macro" -optional = true - -[dependencies.indexmap-rs] -package = "indexmap" -version = "2" -optional = true - -[dependencies.either-rs] -package = "either" -version = "1" -optional = true - [workspace] members = [ @@ -41,6 +22,20 @@ members = [ "examples/rquickjs-cli", ] +[workspace.dependencies] +rquickjs-core = { version = "0.8.1", path = "core" } +rquickjs-macro = { version = "0.8.1", path = "macro" } +rquickjs-sys= { version = "0.8.1", path = "sys" } +rquickjs = { version = "0.8.1", path = "./" } + +[dependencies] +indexmap-rs = { package = "indexmap", version = "2", optional = true } +either-rs = { package = "either", version = "1", optional = true } +rquickjs-core = { workspace = true } +rquickjs-macro = { workspace = true, optional = true } + + + [features] default = ["classes", "properties"] diff --git a/core/Cargo.toml b/core/Cargo.toml index ac91d729..771d06f7 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rquickjs-core" -version = "0.8.0" +version = "0.8.1" authors = ["Mees Delzenne ", "K. "] edition = "2021" license = "MIT" @@ -10,38 +10,26 @@ keywords = ["quickjs", "ecmascript", "javascript", "es6", "es2020"] categories = ["api-bindings"] repository = "https://github.com/DelSkayn/rquickjs.git" -[dependencies.rquickjs-sys] -version = "0.8.0" -path = "../sys" - -[dependencies.phf] -version = "0.11" -optional = true - -[dependencies.indexmap] -version = "2" -optional = true - -[dependencies.either] -version = "1" -optional = true - -[dependencies.async-lock] -version = "3" -optional = true - -[dependencies.chrono] -version = "0.4" -optional = true +[package.metadata.docs.rs] +features = ["full-async", "doc-cfg"] -[dependencies.dlopen] -version = "0.1" -optional = true +[dependencies] +rquickjs-sys = { workspace = true } +phf = { version = "0.11", optional = true } +indexmap = { version = "2", optional = true } +either = { version = "1", optional = true } +async-lock = { version = "3", optional = true } +chrono = { version = "0.4", optional = true } +dlopen = { version = "0.1", optional = true } +relative-path = { version = "1.9", optional = true } -[dependencies.relative-path] -version = "1.9" -optional = true +[dev-dependencies] +futures-rs = { package = "futures", version = "0.3"} +tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "time", "macros", "sync"] } +rquickjs = { workspace = true } +approx = "0.5" +trybuild = "1.0.23" [features] default = [] @@ -108,22 +96,5 @@ compile-tests = [] # Enable unstable doc-cfg feature (for docs.rs) doc-cfg = [] -[dev-dependencies.futures-rs] -package = "futures" -version = "0.3" - -[dev-dependencies.tokio] -version = "1.0" -default-features = false -features = ["rt", "rt-multi-thread", "time", "macros", "sync"] - -[dev-dependencies.rquickjs] -path = ".." -[dev-dependencies] -approx = "0.5" -trybuild = "1.0.23" - -[package.metadata.docs.rs] -features = ["full-async", "doc-cfg"] diff --git a/macro/Cargo.toml b/macro/Cargo.toml index fe66be1d..e6b1e10d 100644 --- a/macro/Cargo.toml +++ b/macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rquickjs-macro" -version = "0.8.0" +version = "0.8.1" authors = ["K. ", "Mees Delzenne "] edition = "2021" license = "MIT" @@ -14,6 +14,7 @@ repository = "https://github.com/DelSkayn/rquickjs.git" proc-macro = true [dependencies] +rquickjs-core = { workspace = true, features = ["loader"] } proc-macro2 = "1" proc-macro-crate = "1" quote = "1" @@ -21,35 +22,14 @@ ident_case = "1" fnv = "1" indexmap = "2" convert_case = "0.6" - -[dependencies.rquickjs-core] -path = "../core" -version = "0.8.0" -features = ["loader"] - -[dependencies.syn] -version = "2" -features = ["full","fold","extra-traits","visit"] - -[dependencies.phf_shared] -version = "0.11" -optional = true - -[dependencies.phf_generator] -version = "0.11" -optional = true - -[dev-dependencies.rquickjs] -path = ".." -version = "0.8.0" -features = ["macro", "classes", "properties", "futures","phf"] - -[dev-dependencies.difference] -version = "2" - -[dev-dependencies.async-std] -version = "1" -features = ["attributes"] +syn = { version = "2", features = ["full","fold","extra-traits","visit"] } +phf_shared = { version = "0.11", optional = true } +phf_generator = { version = "0.11", optional = true } + +[dev-dependencies] +rquickjs = { workspace = true, features = ["macro", "classes", "properties", "futures","phf"] } +difference = "2" +async-std = { version = "1", features = ["attributes"] } [features] phf = ["phf_shared", "phf_generator"] diff --git a/sys/Cargo.toml b/sys/Cargo.toml index 15cfed0b..d43d01f6 100644 --- a/sys/Cargo.toml +++ b/sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rquickjs-sys" -version = "0.8.0" +version = "0.8.1" authors = ["Mees Delzenne "] edition = "2021" license = "MIT"