From 2133df64b237672a76255fecf82b1c5fe404dcb1 Mon Sep 17 00:00:00 2001 From: Artem Medvedev Date: Tue, 28 Nov 2023 00:00:40 +0100 Subject: [PATCH 1/4] chore: change versioning --- Cargo.toml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7b91c1b..6cf75e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,10 @@ repository = "https://github.com/DDtKey/protect-endpoints" authors = ["DDtKey "] [workspace.dependencies] -actix-web-grants = { path = "actix-web-grants", version = "4.0.0" } -rocket-grants = { path = "rocket-grants", version = "0.1.1" } -poem-grants = { path = "poem-grants", version = "1.0.0" } -protect-endpoints-proc-macro = { path = "proc-macro", version = "0.1.0" } +protect-endpoints-proc-macro = { version = "0.1.0" } + +[patch.crates-io] +actix-web-grants = { path = "actix-web-grants" } +rocket-grants = { path = "rocket-grants" } +poem-grants = { path = "poem-grants" } +protect-endpoints-proc-macro = { path = "proc-macro" } From 7dcf83ac56f6e6dd71b4c0736fb25651a455ccb3 Mon Sep 17 00:00:00 2001 From: Artem Medvedev Date: Tue, 28 Nov 2023 00:03:57 +0100 Subject: [PATCH 2/4] fix prod macro deps --- proc-macro/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml index 9a8a4b3..576c646 100644 --- a/proc-macro/Cargo.toml +++ b/proc-macro/Cargo.toml @@ -31,6 +31,8 @@ actix-web = { version = "4.4.0" } poem = { version = "1.3.59" } poem-openapi = { version = "3.0.6" } serde = { version = "1.0", features = ["derive"] } -actix-web-grants = { workspace = true } -rocket-grants = { workspace = true } -poem-grants = { workspace = true } +actix-web-grants = { version = "3" } +rocket-grants = { version = "0.1" } +poem-grants = { version = "1.0.0-beta.3" } + + From 7fd26201df0e5283125459e5c57748e9ffdb5b6d Mon Sep 17 00:00:00 2001 From: Artem Medvedev Date: Tue, 28 Nov 2023 00:15:00 +0100 Subject: [PATCH 3/4] remove main crates from workspace patch --- Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6cf75e0..df5d3aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,4 @@ authors = ["DDtKey "] protect-endpoints-proc-macro = { version = "0.1.0" } [patch.crates-io] -actix-web-grants = { path = "actix-web-grants" } -rocket-grants = { path = "rocket-grants" } -poem-grants = { path = "poem-grants" } protect-endpoints-proc-macro = { path = "proc-macro" } From 2d3707990b30249ba2c274bc9748c250e13c8e05 Mon Sep 17 00:00:00 2001 From: Artem Medvedev Date: Tue, 28 Nov 2023 00:15:50 +0100 Subject: [PATCH 4/4] use paths explicitly --- proc-macro/Cargo.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml index 576c646..ef3d377 100644 --- a/proc-macro/Cargo.toml +++ b/proc-macro/Cargo.toml @@ -31,8 +31,6 @@ actix-web = { version = "4.4.0" } poem = { version = "1.3.59" } poem-openapi = { version = "3.0.6" } serde = { version = "1.0", features = ["derive"] } -actix-web-grants = { version = "3" } -rocket-grants = { version = "0.1" } -poem-grants = { version = "1.0.0-beta.3" } - - +actix-web-grants = { path = "../actix-web-grants" } +rocket-grants = { path = "../rocket-grants" } +poem-grants = { path = "../poem-grants" }