Skip to content

Commit 3158028

Browse files
DaniPopesDaniPopes
authored
chore: use more workspace features in manifests (foundry-rs#5620)
* chore: use workspace.package * chore: use dot syntax * chore: use `workspace.dependencies` for workspace packages
1 parent 9e907fc commit 3158028

File tree

25 files changed

+289
-238
lines changed

25 files changed

+289
-238
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
[workspace]
2-
members = [
3-
"crates/anvil",
4-
"crates/anvil/core",
5-
"crates/anvil/rpc",
6-
"crates/anvil/server",
7-
"crates/abi",
8-
"crates/binder",
9-
"crates/cast",
10-
"crates/chisel",
11-
"crates/cli",
12-
"crates/cli/test-utils",
13-
"crates/common",
14-
"crates/config",
15-
"crates/doc",
16-
"crates/evm",
17-
"crates/fmt",
18-
"crates/forge",
19-
"crates/macros",
20-
"crates/macros/impl",
21-
"crates/ui",
22-
"crates/utils",
23-
]
2+
members = ["crates/*"]
243
resolver = "2"
254

5+
[workspace.package]
6+
version = "0.2.0"
7+
edition = "2021"
8+
rust-version = "1.71"
9+
authors = ["Foundry Contributors"]
10+
license = "MIT OR Apache-2.0"
11+
homepage = "https://github.com/foundry-rs/foundry"
12+
repository = "https://github.com/foundry-rs/foundry"
13+
exclude = ["benches/", "tests/", "test-data/", "testdata/"]
14+
2615
[profile.dev]
2716
# Disabling debug info speeds up builds a bunch,
2817
# and we don't rely on it for debugging that much
@@ -107,6 +96,22 @@ codegen-units = 16
10796
package = {}
10897

10998
[workspace.dependencies]
99+
foundry-abi = { path = "crates/abi" }
100+
anvil = { path = "crates/anvil" }
101+
foundry-binder = { path = "crates/binder" }
102+
cast = { path = "crates/cast" }
103+
chisel = { path = "crates/chisel" }
104+
foundry-cli = { path = "crates/cli" }
105+
foundry-common = { path = "crates/common" }
106+
foundry-config = { path = "crates/config" }
107+
forge-doc = { path = "crates/doc" }
108+
foundry-evm = { path = "crates/evm" }
109+
forge-fmt = { path = "crates/fmt" }
110+
forge = { path = "crates/forge" }
111+
foundry-macros = { path = "crates/macros" }
112+
ui = { path = "crates/ui" }
113+
foundry-utils = { path = "crates/utils" }
114+
110115
ethers = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
111116
ethers-addressbook = { git = "https://github.com/gakonst/ethers-rs", default-features = false }
112117
ethers-core = { git = "https://github.com/gakonst/ethers-rs", default-features = false }

‎crates/abi/Cargo.toml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
[package]
22
name = "foundry-abi"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
6-
readme = "README.md"
73
description = "Foundry's Solidity ABI bindings"
8-
repository = "https://github.com/foundry-rs/foundry"
94
exclude = ["abi", "build.rs"]
105

6+
version.workspace = true
7+
edition.workspace = true
8+
rust-version.workspace = true
9+
authors.workspace = true
10+
license.workspace = true
11+
homepage.workspace = true
12+
repository.workspace = true
13+
1114
[build-dependencies]
12-
ethers-contract-abigen = { workspace = true }
15+
ethers-contract-abigen.workspace = true
1316
eyre = "0.6"
1417
syn = "2.0"
1518

1619
[dependencies]
17-
foundry-macros = { path = "../macros" }
20+
foundry-macros.workspace = true
1821

19-
ethers-core = { workspace = true }
22+
ethers-core.workspace = true
2023
ethers-contract = { workspace = true, features = ["abigen"] }
21-
ethers-providers = { workspace = true }
24+
ethers-providers.workspace = true

‎crates/anvil/Cargo.toml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
[package]
22
name = "anvil"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
6-
readme = "README.md"
73
description = "Foundry's local ethereum node"
84

5+
version.workspace = true
6+
edition.workspace = true
7+
rust-version.workspace = true
8+
authors.workspace = true
9+
license.workspace = true
10+
homepage.workspace = true
11+
repository.workspace = true
12+
913
[[bin]]
1014
name = "anvil"
1115
path = "src/anvil.rs"

‎crates/anvil/core/Cargo.toml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
[package]
22
name = "anvil-core"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
3+
4+
version.workspace = true
5+
edition.workspace = true
6+
rust-version.workspace = true
7+
authors.workspace = true
8+
license.workspace = true
9+
homepage.workspace = true
10+
repository.workspace = true
611

712
[dependencies]
813
# foundry internal
914
foundry-evm = { path = "../../evm" }
1015
revm = { version = "3", default-features = false, features = ["std", "serde", "memory_limit"] }
1116

12-
ethers-core = { workspace = true }
17+
ethers-core.workspace = true
1318
serde = { version = "1", features = ["derive"], optional = true }
1419
serde_json = "1"
1520
bytes = { version = "1.4" }

‎crates/anvil/rpc/Cargo.toml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
[package]
22
name = "anvil-rpc"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
6-
description = "RPC support"
3+
4+
version.workspace = true
5+
edition.workspace = true
6+
rust-version.workspace = true
7+
authors.workspace = true
8+
license.workspace = true
9+
homepage.workspace = true
10+
repository.workspace = true
711

812
[dependencies]
913
serde = { version = "1.0", features = ["derive"] }

‎crates/anvil/server/Cargo.toml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
[package]
22
name = "anvil-server"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
63
description = "Customizable RPC server"
74

5+
version.workspace = true
6+
edition.workspace = true
7+
rust-version.workspace = true
8+
authors.workspace = true
9+
license.workspace = true
10+
homepage.workspace = true
11+
repository.workspace = true
12+
813
[dependencies]
914
anvil-rpc = { path = "../rpc" }
1015

‎crates/binder/Cargo.toml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
[package]
22
name = "foundry-binder"
3-
version = "0.1.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
6-
readme = "./README.md"
73
description = "Generate rust bindings for solidity projects"
8-
repository = "https://github.com/foundry-rs/foundry"
9-
keywords = ["ethereum", "web3", "solidity"]
4+
5+
version.workspace = true
6+
edition.workspace = true
7+
rust-version.workspace = true
8+
authors.workspace = true
9+
license.workspace = true
10+
homepage.workspace = true
11+
repository.workspace = true
1012

1113
[dependencies]
12-
foundry-config = { path = "../config" }
14+
foundry-config.workspace = true
1315
ethers-solc = { workspace = true, features = ["async", "svm-solc", "project-util"] }
1416
ethers-contract = { workspace = true, features = ["abigen"] }
1517
curl = { version = "0.4", default-features = false, features = ["http2"] }

‎crates/cast/Cargo.toml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
[package]
22
name = "cast"
3-
version = "0.2.0"
4-
edition = "2021"
5-
license = "MIT OR Apache-2.0"
6-
readme = "README.md"
7-
repository = "https://github.com/foundry-rs/foundry"
8-
keywords = ["ethereum", "web3"]
3+
4+
version.workspace = true
5+
edition.workspace = true
6+
rust-version.workspace = true
7+
authors.workspace = true
8+
license.workspace = true
9+
homepage.workspace = true
10+
repository.workspace = true
911

1012
[dependencies]
11-
foundry-utils = { path = "../utils" }
12-
foundry-evm = { path = "./../evm" }
13-
foundry-config = { path = "./../config" }
14-
foundry-common = { path = "./../common" }
13+
foundry-utils.workspace = true
14+
foundry-evm.workspace = true
15+
foundry-config.workspace = true
16+
foundry-common.workspace = true
1517

16-
ethers-etherscan = { workspace = true }
18+
ethers-etherscan.workspace = true
1719
ethers-contract = { workspace = true, features = ["abigen"] }
18-
ethers-core = { workspace = true }
19-
ethers-providers = { workspace = true }
20-
ethers-signers = { workspace = true }
20+
ethers-core.workspace = true
21+
ethers-providers.workspace = true
22+
ethers-signers.workspace = true
2123
futures = "0.3"
2224
eyre = "0.6"
2325
serde = "1"

0 commit comments

Comments
 (0)