Skip to content

Commit

Permalink
[deps] Upgrade most dependencies
Browse files Browse the repository at this point in the history
Upgraded most dependencies and cleaned up Cargo.tomls for most things.

Closes: aptos-labs#865
  • Loading branch information
gregnazario authored and aptos-bot committed May 10, 2022
1 parent 491aa33 commit 1323615
Show file tree
Hide file tree
Showing 112 changed files with 624 additions and 615 deletions.
164 changes: 83 additions & 81 deletions Cargo.lock

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
bytes = "1.0.1"
fail = "0.4.0"
anyhow = "1.0.57"
bcs = "0.1.3"
bytes = "1.1.0"
fail = "0.5.0"
futures = "0.3.12"
hex = "0.4.3"
hyper = "0.14.4"
once_cell = "1.7.2"
hyper = "0.14.18"
once_cell = "1.10.0"
percent-encoding = "2.1.0"
serde = { version = "1.0.124", features = ["derive"], default-features = false }
serde_json = "1.0.64"
serde = { version = "1.0.137", features = ["derive"], default-features = false }
serde_json = "1.0.81"
tokio = { version = "1.8.1", features = ["full"] }
warp = { version = "0.3.2", features = ["default", "tls"] }

Expand All @@ -32,7 +32,7 @@ aptos-metrics = { path = "../crates/aptos-metrics" }
aptos-state-view = { path = "../storage/state-view" }
aptos-types = { path = "../types" }
aptos-vm = { path = "../aptos-move/aptos-vm" }
aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
aptos-workspace-hack = { path = "../crates/aptos-workspace-hack" }
aptos-api-types = { path = "./types", package = "aptos-api-types" }
storage-interface = { path = "../storage/storage-interface" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["address32"] }
Expand All @@ -42,7 +42,7 @@ move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f
goldenfile = "1.1.0"
rand = "0.8.3"
regex = "1.5.5"
reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false }
reqwest = { version = "0.11.10", features = ["blocking", "json"], default_features = false }

aptos-crypto = { path = "../crates/aptos-crypto" }
aptos-genesis-tool = {path = "../config/management/genesis", features = ["testing"] }
Expand Down
10 changes: 5 additions & 5 deletions api/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
anyhow = "1.0.57"
bcs = "0.1.3"
hex = "0.4.3"
serde = { version = "1.0.124", default-features = false }
serde_json = "1.0.64"
serde = { version = "1.0.137", default-features = false }
serde_json = "1.0.81"
warp = { version = "0.3.2", features = ["default"] }

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types" }
aptos-vm = { path = "../../aptos-move/aptos-vm" }
aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3", features=["address32"] }
move-resource-viewer = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
Expand Down
4 changes: 2 additions & 2 deletions aptos-move/af-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
anyhow = "1.0.57"
bcs = "0.1.3"
clap = "3.1.8"

aptos-vm = { path = "../aptos-vm" }
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-resource-viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-types = { path = "../../types" }
move-deps = { path = "../move-deps", features=["address32"] }

anyhow = "1.0.52"
anyhow = "1.0.57"
4 changes: 2 additions & 2 deletions aptos-move/aptos-transaction-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ publish = false
edition = "2018"

[dependencies]
criterion = "0.3.4"
criterion = "0.3.5"
proptest = "1.0.0"
criterion-cpu-time = "0.1.0"
num_cpus = "1.13.0"
num_cpus = "1.13.1"

aptos-types = { path = "../../types", features = ["fuzzing"] }
language-e2e-tests = { path = "../e2e-tests" }
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-validator-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
anyhow = "1.0.57"
aptos-config = { path = "../../config" }
aptos-types = { path = "../../types" }
aptosdb = { path = "../../storage/aptosdb" }
Expand Down
18 changes: 9 additions & 9 deletions aptos-move/aptos-vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
fail = "0.4.0"
mirai-annotations = "1.10.1"
anyhow = "1.0.57"
bcs = "0.1.3"
fail = "0.5.0"
mirai-annotations = "1.12.0"
once_cell = "1.10.0"
rayon = "1.5.0"
tracing = "0.1.16"
num_cpus = "1.13.0"
rayon = "1.5.2"
tracing = "0.1.34"
num_cpus = "1.13.1"

