From 244fe03164393532b9383fea7b7affcaf6bd294c Mon Sep 17 00:00:00 2001
From: Adam Leventhal <ahl@oxide.computer>
Date: Thu, 20 Jun 2024 19:04:05 -0700
Subject: [PATCH] move to workspace dependencies (#834)

---
 Cargo.lock                   | 74 ++++++++++++++++--------------------
 Cargo.toml                   | 45 ++++++++++++++++++++++
 cargo-progenitor/Cargo.toml  | 25 ++++++------
 progenitor-client/Cargo.toml | 14 +++----
 progenitor-impl/Cargo.toml   | 50 +++++++++++-------------
 progenitor/Cargo.toml        | 30 +++++++--------
 6 files changed, 135 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 05abfc4..58cabfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,7 +132,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -143,7 +143,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -311,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.6"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -321,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.6"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -340,7 +340,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -533,7 +533,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_tokenstream",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -610,7 +610,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "syn 2.0.66",
+ "syn 2.0.67",
  "uuid",
 ]
 
@@ -638,7 +638,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "syn 2.0.66",
+ "syn 2.0.67",
  "uuid",
  "wasm-bindgen-test",
 ]
@@ -746,7 +746,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -789,15 +789,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.12"
@@ -1381,14 +1372,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -1434,7 +1425,6 @@ dependencies = [
  "dropshot",
  "expectorate",
  "futures",
- "getopts",
  "heck",
  "http 0.2.9",
  "hyper",
@@ -1450,7 +1440,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "syn 2.0.66",
+ "syn 2.0.67",
  "thiserror",
  "tokio",
  "typify",
@@ -1470,7 +1460,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -1548,9 +1538,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1787,7 +1777,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -1851,7 +1841,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -1862,7 +1852,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -1904,7 +1894,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -2076,9 +2066,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2168,7 +2158,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -2253,7 +2243,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -2423,7 +2413,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "syn 2.0.66",
+ "syn 2.0.67",
  "thiserror",
  "unicode-ident",
 ]
@@ -2440,7 +2430,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.66",
+ "syn 2.0.67",
  "typify-impl",
 ]
 
@@ -2587,7 +2577,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
  "wasm-bindgen-shared",
 ]
 
@@ -2621,7 +2611,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2654,7 +2644,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
@@ -2988,7 +2978,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.67",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 03c1dfc..1fcb177 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,51 @@ members = [
 
 resolver = "2"
 
+[workspace.dependencies]
+progenitor = { version = "0.7.0", path = "progenitor" }
+progenitor-client = { version = "0.7.0", path = "progenitor-client" }
+progenitor-impl = { version = "0.7.0", path = "progenitor-impl" }
+progenitor-macro = { version = "0.7.0", path = "progenitor-macro" }
+
+anyhow = "1.0.86"
+base64 = "0.22.1"
+built = { version = "0.7.2", features = ["cargo-lock", "git2"] }
+bytes = "1.6.0"
+chrono = { version = "0.4", features = ["serde"] }
+clap = { version = "4.5.7", features = ["derive"] }
+dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false }
+env_logger = "0.10.2"
+expectorate = "1.1.0"
+futures = "0.3.30"
+futures-core = "0.3.30"
+heck = "0.5.0"
+http = "0.2.9"
+hyper = "0.14.27"
+indexmap = "2.2.6"
+openapiv3 = "2.0.0"
+percent-encoding = "2.3"
+proc-macro2 = "1.0.86"
+project-root = "0.2.2"
+quote = "1.0.36"
+rand = "0.8.5"
+regex = "1.10.5"
+regress = "0.10.0"
+reqwest = { version = "0.11.27", features = ["json", "stream"] }
+rustfmt-wrapper = "0.2.1"
+schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
+serde = { version = "1.0.203", features = ["derive"] }
+serde_json = "1.0.117"
+serde_urlencoded = "0.7.1"
+serde_yaml = "0.9"
+syn = { version = "2.0.67", features = ["parsing"] }
+thiserror = "1.0.61"
+tokio = { version = "1.37.0", features = ["rt", "net"] }
+# change when publishing
+# typify = { version = "0.1.0" }
+typify = { git = "https://github.com/oxidecomputer/typify" }
+unicode-ident = "1.0.12"
+uuid = { version = "1.8.0", features = ["serde", "v4"] }
+
 #[patch."https://github.com/oxidecomputer/dropshot"]
 #dropshot = { path = "../dropshot/dropshot" }
 
diff --git a/cargo-progenitor/Cargo.toml b/cargo-progenitor/Cargo.toml
index c778804..221534a 100644
--- a/cargo-progenitor/Cargo.toml
+++ b/cargo-progenitor/Cargo.toml
@@ -13,17 +13,18 @@ build = "build.rs"
 default-run = "cargo-progenitor"
 
 [dependencies]
