From f74d804a70857e36aa8f9918cec6d23ef5f8cd16 Mon Sep 17 00:00:00 2001 From: Firstyear Date: Sat, 30 Nov 2024 13:59:12 +1000 Subject: [PATCH] Use workspace for package versions (#456) --- Cargo.toml | 28 +++++++++++++++++++--------- attestation-ca/Cargo.toml | 13 ++++++++----- authenticator-cli/Cargo.toml | 13 ++++++++----- base64urlsafedata/Cargo.toml | 14 ++++++++------ fido-hid-rs/Cargo.toml | 12 +++++++----- fido-key-manager/Cargo.toml | 14 ++++++++------ fido-mds-tool/Cargo.toml | 17 +++++++++-------- fido-mds/Cargo.toml | 14 ++++++++------ sshkey-attest/Cargo.toml | 14 ++++++++------ webauthn-authenticator-rs/Cargo.toml | 15 ++++++++------- webauthn-rp-proxy/Cargo.toml | 11 +++++++---- webauthn-rs-core/Cargo.toml | 14 ++++++++------ webauthn-rs-proto/Cargo.toml | 14 ++++++++------ webauthn-rs/Cargo.toml | 14 ++++++++------ 14 files changed, 122 insertions(+), 85 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d47a7b33..5d1e9430 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,14 @@ - +[workspace.package] +version = "0.5.0" +authors = [ + "William Brown ", + "Michael Farrell " +] +rust-version = "1.70.0" +edition = "2021" +repository = "https://github.com/kanidm/webauthn-rs" +homepage = "https://github.com/kanidm/webauthn-rs" +license = "MPL-2.0" [workspace] resolver = "2" @@ -46,14 +56,14 @@ exclude = ["compat_tester/webauthn-rs-demo-wasm"] [workspace.dependencies] # These are in release/dependency order. -base64urlsafedata = { path = "./base64urlsafedata", version = "0.5.0" } -fido-hid-rs = { path = "./fido-hid-rs", version = "0.5.0" } -webauthn-attestation-ca = { path = "./attestation-ca", version = "0.5.0" } -webauthn-rs-proto = { path = "./webauthn-rs-proto", version = "0.5.0" } -fido-mds = { path = "./fido-mds", version = "0.5.0" } -webauthn-rs-core = { path = "./webauthn-rs-core", version = "0.5.0" } -webauthn-rs = { path = "./webauthn-rs", version = "0.5.0" } -webauthn-authenticator-rs = { path = "./webauthn-authenticator-rs", version = "0.5.0" } +base64urlsafedata = { path = "./base64urlsafedata", version = "=0.5.0" } +fido-hid-rs = { path = "./fido-hid-rs", version = "=0.5.0" } +webauthn-attestation-ca = { path = "./attestation-ca", version = "=0.5.0" } +webauthn-rs-proto = { path = "./webauthn-rs-proto", version = "=0.5.0" } +fido-mds = { path = "./fido-mds", version = "=0.5.0" } +webauthn-rs-core = { path = "./webauthn-rs-core", version = "=0.5.0" } +webauthn-rs = { path = "./webauthn-rs", version = "=0.5.0" } +webauthn-authenticator-rs = { path = "./webauthn-authenticator-rs", version = "=0.5.0" } # Currently un-released cable-tunnel-server-common = { path = "./cable-tunnel-server/common", version = "0.1.0" } diff --git a/attestation-ca/Cargo.toml b/attestation-ca/Cargo.toml index 009e5edd..e8b54b67 100644 --- a/attestation-ca/Cargo.toml +++ b/attestation-ca/Cargo.toml @@ -1,13 +1,16 @@ [package] name = "webauthn-attestation-ca" -version = "0.5.0" -edition = "2021" -rust-version = "1.70.0" -repository = "https://github.com/kanidm/webauthn-rs" -license = "MPL-2.0" readme = "README.md" description = "Webauthn Attestation CA Descriptions" +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/authenticator-cli/Cargo.toml b/authenticator-cli/Cargo.toml index aadbb3f9..60d3e186 100644 --- a/authenticator-cli/Cargo.toml +++ b/authenticator-cli/Cargo.toml @@ -1,13 +1,16 @@ [package] name = "authenticator-cli" -version = "0.5.0" -edition = "2021" -rust-version = "1.70.0" -repository = "https://github.com/kanidm/webauthn-rs" -license = "MPL-2.0" readme = "README.md" description = "Webauthn Authenticator Management Tool" +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + [dependencies] authenticator = { version = "0.3.2-dev.1", default-features = false, features = ["crypto_openssl"], package = "authenticator-ctap2-2021" } diff --git a/base64urlsafedata/Cargo.toml b/base64urlsafedata/Cargo.toml index 131acd7c..b9cab9aa 100644 --- a/base64urlsafedata/Cargo.toml +++ b/base64urlsafedata/Cargo.toml @@ -1,16 +1,18 @@ [package] name = "base64urlsafedata" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Base 64 Url Safe wrapper for Serde" -repository = "https://github.com/kanidm/webauthn-rs" keywords = ["base64", "serde"] categories = ["web-programming"] -license = "MPL-2.0" readme = "README.md" +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/fido-hid-rs/Cargo.toml b/fido-hid-rs/Cargo.toml index 2ce0fecc..ae71101f 100644 --- a/fido-hid-rs/Cargo.toml +++ b/fido-hid-rs/Cargo.toml @@ -1,12 +1,14 @@ [package] name = "fido-hid-rs" -version = "0.5.0" -edition = "2021" -rust-version = "1.70.0" -license = "MPL-2.0" description = "USB HID library for FIDO authenticators" -repository = "https://github.com/kanidm/webauthn-rs" +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/fido-key-manager/Cargo.toml b/fido-key-manager/Cargo.toml index f731abbe..352de35c 100644 --- a/fido-key-manager/Cargo.toml +++ b/fido-key-manager/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "fido-key-manager" -version = "0.5.0" -authors = ["Michael Farrell "] categories = ["authentication"] description = "Management CLI for FIDO/CTAP 2.x authenticators" -edition = "2021" keywords = ["ctap", "fido", "passkeys", "webauthn"] -license = "MPL-2.0" readme = "README.md" -repository = "https://github.com/kanidm/webauthn-rs/" -rust-version = "1.70.0" build = "build.rs" +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + [[bin]] name = "fido-key-manager" # cargo can't run binaries needing elevation on Windows, and there's no tests diff --git a/fido-mds-tool/Cargo.toml b/fido-mds-tool/Cargo.toml index 69d69856..fcad9b11 100644 --- a/fido-mds-tool/Cargo.toml +++ b/fido-mds-tool/Cargo.toml @@ -1,19 +1,20 @@ [package] name = "fido-mds-tool" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Fido Metadata Service parsing tool" -repository = "https://github.com/kanidm/webauthn-rs" readme = "README.md" keywords = ["webauthn", "authentication"] categories = ["authentication", "web-programming"] -license = "MPL-2.0" -[dependencies] -fido-mds = { version = "0.5.0-dev", path = "../fido-mds" } +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +[dependencies] +fido-mds.workspace = true clap.workspace = true tracing.workspace = true tracing-subscriber.workspace = true diff --git a/fido-mds/Cargo.toml b/fido-mds/Cargo.toml index 9268c3ce..75a6e803 100644 --- a/fido-mds/Cargo.toml +++ b/fido-mds/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "fido-mds" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Fido Metadata Service parser" -repository = "https://github.com/kanidm/webauthn-rs" readme = "README.md" keywords = ["webauthn", "authentication"] categories = ["authentication", "web-programming"] -license = "MPL-2.0" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/sshkey-attest/Cargo.toml b/sshkey-attest/Cargo.toml index c74fba44..b9a84e83 100644 --- a/sshkey-attest/Cargo.toml +++ b/sshkey-attest/Cargo.toml @@ -1,11 +1,6 @@ [package] name = "sshkey-attest" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "FIDO SK SSH Key Attestation" -repository = "https://github.com/kanidm/webauthn-rs" readme = "README.md" keywords = ["ssh", "openssh", "parser", "attestation", "fido"] categories = [ @@ -14,7 +9,14 @@ categories = [ "parser-implementations", "encoding", ] -license = "MPL-2.0" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } [dependencies] base64.workspace = true diff --git a/webauthn-authenticator-rs/Cargo.toml b/webauthn-authenticator-rs/Cargo.toml index eab0e777..4ef5aa9a 100644 --- a/webauthn-authenticator-rs/Cargo.toml +++ b/webauthn-authenticator-rs/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "webauthn-authenticator-rs" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" -license = "MPL-2.0" description = "Webauthn Authenticator Client Library" -# documentation = "https://docs.rs/kanidm/latest/kanidm/" -repository = "https://github.com/kanidm/webauthn-rs" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } [features] nfc_raw_transmit = ["nfc"] diff --git a/webauthn-rp-proxy/Cargo.toml b/webauthn-rp-proxy/Cargo.toml index 5a0ac29f..640e0ceb 100644 --- a/webauthn-rp-proxy/Cargo.toml +++ b/webauthn-rp-proxy/Cargo.toml @@ -1,13 +1,16 @@ [package] name = "webauthn-rp-proxy" -version = "0.5.0" -edition = "2021" -rust-version = "1.70.0" authors = ["Arthur A. Gleckler "] -license = "MPL-2.0" readme = "README.md" description = "Webauthn RP CLI Proxy" +version = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } + [dependencies] anyhow = "1.0" clap = { version = "3.0", features = ["derive"] } diff --git a/webauthn-rs-core/Cargo.toml b/webauthn-rs-core/Cargo.toml index ba0998e4..eacf324d 100644 --- a/webauthn-rs-core/Cargo.toml +++ b/webauthn-rs-core/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "webauthn-rs-core" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Webauthn Cryptographic Operation Handling" -repository = "https://github.com/kanidm/webauthn-rs" readme = "README.md" keywords = ["webauthn", "authentication"] categories = ["authentication", "web-programming"] -license = "MPL-2.0" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } [features] default = [] diff --git a/webauthn-rs-proto/Cargo.toml b/webauthn-rs-proto/Cargo.toml index 078401c2..d7dfc149 100644 --- a/webauthn-rs-proto/Cargo.toml +++ b/webauthn-rs-proto/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "webauthn-rs-proto" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Webauthn Specification Bindings" -repository = "https://github.com/kanidm/webauthn-rs" readme = "README.md" keywords = ["webauthn", "authentication"] categories = ["authentication", "web-programming"] -license = "MPL-2.0" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/webauthn-rs/Cargo.toml b/webauthn-rs/Cargo.toml index 696338bf..9e12969e 100644 --- a/webauthn-rs/Cargo.toml +++ b/webauthn-rs/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "webauthn-rs" -version = "0.5.0" -authors = ["William Brown "] -edition = "2021" -rust-version = "1.70.0" description = "Webauthn Framework for Rust Web Servers" -repository = "https://github.com/kanidm/webauthn-rs" readme = "../README.md" keywords = ["webauthn", "authentication", "passkeys"] categories = ["authentication", "web-programming"] -license = "MPL-2.0" + +version = { workspace = true } +authors = { workspace = true } +rust-version = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } [package.metadata.docs.rs] features = ["danger-allow-state-serialisation", "danger-user-presence-only-security-keys", "danger-credential-internals"]