From ba224a220009299fb34a2fe8c9be23db5d4b63fd Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Thu, 30 Nov 2023 17:04:27 +0000 Subject: [PATCH] add default member add shared dependencies to workspace dependencies all package level dependencies now rely on workspace --- Cargo.toml | 12 ++++++++++++ ciphers/Cargo.toml | 6 +++--- constant-time/Cargo.toml | 2 +- fuzzing/Cargo.toml | 16 ++++------------ rosenpass/Cargo.toml | 14 +++++++------- sodium/Cargo.toml | 4 ++-- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f28fba8..232fe4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,11 +11,23 @@ members = [ "fuzzing", ] +default-members = [ + "rosenpass" +] + [workspace.metadata.release] # ensure that adding `--package` as argument to `cargo release` still creates version tags in the form of `vx.y.z` tag-prefix = "" [workspace.dependencies] +rosenpass = { path = "rosenpass" } +rosenpass-util = { path = "util" } +rosenpass-constant-time = { path = "constant-time" } +rosenpass-sodium = { path = "sodium" } +rosenpass-ciphers = { path = "ciphers" } +rosenpass-to = { path = "to" } +criterion = "0.4.0" +test_bin = "0.4.0" libfuzzer-sys = "0.4" stacker = "0.1.15" doc-comment = "0.3.3" diff --git a/ciphers/Cargo.toml b/ciphers/Cargo.toml index f23cc60..2663cab 100644 --- a/ciphers/Cargo.toml +++ b/ciphers/Cargo.toml @@ -11,8 +11,8 @@ readme = "readme.md" [dependencies] anyhow = { workspace = true } -rosenpass-sodium = { path = "../sodium" } -rosenpass-to = { path = "../to" } -rosenpass-constant-time = { path = "../constant-time" } +rosenpass-sodium = { workspace = true } +rosenpass-to = { workspace = true } +rosenpass-constant-time = { workspace = true } static_assertions = { workspace = true } zeroize = { workspace = true } diff --git a/constant-time/Cargo.toml b/constant-time/Cargo.toml index 3e30b63..46de621 100644 --- a/constant-time/Cargo.toml +++ b/constant-time/Cargo.toml @@ -12,4 +12,4 @@ readme = "readme.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rosenpass-to = { path = "../to" } +rosenpass-to = { workspace = true } diff --git a/fuzzing/Cargo.toml b/fuzzing/Cargo.toml index a410dbd..9fb6f66 100644 --- a/fuzzing/Cargo.toml +++ b/fuzzing/Cargo.toml @@ -11,18 +11,10 @@ cargo-fuzz = true arbitrary = { workspace = true } libfuzzer-sys = { workspace = true } stacker = { workspace = true } - -[dependencies.rosenpass] -path = "../rosenpass" - -[dependencies.rosenpass-sodium] -path = "../sodium" - -[dependencies.rosenpass-ciphers] -path = "../ciphers" - -[dependencies.rosenpass-to] -path = "../to" +rosenpass-sodium = { workspace = true } +rosenpass-ciphers = { workspace = true } +rosenpass-to = { workspace = true } +rosenpass = { workspace = true } [[bin]] name = "fuzz_handle_msg" diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml index c30a606..75295a5 100644 --- a/rosenpass/Cargo.toml +++ b/rosenpass/Cargo.toml @@ -14,11 +14,11 @@ name = "handshake" harness = false [dependencies] -rosenpass-util = { path = "../util" } -rosenpass-constant-time = { path = "../constant-time" } -rosenpass-sodium = { path = "../sodium" } -rosenpass-ciphers = { path = "../ciphers" } -rosenpass-to = { path = "../to" } +rosenpass-util = { workspace = true } +rosenpass-constant-time = { workspace = true } +rosenpass-sodium = { workspace = true } +rosenpass-ciphers = { workspace = true } +rosenpass-to = { workspace = true } anyhow = { workspace = true } static_assertions = { workspace = true } memoffset = { workspace = true } @@ -38,6 +38,6 @@ mio = { workspace = true } anyhow = { workspace = true } [dev-dependencies] -criterion = "0.4.0" -test_bin = "0.4.0" +criterion = { workspace = true } +test_bin = { workspace = true } stacker = { workspace = true } diff --git a/sodium/Cargo.toml b/sodium/Cargo.toml index d954126..b5ade3c 100644 --- a/sodium/Cargo.toml +++ b/sodium/Cargo.toml @@ -10,8 +10,8 @@ repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" [dependencies] -rosenpass-util = { path = "../util" } -rosenpass-to = { path = "../to" } +rosenpass-util = { workspace = true } +rosenpass-to = { workspace = true } anyhow = { workspace = true } libsodium-sys-stable = { workspace = true } log = { workspace = true }