move-deps = { path = "../move-deps", features=["address32"] }
aptos-crypto = { path = "../../crates/aptos-crypto" }
Expand All @@ -30,8 +30,8 @@ aptos-types = { path = "../../types" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
framework = { path = "../framework" }
mvhashmap = { path = "../mvhashmap" }
serde_json = "1.0.64"
serde = { version = "1.0.124", default-features = false }
serde_json = "1.0.81"
serde = { version = "1.0.137", default-features = false }

[dev-dependencies]
proptest = "1.0.0"
Expand Down
12 changes: 6 additions & 6 deletions aptos-move/e2e-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ license = "Apache-2.0"
publish = false

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
anyhow = "1.0.57"
bcs = "0.1.3"
goldenfile = "1.1.0"
hex = "0.4.3"
once_cell = "1.7.2"
once_cell = "1.10.0"
proptest = "1.0.0"
proptest-derive = "0.3.0"
rand = "0.8.3"
serde = { version = "1.0.124", default-features = false }
num_cpus = "1.13.0"
serde = { version = "1.0.137", default-features = false }
num_cpus = "1.13.1"

## Move dependencies
move-deps= { path = "../move-deps", features=["address32"] }
Expand All @@ -38,4 +38,4 @@ aptos-proptest-helpers = { path = "../../crates/aptos-proptest-helpers" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
2 changes: 1 addition & 1 deletion aptos-move/e2e-testsuite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ aptos-types = { path = "../../types", features = ["fuzzing"] }
aptos-transaction-builder = { path = "../../sdk/transaction-builder"}
aptos-logger = { path = "../../crates/aptos-logger" }
aptos-state-view = { path = "../../storage/state-view" }
aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }

[features]
default = ["aptos-transaction-builder/fuzzing"]
14 changes: 7 additions & 7 deletions aptos-move/framework/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
transaction-builder-generator = { path = "../transaction-builder-generator" }
move-deps = { path = "../move-deps", features=["address32"] }

bcs = "0.1.2"
anyhow = "1.0.52"
bcs = "0.1.3"
anyhow = "1.0.57"
clap = "3.1.8"
log = "0.4.14"
rayon = "1.5.0"
log = "0.4.17"
rayon = "1.5.2"
sha2 = "0.9.3"
once_cell = "1.7.2"
smallvec = "1.6.1"
once_cell = "1.10.0"
smallvec = "1.8.0"
structopt = "0.3.21"
include_dir = "0.7.2"
tempfile = "3.2.0"
tempfile = "3.3.0"

[dev-dependencies]
datatest-stable = "0.1.1"
Expand Down
4 changes: 2 additions & 2 deletions aptos-move/framework/cached-packages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ publish = false
[dependencies]
aptos-types = { path = "../../../types" }
aptos-workspace-hack = { path = "../../../crates/aptos-workspace-hack" }
bcs = "0.1.2"
bcs = "0.1.3"
move-deps = { path = "../../move-deps", features=["address32"] }
include_dir = { version = "0.7.2", features = ["glob"] }
once_cell = "1.7.2"
once_cell = "1.10.0"
proptest = { version = "1.0.0", optional = true }
proptest-derive = { version = "0.3.0", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion aptos-move/move-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ move-unit-test = { git = "https://github.com/move-language/move", rev = "f2e7585

[dev-dependencies]
move-cli = { git = "https://github.com/move-language/move", rev = "f2e7585b1ed5bd2810163d6bdebafe5a388881d3" }
tempfile = "3.2.0"
tempfile = "3.3.0"
6 changes: 3 additions & 3 deletions aptos-move/mvhashmap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rayon = "1.5.0"
rayon = "1.5.2"
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
crossbeam = "0.8"
dashmap = "4.0.2"
crossbeam = "0.8.1"
dashmap = "5.2.0"
arc-swap = "1.5.0"

[dev-dependencies]
Expand Down
14 changes: 7 additions & 7 deletions aptos-move/parallel-executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ mvhashmap = { path = "../mvhashmap" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
aptos-infallible = { path = "../../crates/aptos-infallible" }

anyhow = "1.0.52"
crossbeam-queue = "0.3.1"
rayon = "1.5.0"
num_cpus = "1.13.0"
anyhow = "1.0.57"
crossbeam-queue = "0.3.5"
rayon = "1.5.2"
num_cpus = "1.13.1"
once_cell = "1.10.0"
crossbeam = "0.8"
crossbeam = "0.8.1"
arc-swap = "1.5.0"

criterion = { version = "0.3.4", optional = true}
criterion = { version = "0.3.5", optional = true}
proptest = { version = "1.0.0", optional = true}
proptest-derive = { version = "0.3.0", optional = true}

[dev-dependencies]
criterion = "0.3.4"
criterion = "0.3.5"
rand = "0.8.3"
proptest = "1.0.0"
proptest-derive = "0.3.0"
Expand Down
12 changes: 6 additions & 6 deletions aptos-move/transaction-builder-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
anyhow = "1.0.57"
bcs = "0.1.3"
heck = "0.3.2"
regex = "1.5.5"
serde_yaml = "0.8.17"
serde_yaml = "0.8.24"
structopt = "0.3.21"
textwrap = "0.13.4"
textwrap = "0.15.0"

aptos-types = { path = "../../types" }
aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
Expand All @@ -25,8 +25,8 @@ serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection" }
serde-generate = { git = "https://github.com/aptos-labs/serde-reflection" }

[dev-dependencies]
tempfile = "3.2.0"
which = "4.0.2"
tempfile = "3.3.0"
which = "4.2.5"

cached-framework-packages = { path = "../framework/cached-packages" }

Expand Down
4 changes: 2 additions & 2 deletions aptos-move/transaction-builder-generator/src/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -944,9 +944,9 @@ version = "{}"
edition = "2018"
[dependencies]
once_cell = "1.4.0"
once_cell = "1.10.0"
serde = {{ version = "1.0", features = ["derive"] }}
serde_bytes = "0.11"
serde_bytes = "0.11.6"
aptos-types = {{ path = "../aptos-types", version = "{}" }}
"#,
name, version, self.aptos_types_version,
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/transaction-builder-generator/tests/generation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ edition = "2018"
[dependencies]
aptos-types = {{ path = "../aptos-types", version = "0.1.0" }}
serde_bytes = "0.11"
serde_bytes = "0.11.6"
serde = {{ version = "1.0.114", features = ["derive"] }}
bcs = "0.1.1"
once_cell = "1.4.0"
bcs = "0.1.3"
once_cell = "1.10.0"
[[bin]]
name = "stdlib_demo"
Expand Down
4 changes: 2 additions & 2 deletions aptos-move/transaction-replay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
anyhow = "1.0.57"
bcs = "0.1.3"
difference = "2.0.0"
hex = "0.4.3"
structopt = "0.3.21"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/vm-genesis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ license = "Apache-2.0"
publish = false

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
once_cell = "1.7.2"
anyhow = "1.0.57"
bcs = "0.1.3"
once_cell = "1.10.0"
rand = "0.8.3"

aptos-config = { path = "../../config" }
Expand Down
10 changes: 5 additions & 5 deletions aptos-move/writeset-transaction-generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1.0.52"
bcs = "0.1.2"
handlebars = "3.5.3"
serde = { version = "1.0.124", default-features = false }
tempfile = "3.2.0"
anyhow = "1.0.57"
bcs = "0.1.3"
handlebars = "4.2.2"
serde = { version = "1.0.137", default-features = false }
tempfile = "3.3.0"

aptos-crypto = { path = "../../crates/aptos-crypto" }
aptos-crypto-derive = { path = "../../crates/aptos-crypto-derive" }
Expand Down
6 changes: 3 additions & 3 deletions aptos-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ publish = false
edition = "2018"

[dependencies]
bcs = "0.1.2"
fail = "0.4.0"
bcs = "0.1.3"
fail = "0.5.0"
futures = "0.3.12"
hex = "0.4.3"
jemallocator = { version = "0.3.2", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
Expand All @@ -36,7 +36,7 @@ aptos-temppath = { path = "../crates/aptos-temppath" }
aptos-time-service = { path = "../crates/aptos-time-service" }
aptos-types = { path = "../types" }
aptos-vm = { path = "../aptos-move/aptos-vm" }
aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
aptos-workspace-hack = { path = "../crates/aptos-workspace-hack" }
aptosdb = { path = "../storage/aptosdb" }
aptos-state-view = { path = "../storage/state-view" }
backup-service = { path = "../storage/backup/backup-service" }
Expand Down
Loading

0 comments on commit 1323615

Please sign in to comment.