-progenitor = { version = "0.7.0", path = "../progenitor" }
-progenitor-client = { version = "0.7.0", path = "../progenitor-client" }
-progenitor-impl = { version = "0.7.0", path = "../progenitor-impl" }
-anyhow = "1.0"
-clap = { version = "4.5.6", features = ["derive"] }
-env_logger = "0.10.2"
-openapiv3 = "2.0.0"
-rustfmt-wrapper = "0.2.1"
-serde_json = "1.0"
-serde_yaml = "0.9"
+progenitor = { workspace = true }
+progenitor-client = { workspace = true }
+progenitor-impl = { workspace = true }
+
+anyhow = { workspace = true }
+clap = { workspace = true }
+env_logger = { workspace = true }
+openapiv3 = { workspace = true }
+rustfmt-wrapper = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
 
 [build-dependencies]
-built = { version = "0.7.2", features = ["cargo-lock", "git2"] }
-project-root = "0.2"
+built = { workspace = true }
+project-root = { workspace = true }
diff --git a/progenitor-client/Cargo.toml b/progenitor-client/Cargo.toml
index 0dfde5a..0728ff9 100644
--- a/progenitor-client/Cargo.toml
+++ b/progenitor-client/Cargo.toml
@@ -7,10 +7,10 @@ repository = "https://github.com/oxidecomputer/progenitor.git"
 description = "An OpenAPI client generator - client support"
 
 [dependencies]
-bytes = "1.6.0"
-futures-core = "0.3.30"
-percent-encoding = "2.3"
-reqwest = { version = "0.11.27", default-features = false, features = ["json", "stream"] }
-serde = "1.0"
-serde_json = "1.0"
-serde_urlencoded = "0.7.1"
+bytes = { workspace = true }
+futures-core = { workspace = true }
+percent-encoding = { workspace = true }
+reqwest = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_urlencoded = { workspace = true }
diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml
index a08e2f0..8aca2b3 100644
--- a/progenitor-impl/Cargo.toml
+++ b/progenitor-impl/Cargo.toml
@@ -8,34 +8,30 @@ repository = "https://github.com/oxidecomputer/progenitor.git"
 readme = "../README.md"
 
 [dependencies]
-heck = "0.5.0"
-http = "0.2.9"
-getopts = "0.2"
-indexmap = "2.2.6"
-openapiv3 = "2.0.0"
-proc-macro2 = "1.0"
-quote = "1.0"
-regex = "1.10"
-schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-syn = { version = "2.0", features = ["parsing"] }
-thiserror = "1.0"
-# change when publishing
-# typify = { version = "0.1.0" }
-typify = { git = "https://github.com/oxidecomputer/typify" }
-unicode-ident = "1.0.12"
+heck = { workspace = true }
+http = { workspace = true }
+indexmap = { workspace = true }
+openapiv3 = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+regex = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+syn = { workspace = true }
+thiserror = { workspace = true }
+typify = { workspace = true }
+unicode-ident = { workspace = true }
 
 [dev-dependencies]
-dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false }
-expectorate = "1.1"
-futures = "0.3.30"
-http = "0.2.9"
-hyper = "0.14.27"
-reqwest = "0.11.27"
-rustfmt-wrapper = "0.2.1"
-serde_yaml = "0.9"
-serde_json = "1.0.117"
-tokio = { version = "1.37.0", features = ["rt", "net"] }
+dropshot = { workspace = true }
+expectorate = { workspace = true }
+futures = { workspace = true }
+http = { workspace = true }
+hyper = { workspace = true }
+reqwest = { workspace = true }
+rustfmt-wrapper = { workspace = true }
+serde_yaml = { workspace = true }
+tokio = { workspace = true }
 
 progenitor-client.path = "../progenitor-client"
diff --git a/progenitor/Cargo.toml b/progenitor/Cargo.toml
index 362e7de..68537f8 100644
--- a/progenitor/Cargo.toml
+++ b/progenitor/Cargo.toml
@@ -10,20 +10,20 @@ keywords = ["openapi", "openapiv3", "sdk", "generator", "proc_macro"]
 categories = ["api-bindings", "compilers"]
 
 [dependencies]
-progenitor-client = { version = "0.7.0", path = "../progenitor-client" }
-progenitor-impl = { version = "0.7.0", path = "../progenitor-impl" }
-progenitor-macro = { version = "0.7.0", path = "../progenitor-macro" }
-serde_json = "1.0"
+progenitor-client = { workspace = true }
+progenitor-impl = { workspace = true }
+progenitor-macro = { workspace = true }
 
 [dev-dependencies]
-base64 = "0.22"
-chrono = { version = "0.4", features = ["serde"] }
-futures = "0.3.30"
-percent-encoding = "2.3"
-rand = "0.8"
-regress = "0.10.0"
-reqwest = { version = "0.11.27", features = ["json", "stream"] }
-schemars = { version = "0.8.21", features = ["uuid1"] }
-serde = { version = "1.0", features = ["derive"] }
-uuid = { version = "1.8", features = ["serde", "v4"] }
-tokio = "1.36.0"
+base64 = { workspace = true }
+chrono = { workspace = true }
+futures = { workspace = true }
+percent-encoding = { workspace = true }
+rand = { workspace = true }
+regress = { workspace = true }
+reqwest = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true }
+uuid = { workspace = true }