ryan
/
progenitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move to workspace dependencies (#834)

This commit is contained in:
Adam Leventhal 2024-06-20 19:04:05 -07:00 committed by GitHub
parent a2d1100413
commit 244fe03164
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 135 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Cargo.lock generated
View File

@ -132,7 +132,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -143,7 +143,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -311,9 +311,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.6" version = "4.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -321,9 +321,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.6" version = "4.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -340,7 +340,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -533,7 +533,7 @@ dependencies = [
"quote", "quote",
"serde", "serde",
"serde_tokenstream", "serde_tokenstream",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -610,7 +610,7 @@ dependencies = [
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
"syn 2.0.66", "syn 2.0.67",
"uuid", "uuid",
] ]
@ -638,7 +638,7 @@ dependencies = [
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
"syn 2.0.66", "syn 2.0.67",
"uuid", "uuid",
"wasm-bindgen-test", "wasm-bindgen-test",
] ]
@ -746,7 +746,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -789,15 +789,6 @@ dependencies = [
"version_check", "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]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.12" version = "0.2.12"
@ -1381,14 +1372,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.85" version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -1434,7 +1425,6 @@ dependencies = [
"dropshot", "dropshot",
"expectorate", "expectorate",
"futures", "futures",
"getopts",
"heck", "heck",
"http 0.2.9", "http 0.2.9",
"hyper", "hyper",
@ -1450,7 +1440,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_yaml", "serde_yaml",
"syn 2.0.66", "syn 2.0.67",
"thiserror", "thiserror",
"tokio", "tokio",
"typify", "typify",
@ -1470,7 +1460,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_tokenstream", "serde_tokenstream",
"serde_yaml", "serde_yaml",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -1548,9 +1538,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.10.4" version = "1.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -1787,7 +1777,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals", "serde_derive_internals",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -1851,7 +1841,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -1862,7 +1852,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -1904,7 +1894,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde", "serde",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -2076,9 +2066,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.66" version = "2.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2168,7 +2158,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -2253,7 +2243,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -2423,7 +2413,7 @@ dependencies = [
"semver", "semver",
"serde", "serde",
"serde_json", "serde_json",
"syn 2.0.66", "syn 2.0.67",
"thiserror", "thiserror",
"unicode-ident", "unicode-ident",
] ]
@ -2440,7 +2430,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_tokenstream", "serde_tokenstream",
"syn 2.0.66", "syn 2.0.67",
"typify-impl", "typify-impl",
] ]
@ -2587,7 +2577,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2621,7 +2611,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2654,7 +2644,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]
@ -2988,7 +2978,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.66", "syn 2.0.67",
] ]
[[package]] [[package]]

45
Cargo.toml
View File

