Declare garage crates using workspace.dependencies

This will allow to really disable "sled" feature without declaring
`default-features = false` in every Cargo.toml where garage_db and
garage_model is used.

See https://doc.rust-lang.org/cargo/reference/workspaces.html#the-dependencies-table
This commit is contained in:
Jakub Jirutka 2023-05-07 18:12:01 +02:00 committed by Alex
parent 8499cd5c21
commit d2deee0b8b
10 changed files with 42 additions and 32 deletions

View File

@ -15,6 +15,16 @@ members = [
default-members = ["src/garage"] default-members = ["src/garage"]
[workspace.dependencies]
garage_api = { version = "0.8.2", path = "src/api" }
garage_block = { version = "0.8.2", path = "src/block" }
garage_db = { version = "0.8.2", path = "src/db" }
garage_model = { version = "0.8.2", path = "src/model" }
garage_rpc = { version = "0.8.2", path = "src/rpc" }
garage_table = { version = "0.8.2", path = "src/table" }
garage_util = { version = "0.8.2", path = "src/util" }
garage_web = { version = "0.8.2", path = "src/web" }
[profile.dev] [profile.dev]
lto = "off" lto = "off"

View File

@ -14,11 +14,11 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_model = { version = "0.8.2", path = "../model" } garage_model.workspace = true
garage_table = { version = "0.8.2", path = "../table" } garage_table.workspace = true
garage_block = { version = "0.8.2", path = "../block" } garage_block.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
garage_rpc = { version = "0.8.2", path = "../rpc" } garage_rpc.workspace = true
async-trait = "0.1.7" async-trait = "0.1.7"
base64 = "0.21" base64 = "0.21"

View File

@ -14,10 +14,10 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_db = { version = "0.8.2", path = "../db" } garage_db.workspace = true
garage_rpc = { version = "0.8.2", path = "../rpc" } garage_rpc.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
garage_table = { version = "0.8.2", path = "../table" } garage_table.workspace = true
opentelemetry = "0.17" opentelemetry = "0.17"

View File

@ -21,14 +21,14 @@ path = "tests/lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_db = { version = "0.8.2", path = "../db" } garage_db.workspace = true
garage_api = { version = "0.8.2", path = "../api" } garage_api.workspace = true
garage_block = { version = "0.8.2", path = "../block" } garage_block.workspace = true
garage_model = { version = "0.8.2", path = "../model" } garage_model.workspace = true
garage_rpc = { version = "0.8.2", path = "../rpc" } garage_rpc.workspace = true
garage_table = { version = "0.8.2", path = "../table" } garage_table.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
garage_web = { version = "0.8.2", path = "../web" } garage_web.workspace = true
backtrace = "0.3" backtrace = "0.3"
bytes = "1.0" bytes = "1.0"

View File

@ -23,7 +23,7 @@ tokio = "1.24"
# cli deps # cli deps
clap = { version = "4.1", optional = true, features = ["derive", "env"] } clap = { version = "4.1", optional = true, features = ["derive", "env"] }
garage_util = { version = "0.8.2", path = "../util", optional = true } garage_util = { workspace = true, optional = true }
[features] [features]

View File

@ -14,11 +14,11 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_db = { version = "0.8.2", default-features = false, path = "../db" } garage_db.workspace = true
garage_rpc = { version = "0.8.2", path = "../rpc" } garage_rpc.workspace = true
garage_table = { version = "0.8.2", path = "../table" } garage_table.workspace = true
garage_block = { version = "0.8.2", path = "../block" } garage_block.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
async-trait = "0.1.7" async-trait = "0.1.7"
arc-swap = "1.0" arc-swap = "1.0"

View File

@ -14,7 +14,7 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
arc-swap = "1.0" arc-swap = "1.0"
bytes = "1.0" bytes = "1.0"

View File

@ -14,9 +14,9 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_db = { version = "0.8.2", path = "../db" } garage_db.workspace = true
garage_rpc = { version = "0.8.2", path = "../rpc" } garage_rpc.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
opentelemetry = "0.17" opentelemetry = "0.17"

View File

@ -14,7 +14,7 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_db = { version = "0.8.2", path = "../db" } garage_db.workspace = true
arc-swap = "1.0" arc-swap = "1.0"
async-trait = "0.1" async-trait = "0.1"

View File

@ -14,10 +14,10 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
garage_api = { version = "0.8.2", path = "../api" } garage_api.workspace = true
garage_model = { version = "0.8.2", path = "../model" } garage_model.workspace = true
garage_util = { version = "0.8.2", path = "../util" } garage_util.workspace = true
garage_table = { version = "0.8.2", path = "../table" } garage_table.workspace = true
err-derive = "0.3" err-derive = "0.3"
tracing = "0.1" tracing = "0.1"