Skip to content

Workspace dependencies and properties #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ascjones merged 11 commits into from
Jul 25, 2023
Merged

Workspace dependencies and properties #1835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c5fffc5
Workspace properties changed in-place
pmikolajczyk41 Jul 18, 2023
226d634
Workspace dependencies changed in-place
pmikolajczyk41 Jul 18, 2023
557b6fa
, default-features = true
pmikolajczyk41 Jul 18, 2023
370d82b
pin
pmikolajczyk41 Jul 18, 2023
71c17df
ui tests
pmikolajczyk41 Jul 18, 2023
ae37585
Newline in ui-test
pmikolajczyk41 Jul 18, 2023
2d79a2f
scale
pmikolajczyk41 Jul 18, 2023
af38b3a
Remove package attribute
pmikolajczyk41 Jul 19, 2023
6df6d00
Revert "Remove package attribute"
pmikolajczyk41 Jul 19, 2023
fe27c05
Merge remote-tracking branch 'origin/master' into pmikolajczyk41/1814
pmikolajczyk41 Jul 25, 2023
4a26141
Update
pmikolajczyk41 Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
, default-features = true
  • Loading branch information
@pmikolajczyk41
pmikolajczyk41 committed Jul 18, 2023
commit 557b6faa5f8b08e5c1df6c945e2dc585421a7ab0
8 changes: 4 additions & 4 deletions crates/e2e/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ categories.workspace = true
include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]

[dependencies]
ink_e2e_macro = { workspace = true }
ink = { workspace = true }
ink_env = { workspace = true }
ink_primitives = { workspace = true }
ink_e2e_macro = { workspace = true, default-features = true }
ink = { workspace = true, default-features = true }
ink_env = { workspace = true, default-features = true }
ink_primitives = { workspace = true, default-features = true }

funty = { workspace = true }
impl-serde = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/e2e/macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ name = "ink_e2e_macro"
proc-macro = true

[dependencies]
ink_ir = { workspace = true }
ink_ir = { workspace = true, default-features = true }
cargo_metadata = { workspace = true }
contract-build = { workspace = true }
derive_more = { workspace = true }
derive_more = { workspace = true, default-features = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
serde_json = { workspace = true }
syn = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static_assertions = { workspace = true }
rlibc = "1"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ink_engine = { version = "=4.2.0", path = "../engine/", optional = true }
ink_engine = { workspace = true, default-features = true, optional = true }

# Hashes for the off-chain environment.
sha2 = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/ink/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ scale = { package = "parity-scale-codec", version = "3.4", default-features = fa
derive_more = { workspace = true, features = ["from"] }

[dev-dependencies]
ink_ir = { workspace = true }
ink_ir = { workspace = true, default-features = true }
ink_metadata = { workspace = true }

trybuild = { workspace = true, features = ["diff"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/ink/codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ either = { workspace = true }
blake2 = { workspace = true }
heck = { workspace = true }
scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] }
impl-serde = { workspace = true }
impl-serde = { workspace = true, default-features = true }

serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
Expand Down
12 changes: 6 additions & 6 deletions crates/ink/macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ proc-macro2 = { workspace = true }
quote = { workspace = true }

[dev-dependencies]
ink_env = { workspace = true }
ink = { workspace = true }
ink_metadata = { workspace = true }
ink_prelude = { workspace = true }
ink_storage = { workspace = true }
scale-info = { workspace = true }
ink_env = { workspace = true, default-features = true }
ink = { workspace = true, default-features = true }
ink_metadata = { workspace = true, default-features = true }
ink_prelude = { workspace = true, default-features = true }
ink_storage = { workspace = true, default-features = true }
scale-info = { workspace = true, features = ["derive"] }

[lib]
name = "ink_macro"
Expand Down
2 changes: 1 addition & 1 deletion crates/metadata/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ink_prelude = { workspace = true }
ink_primitives = { workspace = true }

serde = { workspace = true, features = ["derive", "alloc"] }
impl-serde = { workspace = true }
impl-serde = { workspace = true, default-features = true }
derive_more = { workspace = true, features = ["from"] }
scale-info = { workspace = true, features = ["derive", "serde", "decode", "schema"] }
schemars = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ array-init = { workspace = true }
[dev-dependencies]
quickcheck = { workspace = true }
quickcheck_macros = { workspace = true }
itertools = { workspace = true }
itertools = { workspace = true, default-features = true }

ink = { workspace = true }

Expand Down