@ -12,6 +12,51 @@ members = [
resolver = "2" 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"] #[patch."https://github.com/oxidecomputer/dropshot"]
#dropshot = { path = "../dropshot/dropshot" } #dropshot = { path = "../dropshot/dropshot" }

25
cargo-progenitor/Cargo.toml
View File

@ -13,17 +13,18 @@ build = "build.rs"
default-run = "cargo-progenitor" default-run = "cargo-progenitor"
[dependencies] [dependencies]
progenitor = { version = "0.7.0", path = "../progenitor" } progenitor = { workspace = true }
progenitor-client = { version = "0.7.0", path = "../progenitor-client" } progenitor-client = { workspace = true }
progenitor-impl = { version = "0.7.0", path = "../progenitor-impl" } progenitor-impl = { workspace = true }
anyhow = "1.0"
clap = { version = "4.5.6", features = ["derive"] } anyhow = { workspace = true }
env_logger = "0.10.2" clap = { workspace = true }
openapiv3 = "2.0.0" env_logger = { workspace = true }
rustfmt-wrapper = "0.2.1" openapiv3 = { workspace = true }
serde_json = "1.0" rustfmt-wrapper = { workspace = true }
serde_yaml = "0.9" serde_json = { workspace = true }
serde_yaml = { workspace = true }
[build-dependencies] [build-dependencies]
built = { version = "0.7.2", features = ["cargo-lock", "git2"] } built = { workspace = true }
project-root = "0.2" project-root = { workspace = true }

14
progenitor-client/Cargo.toml
View File

@ -7,10 +7,10 @@ repository = "https://github.com/oxidecomputer/progenitor.git"
description = "An OpenAPI client generator - client support" description = "An OpenAPI client generator - client support"
[dependencies] [dependencies]
bytes = "1.6.0" bytes = { workspace = true }
futures-core = "0.3.30" futures-core = { workspace = true }
percent-encoding = "2.3" percent-encoding = { workspace = true }
reqwest = { version = "0.11.27", default-features = false, features = ["json", "stream"] } reqwest = { workspace = true }
serde = "1.0" serde = { workspace = true }
serde_json = "1.0" serde_json = { workspace = true }
serde_urlencoded = "0.7.1" serde_urlencoded = { workspace = true }

50
progenitor-impl/Cargo.toml
View File

@ -8,34 +8,30 @@ repository = "https://github.com/oxidecomputer/progenitor.git"
readme = "../README.md" readme = "../README.md"
[dependencies] [dependencies]
heck = "0.5.0" heck = { workspace = true }
http = "0.2.9" http = { workspace = true }
getopts = "0.2" indexmap = { workspace = true }
indexmap = "2.2.6" openapiv3 = { workspace = true }
openapiv3 = "2.0.0" proc-macro2 = { workspace = true }
proc-macro2 = "1.0" quote = { workspace = true }
quote = "1.0" regex = { workspace = true }
regex = "1.10" schemars = { workspace = true }
schemars = { version = "0.8.21", features = ["chrono", "uuid1"] } serde = { workspace = true }
serde = { version = "1.0", features = ["derive"] } serde_json = { workspace = true }
serde_json = "1.0" syn = { workspace = true }
syn = { version = "2.0", features = ["parsing"] } thiserror = { workspace = true }
thiserror = "1.0" typify = { workspace = true }
# change when publishing unicode-ident = { workspace = true }
# typify = { version = "0.1.0" }
typify = { git = "https://github.com/oxidecomputer/typify" }
unicode-ident = "1.0.12"
[dev-dependencies] [dev-dependencies]
dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false } dropshot = { workspace = true }
expectorate = "1.1" expectorate = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
http = "0.2.9" http = { workspace = true }
hyper = "0.14.27" hyper = { workspace = true }
reqwest = "0.11.27" reqwest = { workspace = true }
rustfmt-wrapper = "0.2.1" rustfmt-wrapper = { workspace = true }
serde_yaml = "0.9" serde_yaml = { workspace = true }
serde_json = "1.0.117" tokio = { workspace = true }
tokio = { version = "1.37.0", features = ["rt", "net"] }
progenitor-client.path = "../progenitor-client" progenitor-client.path = "../progenitor-client"

30
progenitor/Cargo.toml
View File

@ -10,20 +10,20 @@ keywords = ["openapi", "openapiv3", "sdk", "generator", "proc_macro"]
categories = ["api-bindings", "compilers"] categories = ["api-bindings", "compilers"]
[dependencies] [dependencies]
progenitor-client = { version = "0.7.0", path = "../progenitor-client" } progenitor-client = { workspace = true }
progenitor-impl = { version = "0.7.0", path = "../progenitor-impl" } progenitor-impl = { workspace = true }
progenitor-macro = { version = "0.7.0", path = "../progenitor-macro" } progenitor-macro = { workspace = true }
serde_json = "1.0"
[dev-dependencies] [dev-dependencies]
base64 = "0.22" base64 = { workspace = true }
chrono = { version = "0.4", features = ["serde"] } chrono = { workspace = true }
futures = "0.3.30" futures = { workspace = true }
percent-encoding = "2.3" percent-encoding = { workspace = true }
rand = "0.8" rand = { workspace = true }
regress = "0.10.0" regress = { workspace = true }
reqwest = { version = "0.11.27", features = ["json", "stream"] } reqwest = { workspace = true }
schemars = { version = "0.8.21", features = ["uuid1"] } schemars = { workspace = true }
serde = { version = "1.0", features = ["derive"] } serde = { workspace = true }
uuid = { version = "1.8", features = ["serde", "v4"] } serde_json = { workspace = true }
tokio = "1.36.0" tokio = { workspace = true }
uuid = { workspace = true }