Skip to content

Commit

Permalink
Move all external dependencies to the workspace (#6179)
Browse files Browse the repository at this point in the history
  • Loading branch information
alfiedotwtf committed Sep 9, 2024
1 parent a3f8ded commit 6ff4130
Show file tree
Hide file tree
Showing 28 changed files with 449 additions and 460 deletions.
201 changes: 30 additions & 171 deletions Cargo.lock

Large diffs are not rendered by default.

146 changes: 138 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ forc-tx = { path = "forc-plugins/forc-tx/" }
sway-ast = { path = "sway-ast/" }
sway-core = { path = "sway-core/" }
sway-error = { path = "sway-error/" }

sway-lsp = { path = "sway-lsp/" }
sway-parse = { path = "sway-parse/" }
sway-types = { path = "sway-types/" }
Expand All @@ -79,25 +78,156 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros" }
# External Fuel dependencies
#

# Dependencies from the `fuel-abi-types` repository:
fuel-abi-types = "0.7.0"

# Dependencies from the `fuel-core` repository:
fuel-core-client = { version = "0.35.0", default-features = false }
fuel-core-types = { version = "0.35.0", default-features = false }

# Dependencies from the `fuels-rs` repository:
fuels = "0.66.4"
fuels-core = "0.66.4"
fuels-accounts = "0.66.4"

# Dependencies from the `fuel-vm` repository:
fuel-asm = "0.56.0"
fuel-crypto = "0.56.0"
fuel-types = "0.56.0"
fuel-tx = "0.56.0"
fuel-vm = "0.56.0"

# Dependencies from the `fuels-rs` repository:
fuels-core = "0.66.4"
fuels-accounts = "0.66.4"
fuels = "0.66.4"

# Dependencies from the `forc-wallet` repository:
forc-wallet = "0.9.0"

# Dependencies from the `fuel-abi-types` repository:
fuel-abi-types = "0.7.0"
#
# External dependencies
#

annotate-snippets = "0.10.1"
ansi_term = "0.12"
anyhow = "1.0.75"
assert_matches = "1.5.0"
assert-json-diff = "2.0"
async-trait = "0.1.58"
atty = "0.2.14"
byte-unit = "5.1.4"
bytecount = "0.6"
bytes = "1.3.0"
chrono = { version = "0.4", default-features = false, features = ["std"] }
cid = "0.11"
clap = { version = "4.5.4", features = ["cargo", "derive", "env"] }
clap_complete = "4.5.2"
clap_complete_fig = "4.5.0"
colored = "2.0.0"
comrak = "0.16"
crossbeam-channel = "0.5"
dap = "0.4.1-alpha1"
dashmap = "5.4"
derivative = "2.2.0"
devault = "0.1"
dialoguer = "0.11"
dirs = "3.0.2"
downcast-rs = "1.2.0"
either = "1.9.0"
ethabi = { package = "fuel-ethabi", version = "18.0.0" }
etk-asm = { package = "fuel-etk-asm", version = "0.3.1-dev", features = [ "backtraces" ] }
etk-ops = { package = "fuel-etk-ops", version = "0.3.1-dev" }
extension-trait = "1.0.1"
fd-lock = "4.0"
filecheck = "0.5"
fs_extra = "1.2"
futures = { version = "0.3.24", default-features = false, features = ["std", "async-await"] }
gag = "1.0"
gimli = "0.28.1"
git2 = { version = "0.19", features = ["vendored-libgit2", "vendored-openssl" ] }
gix-url = { version = "0.27", features = ["serde"] }
glob = "0.3.1"
graph-cycles = "0.1.0"
hashbrown = "0.13.1"
hex = "0.4.3"
horrorshow = "0.8.4"
im = "15.0"
in_definite = "1.0.0"
include_dir = "0.7.3"
indexmap = { version = "2.0.0", features = ["rayon"] }
indoc = "2.0"
insta = "1.39.0"
ipfs-api-backend-hyper = { version = "0.6", features = ["with-builder"] }
itertools = "0.10.3"
lazy_static = "1.4"
libp2p-identity = { version = "0.2.4", features = ["secp256k1", "peerid"] }
libtest-mimic = "0.7.3"
lsp-types = { version = "0.94", features = ["proposed"] }
mdbook = { version = "0.4", default-features = false }
miden = "0.3.0"
miden-core = "0.3.0"
minifier = "0.3.0"
notify = "5.0.0"
notify-debouncer-mini = "0.2.0"
num-bigint = { version = "0.4.3", features = ["serde"] }
num-traits = "0.2.16"
object = { version = "0.32.2", features = ["write"] }
once_cell = "1.18.0"
opener = "0.5.0"
parking_lot = "0.12.1"
paste = "1.0.14"
peg = "0.7"
pest = "2.1.3"
pest_derive = "2.1"
petgraph = { version = "0.6", features = ["serde-1"] }
phf = { version = "0.10.1", features = ["macros"] }
pretty_assertions = "1.4.0"
prettydiff = "0.6.4"
proc-macro2 = "1.0.5"
quote = "1.0.21"
rand = "0.8"
rayon = "1.7.0"
rayon-cond = "0.3"
regex = "1.10.2"
reqwest = "0.12"
revm = "2.3.1"
ropey = "1.5"
rpassword = "7.2"
rustc-hash = "1.1.0"
semver = { version = "1.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_ignored = "0.1.9"
serde_json = "1.0.91"
serde_with = "3.3.0"
serde_yaml = "0.9.27"
serial_test = "3.0.0"
sha2 = "0.10"
sha3 = "0.10.8"
shellfish = { version = "0.6.0", features = ["rustyline", "async", "tokio"] }
slotmap = "1.0.7"
smallvec = "1.7"
strsim = "0.11.1"
strum = { version = "0.24.1", features = ["derive"] }
syn = { version = "1.0.99", features = ["derive", "extra-traits", "full" ] }
tai64 = { version = "4.0", features = ["serde"] }
taplo = "0.7"
tar = "0.4.38"
tempfile = "3"
term-table = "1.3"
termion = "2.0.1"
textwrap = "0.16.0"
thiserror = "1.0.30"
tikv-jemallocator = "0.5"
tokio = { version = "1.12", features = [ "fs", "io-std", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "sync", "time"] }
toml = { version = "0.8", features = ["parse"] }
toml_edit = "0.21.1"
tower = { version = "0.4.12", default-features = false, features = ["util"] }
tower-lsp = { version = "0.20", features = ["proposed"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = [ "ansi", "env-filter", "json" ] }
uint = "0.9"
unicode-bidi = "0.3.13"
unicode-xid = "0.2.2"
url = { version = "2.2", features = ["serde"] }
urlencoding = "2.1.2"
uwuify = "^0.2"
vec1 = "1.8.0"
vte = "0.13.0"
walkdir = "2.3.3"
whoami = "1.1"
46 changes: 23 additions & 23 deletions forc-pkg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@ license.workspace = true
repository.workspace = true

[dependencies]
ansi_term = "0.12"
anyhow = "1"
byte-unit = "5.1.4"
cid = "0.11"
ansi_term.workspace = true
anyhow.workspace = true
byte-unit.workspace = true
cid.workspace = true
forc-tracing = { workspace = true }
forc-util = { workspace = true }
fuel-abi-types = { workspace = true }
futures = "0.3"
git2 = { version = "0.19", features = [
futures.workspace = true
git2 = { workspace = true, features = [
"vendored-libgit2",
"vendored-openssl",
] }
gix-url = { version = "0.27", features = ["serde"] }
hex = "0.4.3"
ipfs-api-backend-hyper = { version = "0.6", features = ["with-builder"] }
petgraph = { version = "0.6", features = ["serde-1"] }
reqwest = "0.12"
semver = { version = "1.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_ignored = "0.1.9"
serde_json = "1.0"
serde_with = "3.3.0"
gix-url = { workspace = true, features = ["serde"] }
hex.workspace = true
ipfs-api-backend-hyper = { workspace = true, features = ["with-builder"] }
petgraph = { workspace = true, features = ["serde-1"] }
reqwest.workspace = true
semver = { workspace = true, features = ["serde"] }
serde = { workspace = true, features = ["derive"] }
serde_ignored.workspace = true
serde_json.workspace = true
serde_with.workspace = true
sway-core = { workspace = true }
sway-error = { workspace = true }
sway-types = { workspace = true }
sway-utils = { workspace = true }
tar = "0.4.38"
toml = { version = "0.8", features = ["parse"] }
tracing = "0.1"
url = { version = "2.2", features = ["serde"] }
vec1 = "1.8.0"
walkdir = "2"
tar.workspace = true
toml = { workspace = true, features = ["parse"] }
tracing.workspace = true
url = { workspace = true, features = ["serde"] }
vec1.workspace = true
walkdir.workspace = true

[dev-dependencies]
regex = "^1.10.2"

[target.'cfg(not(target_os = "macos"))'.dependencies]
sysinfo = "0.29"
sysinfo = "0.29.0"
30 changes: 15 additions & 15 deletions forc-plugins/forc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ license.workspace = true
repository.workspace = true

[dependencies]
anyhow = "1"
async-trait = "0.1.58"
chrono = { version = "0.4", default-features = false, features = ["std"] }
clap = { version = "4.5.4", features = ["derive", "env"] }
devault = "0.1"
dialoguer = "0.11"
anyhow.workspace = true
async-trait.workspace = true
chrono = { workspace = true, default-features = false, features = ["std"] }
clap = { workspace = true, features = ["derive", "env"] }
devault.workspace = true
dialoguer.workspace = true
forc = { workspace = true }
forc-pkg = { workspace = true }
forc-tracing = { workspace = true }
Expand All @@ -30,18 +30,18 @@ fuel-vm = { workspace = true }
fuels = { workspace = true }
fuels-accounts = { workspace = true }
fuels-core = { workspace = true }
futures = "0.3"
hex = "0.4.3"
rand = "0.8"
rpassword = "7.2"
serde = "1.0"
serde_json = "1"
futures.workspace = true
hex.workspace = true
rand.workspace = true
rpassword.workspace = true
serde_json.workspace = true
serde.workspace = true
sway-core = { workspace = true }
sway-types = { workspace = true }
sway-utils = { workspace = true }
tokio = { version = "1.8", features = ["macros", "rt-multi-thread", "process"] }
toml_edit = "0.21.1"
tracing = "0.1"
tokio = { workspace = true, features = ["macros", "process", "rt-multi-thread"] }
toml_edit.workspace = true
tracing.workspace = true

[dev-dependencies]
portpicker = "0.1.1"
Expand Down
30 changes: 15 additions & 15 deletions forc-plugins/forc-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ license.workspace = true
repository.workspace = true

[dependencies]
anyhow = "1.0.75"
async-trait = "0.1.58"
atty = "0.2.14"
clap = { version = "4.5.4", features = ["derive", "env"] }
anyhow.workspace = true
async-trait.workspace = true
atty.workspace = true
clap = { workspace = true, features = ["derive", "env"] }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
fuel-core-types = { workspace = true }
fuel-crypto = { workspace = true, features = ["random"] }
fuels-core = { workspace = true }
futures = "0.3"
hex = "0.4.3"
libp2p-identity = { version = "0.2.4", features = ["secp256k1", "peerid"] }
rand = "0.8"
serde = "1.0"
serde_json = "1"
serde_yaml = "0.9.27"
sha3 = "0.10.8"
termion = "2.0.1"
tokio = { version = "1.8", features = ["macros", "rt-multi-thread", "process"] }
tracing = "0.1"
futures.workspace = true
hex.workspace = true
libp2p-identity = { workspace = true, features = ["peerid", "secp256k1"] }
rand.workspace = true
serde_json.workspace = true
serde_yaml.workspace = true
serde.workspace = true
sha3.workspace = true
termion.workspace = true
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "process"] }
tracing.workspace = true
20 changes: 10 additions & 10 deletions forc-plugins/forc-debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ license.workspace = true
repository.workspace = true

[dependencies]
anyhow = "1.0" # Used by the examples and for conversion only
clap = { version = "4.5.4", features = ["derive", "env"] }
dap = "0.4.1-alpha1"
anyhow.workspace = true
clap = { workspace = true, features = ["derive", "env"] }
dap.workspace = true
forc-pkg = { workspace = true }
forc-test = { workspace = true }
forc-tracing = { workspace = true }
fuel-core-client = { workspace = true }
fuel-types = { workspace = true, features = ["serde"] }
fuel-vm = { workspace = true, features = ["serde"] }
rayon = "1.7.0"
serde = "1.0"
serde_json = "1.0"
shellfish = { version = "0.6.0", features = ["rustyline", "async", "tokio"] }
rayon.workspace = true
serde_json.workspace = true
serde.workspace = true
shellfish = { workspace = true, features = ["async", "rustyline", "tokio"] }
sway-core = { workspace = true }
sway-types = { workspace = true }
thiserror = "1.0"
tokio = { version = "1.8", features = [
"net",
thiserror.workspace = true
tokio = { workspace = true, features = [
"io-util",
"macros",
"net",
"rt-multi-thread",
] }

Expand Down
18 changes: 9 additions & 9 deletions forc-plugins/forc-doc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ license.workspace = true
repository.workspace = true

[dependencies]
anyhow = "1.0.65"
clap = { version = "4.5.4", features = ["derive"] }
comrak = "0.16"
anyhow.workspace = true
clap = { workspace = true, features = ["derive"] }
comrak.workspace = true
forc-pkg = { workspace = true }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
horrorshow = "0.8.4"
include_dir = "0.7.3"
minifier = "0.3.0"
opener = "0.5.0"
serde = "1.0"
serde_json = "1.0"
horrorshow.workspace = true
include_dir.workspace = true
minifier.workspace = true
opener.workspace = true
serde_json.workspace = true
serde.workspace = true
sway-ast = { workspace = true }
sway-core = { workspace = true }
sway-lsp = { workspace = true }
Expand Down
Loading

0 comments on commit 6ff4130

Please sign in to comment.