From c4f6fa53e6540494558ba31be47d9913a4ce7900 Mon Sep 17 00:00:00 2001 From: xgreenx Date: Sun, 28 Nov 2021 13:05:56 +0200 Subject: [PATCH 1/3] Remove workspace --- examples/delegator/Cargo.toml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml index 94a02afccd0..38bd5e619a7 100644 --- a/examples/delegator/Cargo.toml +++ b/examples/delegator/Cargo.toml @@ -12,11 +12,11 @@ ink_storage = { version = "3.0.0-rc7", path = "../../crates/storage", default-fe ink_lang = { version = "3.0.0-rc7", path = "../../crates/lang", default-features = false } scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } +scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } adder = { version = "3.0.0-rc7", path = "adder", default-features = false, features = ["ink-as-dependency"] } subber = { version = "3.0.0-rc7", path = "subber", default-features = false, features = ["ink-as-dependency"] } accumulator = { version = "3.0.0-rc7", path = "accumulator", default-features = false, features = ["ink-as-dependency"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } [lib] name = "delegator" @@ -41,10 +41,3 @@ std = [ "accumulator/std", ] ink-as-dependency = [] - -[workspace] -members = [ - "accumulator", - "adder", - "subber", -] From e38b071daa768687b8b5114de5b62b3d16e20514 Mon Sep 17 00:00:00 2001 From: xgreenx Date: Sun, 28 Nov 2021 14:47:21 +0200 Subject: [PATCH 2/3] Maybe that will fix CI --- examples/delegator/adder/Cargo.toml | 4 +++- examples/delegator/subber/Cargo.toml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/delegator/adder/Cargo.toml b/examples/delegator/adder/Cargo.toml index 57c16fc846b..eaa7f88da6a 100644 --- a/examples/delegator/adder/Cargo.toml +++ b/examples/delegator/adder/Cargo.toml @@ -41,4 +41,6 @@ std = [ "accumulator/std", ] -ink-as-dependency = [] +ink-as-dependency = [ + "accumulator/ink-as-dependency", +] diff --git a/examples/delegator/subber/Cargo.toml b/examples/delegator/subber/Cargo.toml index e00913c4b3b..f237c6fb13c 100644 --- a/examples/delegator/subber/Cargo.toml +++ b/examples/delegator/subber/Cargo.toml @@ -41,4 +41,6 @@ std = [ "accumulator/std", ] -ink-as-dependency = [] +ink-as-dependency = [ + "accumulator/ink-as-dependency", +] From 6f0071f51f793f27fb6ea646696ac615a3bcb6c3 Mon Sep 17 00:00:00 2001 From: xgreenx Date: Mon, 29 Nov 2021 19:20:36 +0200 Subject: [PATCH 3/3] Return back `workspace` to test the change in `cargo-contract` --- examples/delegator/Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml index 38bd5e619a7..66873f44a84 100644 --- a/examples/delegator/Cargo.toml +++ b/examples/delegator/Cargo.toml @@ -41,3 +41,11 @@ std = [ "accumulator/std", ] ink-as-dependency = [] + +[workspace] +members = [ + "accumulator", + "adder", + "subber", +] +