Skip to content

Commit f103f14

Browse files
alfiedotwtfalfiedotwtf
committed
Move all crate dependencies to the workspace Cargo.toml (#6179)
1 parent a073a95 commit f103f14

File tree

28 files changed

+622
-598
lines changed

28 files changed

+622
-598
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 187 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,200 @@ exclude = [
3232
"forc-test/test_data"
3333
]
3434

35+
[workspace.package]
36+
edition = "2021"
37+
version = "0.63.5"
38+
authors = ["Fuel Labs <contact@fuel.sh>"]
39+
homepage = "https://fuel.network/"
40+
license = "Apache-2.0"
41+
repository = "https://github.com/FuelLabs/sway"
42+
3543
[workspace.dependencies]
44+
#
45+
# Internal dependencies in order to propagate `workspace.version`
46+
#
47+
48+
forc = { path = "forc/" }
49+
forc-pkg = { path = "forc-pkg/" }
50+
forc-test = { path = "forc-test/" }
51+
forc-tracing = { path = "forc-tracing/" }
52+
forc-util = { path = "forc-util/" }
53+
54+
# Forc plugins
55+
forc-plugins = { path = "forc-plugins/" }
56+
forc-client = { path = "forc-plugins/forc-client/" }
57+
forc-crypto = { path = "forc-plugins/forc-crypto/" }
58+
forc-debug = { path = "forc-plugins/forc-debug/" }
59+
forc-doc = { path = "forc-plugins/forc-doc/" }
60+
forc-fmt = { path = "forc-plugins/forc-fmt/" }
61+
forc-lsp = { path = "forc-plugins/forc-lsp/" }
62+
forc-tx = { path = "forc-plugins/forc-tx/" }
63+
64+
sway-ast = { path = "sway-ast/" }
65+
sway-core = { path = "sway-core/" }
66+
sway-error = { path = "sway-error/" }
67+
sway-lsp = { path = "sway-lsp/" }
68+
sway-parse = { path = "sway-parse/" }
69+
sway-types = { path = "sway-types/" }
70+
sway-utils = { path = "sway-utils/" }
71+
swayfmt = { path = "swayfmt/" }
72+
73+
# Sway IR
74+
sway-ir = { path = "sway-ir/" }
75+
sway-ir-macros = { path = "sway-ir/sway-ir-macros" }
76+
77+
#
78+
# External Fuel dependencies
79+
#
80+
81+
# Dependencies from the `fuel-abi-types` repository:
82+
fuel-abi-types = "0.7.0"
83+
3684
# Dependencies from the `fuel-core` repository:
3785
fuel-core-client = { version = "0.35.0", default-features = false }
3886
fuel-core-types = { version = "0.35.0", default-features = false }
3987

40-
# Dependencies from the `fuel-vm` repository:
41-
fuel-asm = "0.56.0"
42-
fuel-crypto = "0.56.0"
43-
fuel-types = "0.56.0"
44-
fuel-tx = "0.56.0"
45-
fuel-vm = "0.56.0"
46-
4788
# Dependencies from the `fuels-rs` repository:
48-
fuels-core = "0.66.4"
49-
fuels-accounts = "0.66.4"
50-
fuels = "0.66.4"
89+
fuels = "0.66"
90+
fuels-core = "0.66"
91+
fuels-accounts = "0.66"
92+
93+
# Dependencies from the `fuel-vm` repository:
94+
fuel-asm = "0.56"
95+
fuel-crypto = "0.56"
96+
fuel-types = "0.56"
97+
fuel-tx = "0.56"
98+
fuel-vm = "0.56"
5199

52100
# Dependencies from the `forc-wallet` repository:
53-
forc-wallet = "0.9.0"
101+
forc-wallet = "0.9"
54102

55-
# Dependencies from the `fuel-abi-types` repository:
56-
fuel-abi-types = "0.7.0"
103+
#
104+
# External dependencies
105+
#
57106

58-
[workspace.package]
59-
edition = "2021"
60-
authors = ["Fuel Labs <contact@fuel.sh>"]
61-
homepage = "https://fuel.network/"
62-
license = "Apache-2.0"
63-
repository = "https://github.com/FuelLabs/sway"
107+
annotate-snippets = "0.10"
108+
ansi_term = "0.12"
109+
anyhow = "1.0"
110+
assert-json-diff = "2.0"
111+
async-trait = "0.1"
112+
atty = "0.2"
113+
byte-unit = "5.1"
114+
bytecount = "0.6"
115+
bytes = "1.3.0"
116+
chrono = { version = "0.4", default-features = false }
117+
cid = "0.11"
118+
clap = "4.5"
119+
clap_complete = "4.5"
120+
clap_complete_fig = "4.5"
121+
colored = "2.0"
122+
comrak = "0.16"
123+
crossbeam-channel = "0.5"
124+
dap = "0.4.1-alpha"
125+
dashmap = "5.4"
126+
derivative = "2.2"
127+
devault = "0.1"
128+
dialoguer = "0.11"
129+
dirs = "3.0"
130+
downcast-rs = "1.2"
131+
either = "1.9"
132+
ethabi = { package = "fuel-ethabi", version = "18.0" }
133+
etk-asm = { package = "fuel-etk-asm", version = "0.3.1-dev" }
134+
etk-ops = { package = "fuel-etk-ops", version = "0.3.1-dev" }
135+
extension-trait = "1.0"
136+
fd-lock = "4.0"
137+
filecheck = "0.5"
138+
fs_extra = "1.2"
139+
futures = { version = "0.3", default-features = false }
140+
gag = "1.0"
141+
gimli = "0.28"
142+
git2 = "0.19"
143+
gix-url = "0.27"
144+
glob = "0.3"
145+
graph-cycles = "0.1"
146+
hashbrown = "0.13"
147+
hex = "0.4"
148+
horrorshow = "0.8"
149+
im = "15.0"
150+
in_definite = "1.0"
151+
include_dir = "0.7"
152+
indexmap = "2.0"
153+
indoc = "2.0"
154+
insta = "1.39"
155+
ipfs-api-backend-hyper = "0.6"
156+
itertools = "0.10"
157+
lazy_static = "1.4"
158+
libp2p-identity = "0.2"
159+
libtest-mimic = "0.7"
160+
lsp-types = "0.94"
161+
mdbook = { version = "0.4", default-features = false }
162+
miden = "0.3"
163+
miden-core = "0.3"
164+
minifier = "0.3"
165+
notify = "5.0"
166+
notify-debouncer-mini = "0.2"
167+
num-bigint = "0.4"
168+
num-traits = "0.2"
169+
object = "0.32"
170+
once_cell = "1.18"
171+
opener = "0.5"
172+
parking_lot = "0.12"
173+
paste = "1.0"
174+
peg = "0.7"
175+
pest = "2.1"
176+
pest_derive = "2.1"
177+
petgraph = "0.6"
178+
phf = "0.10"
179+
pretty_assertions = "1.4"
180+
prettydiff = "0.6"
181+
proc-macro2 = "1.0"
182+
quote = "1.0"
183+
rand = "0.8"
184+
rayon = "1.7"
185+
rayon-cond = "0.3"
186+
regex = "1.10"
187+
reqwest = "0.12"
188+
revm = "2.3"
189+
ropey = "1.5"
190+
rpassword = "7.2"
191+
rustc-hash = "1.1"
192+
semver = "1.0"
193+
serde = "1.0"
194+
serde_ignored = "0.1"
195+
serde_json = "1.0"
196+
serde_with = "3.3"
197+
serde_yaml = "0.9"
198+
serial_test = "3.0"
199+
sha2 = "0.9"
200+
sha3 = "0.10"
201+
shellfish = "0.6"
202+
slotmap = "1.0.7"
203+
smallvec = "1.7"
204+
strsim = "0.11"
205+
strum = "0.24"
206+
syn = "1.0"
207+
taplo = "0.7"
208+
tar = "0.4"
209+
tempfile = "3"
210+
term-table = "1.3"
211+
termion = "2.0"
212+
textwrap = "0.16"
213+
thiserror = "1.0"
214+
tikv-jemallocator = "0.5"
215+
tokio = "1.12"
216+
toml = "0.8"
217+
toml_edit = "0.21"
218+
tower = { version = "0.4", default-features = false }
219+
tower-lsp = "0.20"
220+
tracing = "0.1"
221+
tracing-subscriber = "0.3"
222+
uint = "0.9"
223+
unicode-bidi = "0.3"
224+
unicode-xid = "0.2"
225+
url = "2.2"
226+
urlencoding = "2.1"
227+
uwuify = "^0.2"
228+
vec1 = "1.8"
229+
vte = "0.13"
230+
walkdir = "2.3"
231+
whoami = "1.1"

‎forc-pkg/Cargo.toml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "forc-pkg"
3-
version = "0.63.5"
3+
version.workspace = true
44
description = "Building, locking, fetching and updating Sway projects as Forc packages."
55
authors.workspace = true
66
edition.workspace = true
@@ -9,38 +9,38 @@ license.workspace = true
99
repository.workspace = true
1010

1111
[dependencies]
12-
ansi_term = "0.12"
13-
anyhow = "1"
14-
byte-unit = "5.1.4"
15-
cid = "0.11"
16-
forc-tracing = { version = "0.63.5", path = "../forc-tracing" }
17-
forc-util = { version = "0.63.5", path = "../forc-util" }
18-
fuel-abi-types = { workspace = true }
19-
futures = "0.3"
20-
git2 = { version = "0.19", features = [
12+
ansi_term.workspace = true
13+
anyhow.workspace = true
14+
byte-unit.workspace = true
15+
cid.workspace = true
16+
forc-tracing.workspace = true
17+
forc-util.workspace = true
18+
fuel-abi-types.workspace = true
19+
futures.workspace = true
20+
git2 = { workspace = true, features = [
2121
"vendored-libgit2",
2222
"vendored-openssl",
2323
] }
24-
gix-url = { version = "0.27", features = ["serde"] }
25-
hex = "0.4.3"
26-
ipfs-api-backend-hyper = { version = "0.6", features = ["with-builder"] }
27-
petgraph = { version = "0.6", features = ["serde-1"] }
28-
reqwest = "0.12"
29-
semver = { version = "1.0", features = ["serde"] }
30-
serde = { version = "1.0", features = ["derive"] }
31-
serde_ignored = "0.1.9"
32-
serde_json = "1.0"
33-
serde_with = "3.3.0"
34-
sway-core = { version = "0.63.5", path = "../sway-core" }
35-
sway-error = { version = "0.63.5", path = "../sway-error" }
36-
sway-types = { version = "0.63.5", path = "../sway-types" }
37-
sway-utils = { version = "0.63.5", path = "../sway-utils" }
38-
tar = "0.4.38"
39-
toml = { version = "0.8", features = ["parse"] }
40-
tracing = "0.1"
41-
url = { version = "2.2", features = ["serde"] }
42-
vec1 = "1.8.0"
43-
walkdir = "2"
24+
gix-url = { workspace = true, features = ["serde"] }
25+
hex.workspace = true
26+
ipfs-api-backend-hyper = { workspace = true, features = ["with-builder"] }
27+
petgraph = { workspace = true, features = ["serde-1"] }
28+
reqwest.workspace = true
29+
semver = { workspace = true, features = ["serde"] }
30+
serde = { workspace = true, features = ["derive"] }
31+
serde_ignored.workspace = true
32+
serde_json.workspace = true
33+
serde_with.workspace = true
34+
sway-core.workspace = true
35+
sway-error.workspace = true
36+
sway-types.workspace = true
37+
sway-utils.workspace = true
38+
tar.workspace = true
39+
toml = { workspace = true, features = ["parse"] }
40+
tracing.workspace = true
41+
url = { workspace = true, features = ["serde"] }
42+
vec1.workspace = true
43+
walkdir.workspace = true
4444

4545
[dev-dependencies]
4646
regex = "^1.10.2"

‎forc-plugins/forc-client/Cargo.toml‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "forc-client"
3-
version = "0.63.5"
3+
version.workspace = true
44
description = "A `forc` plugin for interacting with a Fuel node."
55
authors.workspace = true
66
edition.workspace = true
@@ -9,45 +9,44 @@ license.workspace = true
99
repository.workspace = true
1010

1111
[dependencies]
12-
anyhow = "1"
13-
async-trait = "0.1.58"
14-
chrono = { version = "0.4", default-features = false, features = ["std"] }
15-
clap = { version = "4.5.4", features = ["derive", "env"] }
16-
devault = "0.1"
17-
dialoguer = "0.11"
18-
forc = { version = "0.63.5", path = "../../forc" }
19-
forc-pkg = { version = "0.63.5", path = "../../forc-pkg" }
20-
forc-tracing = { version = "0.63.5", path = "../../forc-tracing" }
21-
forc-tx = { version = "0.63.5", path = "../forc-tx" }
22-
forc-util = { version = "0.63.5", path = "../../forc-util" }
23-
forc-wallet = { workspace = true }
24-
fuel-abi-types = { workspace = true }
12+
anyhow.workspace = true
13+
async-trait.workspace = true
14+
chrono = { workspace = true, features = ["std"] }
15+
clap = { workspace = true, features = ["derive", "env"] }
16+
devault.workspace = true
17+
dialoguer.workspace = true
18+
forc.workspace = true
19+
forc-pkg.workspace = true
20+
forc-tracing.workspace = true
21+
forc-tx.workspace = true
22+
forc-util.workspace = true
23+
forc-wallet.workspace = true
24+
fuel-abi-types.workspace = true
2525
fuel-core-client = { workspace = true, features = ["subscriptions"] }
26-
fuel-core-types = { workspace = true }
27-
fuel-crypto = { workspace = true }
26+
fuel-core-types.workspace = true
27+
fuel-crypto.workspace = true
2828
fuel-tx = { workspace = true, features = ["test-helpers"] }
29-
fuel-vm = { workspace = true }
30-
fuels = { workspace = true }
31-
fuels-accounts = { workspace = true }
32-
fuels-core = { workspace = true }
33-
futures = "0.3"
34-
hex = "0.4.3"
35-
rand = "0.8"
36-
rpassword = "7.2"
37-
serde = "1.0"
38-
serde_json = "1"
39-
sway-core = { version = "0.63.5", path = "../../sway-core" }
40-
sway-types = { version = "0.63.5", path = "../../sway-types" }
41-
sway-utils = { version = "0.63.5", path = "../../sway-utils" }
42-
tokio = { version = "1.8", features = ["macros", "rt-multi-thread", "process"] }
43-
toml_edit = "0.21.1"
44-
tracing = "0.1"
29+
fuel-vm.workspace = true
30+
fuels.workspace = true
31+
fuels-accounts.workspace = true
32+
fuels-core.workspace = true
33+
futures.workspace = true
34+
hex.workspace = true
35+
rand.workspace = true
36+
rpassword.workspace = true
37+
serde.workspace = true
38+
serde_json.workspace = true
39+
sway-core.workspace = true
40+
sway-types.workspace = true
41+
sway-utils.workspace = true
42+
tokio = { workspace = true, features = ["macros", "process", "rt-multi-thread"] }
43+
toml_edit.workspace = true
44+
tracing.workspace = true
4545

4646
[dev-dependencies]
4747
portpicker = "0.1.1"
4848
rexpect = "0.5"
4949
tempfile = "3"
50-
toml_edit = "0.21.1"
5150

5251
[build-dependencies]
5352
regex = "1.5.4"

0 commit comments

Comments
 (0)