Browse Source

chore: Don't use path deps in workspace

This moves the path dependencies back into the per-crate Cargo.toml.
It is required such that the release tooling can correctly calculate
which version constraints require changing when we perform a release.

Signed-off-by: Dave Tucker <[email protected]>
Dave Tucker 1 năm trước cách đây
mục cha
commit
13b1fc63ef

+ 0 - 7
Cargo.toml

@@ -57,13 +57,6 @@ edition = "2021"
 anyhow = { version = "1", default-features = false }
 assert_matches = { version = "1.5.0", default-features = false }
 async-io = { version = "2.0", default-features = false }
-aya = { path = "aya", version = "0.11.0", default-features = false }
-aya-bpf = { path = "bpf/aya-bpf", default-features = false }
-aya-log = { path = "aya-log", default-features = false }
-aya-log-common = { path = "aya-log-common", version = "0.1.13", default-features = false }
-aya-log-parser = { path = "aya-log-parser", default-features = false }
-aya-obj = { path = "aya-obj", version = "0.1.0", default-features = false }
-aya-tool = { path = "aya-tool", default-features = false }
 bindgen = { version = "0.69", default-features = false }
 bitflags = { version = "2.2.1", default-features = false }
 bytes = { version = "1", default-features = false }

+ 1 - 1
aya-bpf-macros/Cargo.toml

@@ -18,4 +18,4 @@ quote = { workspace = true }
 syn = { workspace = true, default-features = true, features = ["full"] }
 
 [dev-dependencies]
-aya-bpf = { workspace = true }
+aya-bpf = { path = "../bpf/aya-bpf", version = "0.1.0", default-features = false }

+ 2 - 2
aya-log-ebpf-macros/Cargo.toml

@@ -9,8 +9,8 @@ homepage.workspace = true
 edition.workspace = true
 
 [dependencies]
-aya-log-common = { workspace = true }
-aya-log-parser = { workspace = true }
+aya-log-common = { path = "../aya-log-common", version = "0.1.13", default-features = false }
+aya-log-parser = { path = "../aya-log-parser", version = "0.1.13", default-features = false }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }

+ 2 - 2
aya-log-parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aya-log-parser"
-version = "0.1.11-dev.0"
+version = "0.1.13"
 description = "A parser for the aya log format strings"
 authors.workspace = true
 license.workspace = true
@@ -9,7 +9,7 @@ homepage.workspace = true
 edition.workspace = true
 
 [dependencies]
-aya-log-common = { workspace = true }
+aya-log-common = { path = "../aya-log-common", version = "0.1.13", default-features = false }
 
 [lib]
 path = "src/lib.rs"

+ 2 - 2
aya-log/Cargo.toml

@@ -12,8 +12,8 @@ homepage.workspace = true
 edition.workspace = true
 
 [dependencies]
-aya = { workspace = true, features = ["async_tokio"] }
-aya-log-common = { workspace = true }
+aya = { path = "../aya", version = "0.11.0", features = ["async_tokio"] }
+aya-log-common = { path = "../aya-log-common", version = "0.1.13", default-features = false }
 bytes = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }

+ 1 - 1
aya/Cargo.toml

@@ -15,7 +15,7 @@ edition.workspace = true
 [dependencies]
 assert_matches = { workspace = true }
 async-io = { workspace = true, optional = true }
-aya-obj = { workspace = true, features = ["std"] }
+aya-obj = { path = "../aya-obj", version = "0.1.0", features = ["std"] }
 bitflags = { workspace = true }
 bytes = { workspace = true }
 lazy_static = { workspace = true }

+ 3 - 3
test/integration-test/Cargo.toml

@@ -11,9 +11,9 @@ edition.workspace = true
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
 assert_matches = { workspace = true }
-aya = { workspace = true }
-aya-log = { workspace = true }
-aya-obj = { workspace = true }
+aya = { path = "../../aya", version = "0.11.0", default-features = false }
+aya-log = { path = "../../aya-log", version = "0.1.13", default-features = false }
+aya-obj = { path = "../../aya-obj", version = "0.1.0", default-features = false }
 env_logger = { workspace = true }
 epoll = { workspace = true }
 futures = { workspace = true, features = ["std"] }

+ 1 - 1
xtask/Cargo.toml

@@ -10,7 +10,7 @@ edition.workspace = true
 
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
-aya-tool = { workspace = true }
+aya-tool = { path = "../aya-tool", version = "0.1.0", default-features = false }
 cargo_metadata = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 dialoguer = { workspace = true }