Skip to content

Commit 931b184

Browse files
authored
Merge pull request #14 from oxidecomputer/wc/dep-update-o-rama
Update dependencies
2 parents bfbafd6 + 575ef14 commit 931b184

15 files changed

Lines changed: 818 additions & 811 deletions

File tree

Cargo.lock

Lines changed: 379 additions & 332 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -35,67 +35,71 @@ axoprocess = { version = "0.2.0", path = "vendor/axoprocess" }
3535
gazenot = { version = "0.3.3", path = "vendor/gazenot" }
3636

3737
# third-party deps
38-
clap = { version = "4.5.28", features = ["derive"] }
39-
console = { version = "0.15.10" }
40-
clap-cargo = { version = "0.14.0" }
38+
assert_fs = "1.1.3"
39+
backon = "1.5.1"
40+
backtrace = "0.3.75"
41+
backtrace-ext = "0.2.1"
42+
base64 = "0.22.1"
43+
blake2 = "0.10.6"
44+
camino = { version = "1.1.10", features = ["serde1"] }
45+
cargo_metadata = "0.20.0"
46+
cargo-wix = "0.3.8"
47+
clap = { version = "4.5.40", features = ["derive"] }
48+
clap-cargo = { version = "0.15.2" }
49+
color-backtrace = "0.7.0"
4150
comfy-table = "7.1.4"
42-
miette = { version = "7.5.0" }
43-
thiserror = "2.0.11"
44-
tracing = { version = "0.1.41", features = ["log"] }
45-
tracing-subscriber = "0.3.18"
46-
serde = { version = "1.0.217", features = ["derive"] }
47-
serde_json = { version = "1.0.138" }
48-
serde_yml = { version = "0.0.11" }
49-
cargo_metadata = "0.18.1"
50-
camino = { version = "1.1.9", features = ["serde1"] }
51-
semver = "1.0.25"
52-
newline-converter = "0.3.0"
51+
console = { version = "0.15.10" }
52+
current_platform = "0.2.0"
5353
dialoguer = "0.11.0"
54-
sha2 = "0.10.6"
55-
minijinja = { version = "2.6.0", features = ["debug", "loader", "builtins", "json", "custom_syntax"] }
54+
flate2 = "1.1.2"
55+
goblin = "0.8.2"
56+
guppy = "0.17.19"
57+
homedir = "0.3.4"
58+
httpmock = "0.7.0"
59+
image = { version = "0.25.6", default-features = false }
5660
include_dir = "0.7.4"
61+
insta = { version = "1.43.1", features = ["filters"] }
5762
itertools = "0.13.0"
58-
cargo-wix = "0.3.8"
59-
uuid = { version = "1", features = ["v4"] }
63+
lazy_static = "1.5.0"
64+
liblzma = "0.4.1"
6065
mach_object = "0.1"
61-
goblin = "0.8.2"
62-
similar = "2.7.0"
63-
tokio = { version = "1.45.1", features = ["full"] }
64-
temp-dir = "0.1.14"
65-
tempfile = "3.10.1"
66-
sha3 = "0.10.8"
67-
blake2 = "0.10.6"
68-
insta = { version = "1.42.1", features = ["filters"] }
69-
tar = "0.4.43"
70-
flate2 = "1.0.35"
71-
zip = { version = "0.6.4" }
72-
xz2 = { version = "0.1.7" }
73-
zstd = { version = "0.13.0" }
74-
pathdiff = { version = "0.2.3", features = ["camino"] }
75-
url = "2.5.4"
66+
miette = { version = "7.6.0" }
67+
mime = "0.3.17"
68+
minijinja = { version = "2.10.2", features = ["debug", "loader", "builtins", "json", "custom_syntax"] }
69+
newline-converter = "0.3.0"
70+
node-semver = "2.2.0"
71+
oro-common = "0.3.34"
72+
oro-package-spec = "0.3.34"
7673
parse-changelog = "0.6.12"
77-
schemars = "0.8.21"
78-
spdx = "0.10.8"
79-
base64 = "0.22.1"
80-
lazy_static = "1.5.0"
81-
current_platform = "0.2.0"
82-
color-backtrace = "0.6.1"
83-
backtrace = "0.3.74"
84-
backtrace-ext = "0.2.1"
85-
target-lexicon = "0.12.16"
86-
homedir = "0.3.3"
74+
pathdiff = { version = "0.2.3", features = ["camino"] }
75+
reqwest = { version = "0.12.0", default-features = false }
76+
schemars = "0.9.0"
8777
self-replace = "1.5.0"
88-
httpmock = "0.7.0"
78+
semver = "1.0.26"
79+
serde = { version = "1.0.219", features = ["derive"] }
80+
serde_json = { version = "1.0.140" }
81+
serde_yaml = { version = "0.9.34" }
8982
serial_test = "3.2.0"
90-
backon = "0.4.1"
91-
image = { version = "0.25.4", default-features = false }
92-
mime = "0.3.16"
93-
reqwest = { version = ">=0.11.0", default-features = false }
94-
toml = "0.8.12"
95-
toml_edit = { version = "0.22.22" }
83+
sha2 = "0.10.9"
84+
sha3 = "0.10.8"
85+
similar = "2.7.0"
86+
spdx = "0.10.8"
87+
tar = "0.4.44"
88+
target-lexicon = { version = "0.13.2", features = ["std"] }
89+
temp-dir = "0.1.16"
90+
tempfile = "3.20.0"
91+
thiserror = "2.0.12"
92+
tokio = { version = "1.45.1", features = ["full"] }
93+
toml = "0.8.23"
94+
toml_edit = { version = "0.22.27" }
95+
tracing = { version = "0.1.41", features = ["log"] }
96+
tracing-subscriber = "0.3.19"
97+
url = "2.5.4"
98+
uuid = { version = "1.17.0", features = ["v4"] }
9699
walkdir = "2.5.0"
97-
assert_fs = "1"
98-
wiremock = "0.6"
100+
wiremock = "0.6.3"
101+
zip = { version = "4.1.0", default-features = false, features = ["deflate"] }
102+
zstd = { version = "0.13.0" }
99103

100104
[workspace.metadata.release]
101105
shared-version = true

axoproject/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ npm-projects = ["oro-common", "oro-package-spec", "node-semver"]
2525
[dependencies]
2626
# it would be nice to inherit these features from workspace
2727
# but you can't optional inherit workspace deps..?
28-
guppy = { version = "0.17.5", optional = true }
29-
oro-common = { version = "0.3.34", optional = true }
30-
oro-package-spec = { version = "0.3.34", optional = true }
31-
node-semver = { version = "2.2.0", optional = true }
28+
guppy = { workspace = true, optional = true }
29+
oro-common = { workspace = true, optional = true }
30+
oro-package-spec = { workspace = true, optional = true }
31+
node-semver = { workspace = true, optional = true }
3232

3333
axoasset.workspace = true
3434
axoprocess.workspace = true

cargo-dist-schema/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ impl DistManifest {
869869
}
870870

871871
/// Get the JSON Schema for a DistManifest
872-
pub fn json_schema() -> schemars::schema::RootSchema {
872+
pub fn json_schema() -> schemars::Schema {
873873
schemars::schema_for!(DistManifest)
874874
}
875875

0 commit comments

Comments
 (0)