Skip to content

Commit

Permalink
Update all Cargo.toml files to point to shared workspace version
Browse files Browse the repository at this point in the history
  • Loading branch information
alfiedotwtf committed Sep 5, 2024
1 parent 8f3e608 commit cebbd88
Show file tree
Hide file tree
Showing 24 changed files with 160 additions and 109 deletions.
38 changes: 38 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,44 @@ 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-core` repository:
fuel-core-client = { version = "0.32.1", default-features = false }
fuel-core-types = { version = "0.32.1", default-features = false }
Expand Down
14 changes: 7 additions & 7 deletions forc-pkg/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-pkg"
version = "0.63.3"
version.workspace = true
description = "Building, locking, fetching and updating Sway projects as Forc packages."
authors.workspace = true
edition.workspace = true
Expand All @@ -13,8 +13,8 @@ ansi_term = "0.12"
anyhow = "1"
byte-unit = "5.1.4"
cid = "0.11"
forc-tracing = { version = "0.63.3", path = "../forc-tracing" }
forc-util = { version = "0.63.3", path = "../forc-util" }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
fuel-abi-types = { workspace = true }
futures = "0.3"
git2 = { version = "0.19", features = [
Expand All @@ -31,10 +31,10 @@ 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.3", path = "../sway-core" }
sway-error = { version = "0.63.3", path = "../sway-error" }
sway-types = { version = "0.63.3", path = "../sway-types" }
sway-utils = { version = "0.63.3", path = "../sway-utils" }
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"
Expand Down
18 changes: 9 additions & 9 deletions forc-plugins/forc-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-client"
version = "0.63.3"
version.workspace = true
description = "A `forc` plugin for interacting with a Fuel node."
authors.workspace = true
edition.workspace = true
Expand All @@ -15,11 +15,11 @@ 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.3", path = "../../forc" }
forc-pkg = { version = "0.63.3", path = "../../forc-pkg" }
forc-tracing = { version = "0.63.3", path = "../../forc-tracing" }
forc-tx = { version = "0.63.3", path = "../forc-tx" }
forc-util = { version = "0.63.3", path = "../../forc-util" }
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"] }
Expand All @@ -36,9 +36,9 @@ rand = "0.8"
rpassword = "7.2"
serde = "1.0"
serde_json = "1"
sway-core = { version = "0.63.3", path = "../../sway-core" }
sway-types = { version = "0.63.3", path = "../../sway-types" }
sway-utils = { version = "0.63.3", path = "../../sway-utils" }
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"
Expand Down
13 changes: 13 additions & 0 deletions forc-plugins/forc-client/test/data/standalone_contract/Forc.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[[package]]
name = "core"
source = "path+from-root-79BB3EA8498403DE"

[[package]]
name = "standalone_contract"
source = "member"
dependencies = ["std"]

[[package]]
name = "std"
source = "path+from-root-79BB3EA8498403DE"
dependencies = ["core"]
6 changes: 3 additions & 3 deletions forc-plugins/forc-crypto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-crypto"
version = "0.63.3"
version.workspace = true
description = "A `forc` plugin for handling various cryptographic operations and conversions."
authors.workspace = true
edition.workspace = true
Expand All @@ -13,8 +13,8 @@ anyhow = "1.0.75"
async-trait = "0.1.58"
atty = "0.2.14"
clap = { version = "4.5.4", features = ["derive", "env"] }
forc-tracing = { version = "0.63.3", path = "../../forc-tracing" }
forc-util = { version = "0.63.3", path = "../../forc-util" }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
fuel-core-types = { workspace = true }
fuel-crypto = { workspace = true, features = ["random"] }
fuels-core = { workspace = true }
Expand Down
12 changes: 6 additions & 6 deletions forc-plugins/forc-debug/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-debug"
version = "0.63.3"
version.workspace = true
description = "Supports debugging Sway code via CLI and DAP server."
authors.workspace = true
edition.workspace = true
Expand All @@ -12,18 +12,18 @@ repository.workspace = true
anyhow = "1.0" # Used by the examples and for conversion only
clap = { version = "4.5.4", features = ["derive", "env"] }
dap = "0.4.1-alpha1"
forc-pkg = { version = "0.63.3", path = "../../forc-pkg" }
forc-test = { version = "0.63.3", path = "../../forc-test" }
forc-tracing = { version = "0.63.3", path = "../../forc-tracing" }
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"] }
sway-core = { version = "0.63.3", path = "../../sway-core" }
sway-types = { version = "0.63.3", path = "../../sway-types" }
sway-core = { workspace = true }
sway-types = { workspace = true }
thiserror = "1.0"
tokio = { version = "1.8", features = [
"net",
Expand Down
18 changes: 9 additions & 9 deletions forc-plugins/forc-doc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-doc"
version = "0.63.3"
version.workspace = true
description = "Build the documentation for the local package and all dependencies. The output is placed in `out/doc` in the same format as the project."
authors.workspace = true
edition.workspace = true
Expand All @@ -12,20 +12,20 @@ repository.workspace = true
anyhow = "1.0.65"
clap = { version = "4.5.4", features = ["derive"] }
comrak = "0.16"
forc-pkg = { version = "0.63.3", path = "../../forc-pkg" }
forc-tracing = { version = "0.63.3", path = "../../forc-tracing" }
forc-util = { version = "0.63.3", path = "../../forc-util" }
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"
sway-ast = { version = "0.63.3", path = "../../sway-ast" }
sway-core = { version = "0.63.3", path = "../../sway-core" }
sway-lsp = { version = "0.63.3", path = "../../sway-lsp" }
sway-types = { version = "0.63.3", path = "../../sway-types" }
swayfmt = { version = "0.63.3", path = "../../swayfmt" }
sway-ast = { workspace = true }
sway-core = { workspace = true }
sway-lsp = { workspace = true }
sway-types = { workspace = true }
swayfmt = { workspace = true }

[dev-dependencies]
dir_indexer = "0.0.2"
Expand Down
14 changes: 7 additions & 7 deletions forc-plugins/forc-fmt/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-fmt"
version = "0.63.3"
version.workspace = true
description = "A `forc` plugin for running the Sway code formatter."
authors.workspace = true
edition.workspace = true
Expand All @@ -11,12 +11,12 @@ repository.workspace = true
[dependencies]
anyhow = "1"
clap = { version = "4.5.4", features = ["derive"] }
forc-pkg = { version = "0.63.3", path = "../../forc-pkg" }
forc-tracing = { version = "0.63.3", path = "../../forc-tracing" }
forc-util = { version = "0.63.3", path = "../../forc-util" }
forc-pkg = { workspace = true }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
prettydiff = "0.5"
sway-core = { version = "0.63.3", path = "../../sway-core" }
sway-utils = { version = "0.63.3", path = "../../sway-utils" }
swayfmt = { version = "0.63.3", path = "../../swayfmt" }
sway-core = { workspace = true }
sway-utils = { workspace = true }
swayfmt = { workspace = true }
taplo = "0.7"
tracing = "0.1"
4 changes: 2 additions & 2 deletions forc-plugins/forc-lsp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-lsp"
version = "0.63.3"
version.workspace = true
description = "A simple `forc` plugin for starting the sway language server."
authors.workspace = true
edition.workspace = true
Expand All @@ -11,6 +11,6 @@ repository.workspace = true
[dependencies]
anyhow = "1"
clap = { version = "4.5.4", features = ["derive"] }
sway-lsp = { version = "0.63.3", path = "../../sway-lsp" }
sway-lsp = { workspace = true }
tikv-jemallocator = "0.5"
tokio = { version = "1.8" }
4 changes: 2 additions & 2 deletions forc-plugins/forc-tx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-tx"
version = "0.63.3"
version.workspace = true
description = "A `forc` plugin for constructing transactions."
authors.workspace = true
edition.workspace = true
Expand All @@ -19,7 +19,7 @@ path = "src/main.rs"
anyhow = "1"
clap = { version = "4.5.4", features = ["derive", "env"] }
devault = "0.1"
forc-util = { version = "0.63.3", path = "../../forc-util" }
forc-util = { workspace = true }
fuel-tx = { workspace = true, features = ["serde", "test-helpers", "random"] }
fuel-types = { workspace = true, features = ["serde"] }
serde = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions forc-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-test"
version = "0.63.3"
version.workspace = true
description = "A library for building and running Sway unit tests within Forc packages."
authors.workspace = true
edition.workspace = true
Expand All @@ -10,12 +10,12 @@ repository.workspace = true

[dependencies]
anyhow = "1"
forc-pkg = { version = "0.63.3", path = "../forc-pkg" }
forc-pkg = { workspace = true }
fuel-abi-types = { workspace = true }
fuel-tx = { workspace = true, features = ["test-helpers"] }
fuel-vm = { workspace = true, features = ["random", "test-helpers"] }
fuels-core = { workspace = true }
rand = "0.8"
rayon = "1.7.0"
sway-core = { version = "0.63.3", path = "../sway-core" }
sway-types = { version = "0.63.3", path = "../sway-types" }
sway-core = { workspace = true }
sway-types = { workspace = true }
2 changes: 1 addition & 1 deletion forc-tracing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-tracing"
version = "0.63.3"
version.workspace = true
description = "Tracing utility shared between forc crates."
authors.workspace = true
edition.workspace = true
Expand Down
12 changes: 6 additions & 6 deletions forc-util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc-util"
version = "0.63.3"
version.workspace = true
description = "Utility items shared between forc crates."
authors.workspace = true
edition.workspace = true
Expand All @@ -15,18 +15,18 @@ anyhow = "1"
clap = { version = "4.5.4", features = ["cargo", "derive", "env"] }
dirs = "3.0.2"
fd-lock = "4.0"
forc-tracing = { version = "0.63.3", path = "../forc-tracing" }
forc-tracing = { workspace = true }
fuel-tx = { workspace = true, features = ["serde"], optional = true }
hex = "0.4.3"
paste = "1.0.14"
regex = "1.10.2"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.73"
serial_test = "3.0.0"
sway-core = { version = "0.63.3", path = "../sway-core" }
sway-error = { version = "0.63.3", path = "../sway-error" }
sway-types = { version = "0.63.3", path = "../sway-types" }
sway-utils = { version = "0.63.3", path = "../sway-utils" }
sway-core = { workspace = true }
sway-error = { workspace = true }
sway-types = { workspace = true }
sway-utils = { workspace = true }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = [
"ansi",
Expand Down
20 changes: 10 additions & 10 deletions forc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "forc"
version = "0.63.3"
version.workspace = true
description = "Fuel Orchestrator."
authors.workspace = true
edition.workspace = true
Expand All @@ -23,20 +23,20 @@ anyhow = "1.0.41"
clap = { version = "4.5.4", features = ["cargo", "derive", "env"] }
clap_complete = "4.5.2"
clap_complete_fig = "4.5.0"
forc-pkg = { version = "0.63.3", path = "../forc-pkg" }
forc-test = { version = "0.63.3", path = "../forc-test" }
forc-tracing = { version = "0.63.3", path = "../forc-tracing" }
forc-util = { version = "0.63.3", path = "../forc-util" }
forc-pkg = { workspace = true }
forc-test = { workspace = true }
forc-tracing = { workspace = true }
forc-util = { workspace = true }
fs_extra = "1.2"
fuel-asm = { workspace = true }
hex = "0.4.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.73"
sway-core = { version = "0.63.3", path = "../sway-core" }
sway-error = { version = "0.63.3", path = "../sway-error" }
sway-ir = { version = "0.63.3", path = "../sway-ir" }
sway-types = { version = "0.63.3", path = "../sway-types" }
sway-utils = { version = "0.63.3", path = "../sway-utils" }
sway-core = { workspace = true }
sway-error = { workspace = true }
sway-ir = { workspace = true }
sway-types = { workspace = true }
sway-utils = { workspace = true }
term-table = "1.3"
tokio = { version = "1.8.0", features = ["macros", "rt-multi-thread"] }
toml = { version = "0.7", features = ["parse"] }
Expand Down
6 changes: 3 additions & 3 deletions sway-ast/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sway-ast"
version = "0.63.3"
version.workspace = true
description = "Sway's AST"
authors.workspace = true
edition.workspace = true
Expand All @@ -13,8 +13,8 @@ extension-trait = "1.0.1"
num-bigint = { version = "0.4.3", features = ["serde"] }
num-traits = "0.2.14"
serde = { version = "1.0", features = ["derive"] }
sway-error = { version = "0.63.3", path = "../sway-error" }
sway-types = { version = "0.63.3", path = "../sway-types" }
sway-error = { workspace = true }
sway-types = { workspace = true }

[lints.clippy]
iter_over_hash_type = "deny"
Loading

0 comments on commit cebbd88

Please sign in to comment.