Move dependencies to the workspace Cargo.toml and version bump (#6179)

Cargo.toml

@@ -32,32 +32,202 @@ exclude = [
     "forc-test/test_data"
 ]
 
+[workspace.package]
+edition = "2021"
+version = "0.63.5"
+authors = ["Fuel Labs <contact@fuel.sh>"]
+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.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
+#
 
-[workspace.package]
-edition = "2021"
-authors = ["Fuel Labs <contact@fuel.sh>"]
-homepage = "https://fuel.network/"
-license = "Apache-2.0"
-repository = "https://github.com/FuelLabs/sway"
+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 }
+cid = "0.11"
+clap = "4.5.4"
+clap_complete = "4.5.2"
+clap_complete_fig = "4.5.0"
+colored = "2.0.0"
+comrak = "0.28.0"
+crossbeam-channel = "0.5"
+dap = "0.4.1-alpha1"
+dashmap = "6.1.0"
+derivative = "2.2.0"
+devault = "0.2.0"
+dialoguer = "0.11"
+dirs = "5.0.1"
+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" }
+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 }
+gag = "1.0"
+gimli = "0.31.0"
+git2 = "0.19"
+gix-url = "0.27"
+glob = "0.3.1"
+graph-cycles = "0.1.0"
+hashbrown = "0.14.5"
+hex = "0.4.3"
+horrorshow = "0.8.4"
+im = "15.0"
+in_definite = "1.0.0"
+include_dir = "0.7.3"
+indexmap = "2.0.0"
+indoc = "2.0"
+insta = "1.39.0"
+ipfs-api-backend-hyper = "0.6"
+itertools = "0.13.0"
+lazy_static = "1.4"
+libp2p-identity = "0.2.4"
+libtest-mimic = "0.7.3"
+lsp-types = "0.94"
+mdbook = { version = "0.4", default-features = false }
+miden = "0.3.0"
+miden-core = "0.10.5"
+minifier = "0.3.0"
+notify = "6.1.1"
+notify-debouncer-mini = "0.4.1"
+num-bigint = "0.4.3"
+num-traits = "0.2.16"
+object = "0.36.4"
+once_cell = "1.18.0"
+opener = "0.7.2"
+parking_lot = "0.12.1"
+paste = "1.0.14"
+peg = "0.8.4"
+pest = "2.1.3"
+pest_derive = "2.1"
+petgraph = "0.6"
+phf = "0.11.2"
+pretty_assertions = "1.4.0"
+prettydiff = "0.7.0"
+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 = "14.0.1"
+ropey = "1.5"
+rpassword = "7.2"
+rustc-hash = "2.0.0"
+semver = "1.0"
+serde = "1.0"
+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 = "0.9.0"
+slotmap = "1.0.7"
+smallvec = "1.7"
+strsim = "0.11.1"
+strum = "0.26.3"
+syn = "2.0.77"
+tai64 = "4.0"
+taplo = "0.13.2"
+tar = "0.4.38"
+tempfile = "3"
+term-table = "1.3"
+termion = "4.0.2"
+textwrap = "0.16.0"
+thiserror = "1.0.30"
+tikv-jemallocator = "0.6.0"
+tokio = "1.12"
+toml = "0.8"
+toml_edit = "0.22.20"
+tower = { version = "0.5.1", default-features = false }
+tower-lsp = "0.20"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+uint = "0.9"
+unicode-bidi = "0.3.13"
+unicode-xid = "0.2.2"
+url = "2.2"
+urlencoding = "2.1.2"
+uwuify = "^0.2"
+vec1 = "1.8.0"
+vte = "0.13.0"
+walkdir = "2.3.3"
+whoami = "1.1"

forc-pkg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "forc-pkg"
-version = "0.63.5"
+version.workspace = true
 description = "Building, locking, fetching and updating Sway projects as Forc packages."
 authors.workspace = true
 edition.workspace = true
@@ -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"
-forc-tracing = { version = "0.63.5", path = "../forc-tracing" }
-forc-util = { version = "0.63.5", path = "../forc-util" }
-fuel-abi-types = { workspace = true }
-futures = "0.3"
-git2 = { version = "0.19", features = [
+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.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"
-sway-core = { version = "0.63.5", path = "../sway-core" }
-sway-error = { version = "0.63.5", path = "../sway-error" }
-sway-types = { version = "0.63.5", path = "../sway-types" }
-sway-utils = { version = "0.63.5", path = "../sway-utils" }
-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"
+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.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.31.4"

forc-plugins/forc-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "forc-client"
-version = "0.63.5"
+version.workspace = true
 description = "A `forc` plugin for interacting with a Fuel node."
 authors.workspace = true
 edition.workspace = true
@@ -9,45 +9,45 @@ 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"
-forc = { version = "0.63.5", path = "../../forc" }
-forc-pkg = { version = "0.63.5", path = "../../forc-pkg" }
-forc-tracing = { version = "0.63.5", path = "../../forc-tracing" }
-forc-tx = { version = "0.63.5", path = "../forc-tx" }
-forc-util = { version = "0.63.5", path = "../../forc-util" }
-forc-wallet = { workspace = true }
-fuel-abi-types = { workspace = true }
+anyhow.workspace = true
+async-trait.workspace = true
+chrono = { workspace = true, 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
+forc-tx.workspace = true
+forc-util.workspace = true
+forc-wallet.workspace = true
+fuel-abi-types.workspace = true
 fuel-core-client = { workspace = true, features = ["subscriptions"] }
-fuel-core-types = { workspace = true }
-fuel-crypto = { workspace = true }
+fuel-core-types.workspace = true
+fuel-crypto.workspace = true
 fuel-tx = { workspace = true, features = ["test-helpers"] }
-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"
-sway-core = { version = "0.63.5", path = "../../sway-core" }
-sway-types = { version = "0.63.5", path = "../../sway-types" }
-sway-utils = { version = "0.63.5", path = "../../sway-utils" }
-tokio = { version = "1.8", features = ["macros", "rt-multi-thread", "process"] }
-toml_edit = "0.21.1"
-tracing = "0.1"
+fuel-vm.workspace = true
+fuels.workspace = true
+fuels-accounts.workspace = true
+fuels-core.workspace = true
+futures.workspace = true
+hex.workspace = true
+rand.workspace = true
+rpassword.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sway-core.workspace = true
+sway-types.workspace = true
+sway-utils.workspace = true
+tokio = { workspace = true, features = ["macros", "process", "rt-multi-thread"] }
+toml_edit.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 portpicker = "0.1.1"
 rexpect = "0.5"
 tempfile = "3"
-toml_edit = "0.21.1"
+toml_edit = "0.22.20"
 
 [build-dependencies]
 regex = "1.5.4"