Use workspace for package versions (#456)

kanidm · Nov 30, 2024 · f74d804 · f74d804
1 parent 66a3d99
commit f74d804
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 85 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,14 @@
-
+[workspace.package]
+version = "0.5.0"
+authors = [
+    "William Brown <william@blackhats.net.au>",
+    "Michael Farrell <micolous+git@gmail.com>"
+]
+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
@@ -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
@@ -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
@@ -1,16 +1,18 @@
 [package]
 name = "base64urlsafedata"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -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
@@ -1,17 +1,19 @@
 [package]
 name = "fido-key-manager"
-version = "0.5.0"
-authors = ["Michael Farrell <micolous+git@gmail.com>"]
 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
@@ -1,19 +1,20 @@
 [package]
 name = "fido-mds-tool"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,15 +1,17 @@
 [package]
 name = "fido-mds"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,11 +1,6 @@
 [package]
 name = "sshkey-attest"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,13 +1,14 @@
 [package]
 name = "webauthn-authenticator-rs"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,13 +1,16 @@
 [package]
 name = "webauthn-rp-proxy"
-version = "0.5.0"
-edition = "2021"
-rust-version = "1.70.0"
 authors = ["Arthur A. Gleckler <aag@alum.mit.edu>"]
-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
@@ -1,15 +1,17 @@
 [package]
 name = "webauthn-rs-core"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,15 +1,17 @@
 [package]
 name = "webauthn-rs-proto"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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
@@ -1,15 +1,17 @@
 [package]
 name = "webauthn-rs"
-version = "0.5.0"
-authors = ["William Brown <william@blackhats.net.au>"]
-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"]