-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
## Description For #6179, PR #6501 kept bumping into errors as it was doing too many things, so I've split that PR into multiple PRs. This is the first, and the only thing it does is move all of the various `Cargo.toml` dependencies into the single workspace `Cargo.toml`. Future PRs will: - Update dependency versions - Update code that breaks from the version bumps ## Checklist - [x] I have linked to any relevant issues. - [x] I have commented my code, particularly in hard-to-understand areas. - [x] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [x] If my change requires substantial documentation changes, I have [requested support from the DevRel team](https://github.com/FuelLabs/devrel-requests/issues/new/choose) - [x] I have added tests that prove my fix is effective or that my feature works. - [x] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [x] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [x] I have requested a review from the relevant team or maintainers.
- Loading branch information
1 parent
a0f5cf0
commit ab1e030
Showing
28 changed files
with
641 additions
and
609 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,32 +32,204 @@ exclude = [ | |
| "forc-test/test_data" | ||
| ] | ||
|
|
||
| [workspace.package] | ||
| edition = "2021" | ||
| version = "0.63.6" | ||
| authors = ["Fuel Labs <[email protected]>"] | ||
| homepage = "https://fuel.network/" | ||
| license = "Apache-2.0" | ||
| repository = "https://github.com/FuelLabs/sway" | ||
|
|
||
| [workspace.dependencies] | ||
| # | ||
| # Internal dependencies in order to propagate `workspace.version` | ||
| # | ||
|
|
||
| forc = { path = "forc/" } | ||
| forc-pkg = { path = "forc-pkg/" } | ||
| forc-test = { path = "forc-test/" } | ||
| forc-tracing = { path = "forc-tracing/" } | ||
| forc-util = { path = "forc-util/" } | ||
|
|
||
| # Forc plugins | ||
| forc-plugins = { path = "forc-plugins/" } | ||
| forc-client = { path = "forc-plugins/forc-client/" } | ||
| forc-crypto = { path = "forc-plugins/forc-crypto/" } | ||
| forc-debug = { path = "forc-plugins/forc-debug/" } | ||
| forc-doc = { path = "forc-plugins/forc-doc/" } | ||
| forc-fmt = { path = "forc-plugins/forc-fmt/" } | ||
| forc-lsp = { path = "forc-plugins/forc-lsp/" } | ||
| 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/" } | ||
| sway-utils = { path = "sway-utils/" } | ||
| swayfmt = { path = "swayfmt/" } | ||
|
|
||
| # Sway IR | ||
| sway-ir = { path = "sway-ir/" } | ||
| sway-ir-macros = { path = "sway-ir/sway-ir-macros" } | ||
|
|
||
| # | ||
| # External Fuel dependencies | ||
| # | ||
|
|
||
| # Dependencies from the `fuel-abi-types` repository: | ||
| fuel-abi-types = "0.7" | ||
|
|
||
| # Dependencies from the `fuel-core` repository: | ||
| # | ||
| # Although ALL verions are "X.Y", we need the complete semver for | ||
| # fuel-core-client as the GitHub Actions workflow parses this value to pull down | ||
| # the correct tarball | ||
| fuel-core-client = { version = "0.35.0", default-features = false } | ||
| fuel-core-types = { version = "0.35.0", default-features = false } | ||
|
|
||
| # 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" | ||
| fuel-core-types = { version = "0.35", default-features = false } | ||
|
|
||
| # Dependencies from the `fuels-rs` repository: | ||
| fuels-core = "0.66.4" | ||
| fuels-accounts = "0.66.4" | ||
| fuels = "0.66.4" | ||
| fuels = "0.66" | ||
| fuels-core = "0.66" | ||
| fuels-accounts = "0.66" | ||
|
|
||
| # Dependencies from the `fuel-vm` repository: | ||
| fuel-asm = "0.56" | ||
| fuel-crypto = "0.56" | ||
| fuel-types = "0.56" | ||
| fuel-tx = "0.56" | ||
| fuel-vm = "0.56" | ||
|
|
||
| # Dependencies from the `forc-wallet` repository: | ||
| forc-wallet = "0.9.0" | ||
| forc-wallet = "0.9" | ||
|
|
||
| # Dependencies from the `fuel-abi-types` repository: | ||
| fuel-abi-types = "0.7.0" | ||
| # | ||
| # External dependencies | ||
| # | ||
|
|
||
| [workspace.package] | ||
| edition = "2021" | ||
| authors = ["Fuel Labs <[email protected]>"] | ||
| homepage = "https://fuel.network/" | ||
| license = "Apache-2.0" | ||
| repository = "https://github.com/FuelLabs/sway" | ||
| annotate-snippets = "0.10" | ||
| ansi_term = "0.12" | ||
| anyhow = "1.0" | ||
| assert-json-diff = "2.0" | ||
| async-trait = "0.1" | ||
| atty = "0.2" | ||
| byte-unit = "5.1" | ||
| bytecount = "0.6" | ||
| bytes = "1.3" | ||
| chrono = { version = "0.4", default-features = false } | ||
| cid = "0.11" | ||
| clap = "4.5" | ||
| clap_complete = "4.5" | ||
| clap_complete_fig = "4.5" | ||
| colored = "2.0" | ||
| comrak = "0.16" | ||
| crossbeam-channel = "0.5" | ||
| dap = "0.4.1-alpha" | ||
| dashmap = "5.4" | ||
| derivative = "2.2" | ||
| devault = "0.1" | ||
| dialoguer = "0.11" | ||
| dirs = "3.0" | ||
| downcast-rs = "1.2" | ||
| either = "1.9" | ||
| ethabi = { package = "fuel-ethabi", version = "18.0" } | ||
| etk-asm = { package = "fuel-etk-asm", version = "0.3.1-dev" } | ||
| etk-ops = { package = "fuel-etk-ops", version = "0.3.1-dev" } | ||
| extension-trait = "1.0" | ||
| fd-lock = "4.0" | ||
| filecheck = "0.5" | ||
| fs_extra = "1.2" | ||
| futures = { version = "0.3", default-features = false } | ||
| gag = "1.0" | ||
| gimli = "0.28" | ||
| git2 = "0.19" | ||
| gix-url = "0.27" | ||
| glob = "0.3" | ||
| graph-cycles = "0.1" | ||
| hashbrown = "0.13" | ||
| hex = "0.4" | ||
| horrorshow = "0.8" | ||
| im = "15.0" | ||
| in_definite = "1.0" | ||
| include_dir = "0.7" | ||
| indexmap = "2.0" | ||
| indoc = "2.0" | ||
| insta = "1.39" | ||
| ipfs-api-backend-hyper = "0.6" | ||
| itertools = "0.10" | ||
| lazy_static = "1.4" | ||
| libp2p-identity = "0.2" | ||
| libtest-mimic = "0.7" | ||
| lsp-types = "0.94" | ||
| mdbook = { version = "0.4", default-features = false } | ||
| miden = "0.3" | ||
| miden-core = "0.3" | ||
| minifier = "0.3" | ||
| notify = "5.0" | ||
| notify-debouncer-mini = "0.2" | ||
| num-bigint = "0.4" | ||
| num-traits = "0.2" | ||
| object = "0.32" | ||
| once_cell = "1.18" | ||
| opener = "0.5" | ||
| parking_lot = "0.12" | ||
| paste = "1.0" | ||
| peg = "0.7" | ||
| pest = "2.1" | ||
| pest_derive = "2.1" | ||
| petgraph = "0.6" | ||
| phf = "0.10" | ||
| pretty_assertions = "1.4" | ||
| prettydiff = "0.6" | ||
| proc-macro2 = "1.0" | ||
| quote = "1.0" | ||
| rand = "0.8" | ||
| rayon = "1.7" | ||
| rayon-cond = "0.3" | ||
| regex = "1.10" | ||
| reqwest = "0.12" | ||
| revm = "2.3" | ||
| ropey = "1.5" | ||
| rpassword = "7.2" | ||
| rustc-hash = "1.1" | ||
| semver = "1.0" | ||
| serde = "1.0" | ||
| serde_ignored = "0.1" | ||
| serde_json = "1.0" | ||
| serde_with = "3.3" | ||
| serde_yaml = "0.9" | ||
| serial_test = "3.0" | ||
| sha2 = "0.9" | ||
| sha3 = "0.10" | ||
| shellfish = "0.6" | ||
| slotmap = "1.0" | ||
| smallvec = "1.7" | ||
| strsim = "0.11" | ||
| strum = "0.24" | ||
| syn = "1.0" | ||
| taplo = "0.7" | ||
| tar = "0.4" | ||
| tempfile = "3" | ||
| term-table = "1.3" | ||
| termion = "2.0" | ||
| textwrap = "0.16" | ||
| thiserror = "1.0" | ||
| tikv-jemallocator = "0.5" | ||
| tokio = "1.12" | ||
| toml = "0.8" | ||
| toml_edit = "0.21" | ||
| tower = { version = "0.4", default-features = false } | ||
| tower-lsp = "0.20" | ||
| tracing = "0.1" | ||
| tracing-subscriber = "0.3" | ||
| uint = "0.9" | ||
| unicode-bidi = "0.3" | ||
| unicode-xid = "0.2" | ||
| url = "2.2" | ||
| urlencoding = "2.1" | ||
| uwuify = "^0.2" | ||
| vec1 = "1.8" | ||
| vte = "0.13" | ||
| walkdir = "2.3" | ||
| whoami = "1.1" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.