From 42311ac5152a64a6a5ef3c10a59554fd1fdec6d3 Mon Sep 17 00:00:00 2001 From: Claas Date: Mon, 30 Sep 2024 19:59:15 +0200 Subject: [PATCH] Synchronize package versions so they stay the same --- Cargo.lock | 1 - Cargo.toml | 7 +++++++ core/Cargo.toml | 6 +++--- delivery-service/Cargo.toml | 13 ++++++------- pumpe/Cargo.toml | 9 ++++----- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee5dfdc..9852d8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -575,7 +575,6 @@ name = "delivery-service" version = "0.1.0" dependencies = [ "axum", - "openmls", "serde", "thiserror", "tls_codec", diff --git a/Cargo.toml b/Cargo.toml index c3a2083..1b34027 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,10 @@ [workspace] members = ["delivery-service", "core", "pumpe", "tugboat"] resolver = "2" + +[workspace.dependencies] +axum = "0.7.7" +serde = "1.0.210" +thiserror = "1.0.64" +tokio = "1.40.0" +tower-http = "0.6.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 06de68d..37d1b56 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -15,10 +15,10 @@ openmls_basic_credential = "0.3.0" openmls_rust_crypto = "0.3.0" openmls_traits = "0.3.0" postcard = { version = "1.0.10", features = ["alloc"] } -serde = { version = "1.0.210", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } serde-wasm-bindgen = "0.6.5" -thiserror = "1.0.61" -tls_codec = "0.4.1" +thiserror = { workspace = true } +tls_codec = { workspace = true } wasm-bindgen = "0.2.92" wasm-bindgen-futures = "0.4.42" web-sys = "0.3.70" diff --git a/delivery-service/Cargo.toml b/delivery-service/Cargo.toml index db308a2..d36122d 100644 --- a/delivery-service/Cargo.toml +++ b/delivery-service/Cargo.toml @@ -4,12 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -axum = { version = "0.7.6", features = ["macros", "ws"] } -openmls = "0.6.0" -serde = { version = "1.0.210", features = ["derive", "rc"] } -thiserror = "1.0.64" -tls_codec = "0.4.1" -tokio = { version = "1.40.0", features = ["full"] } -tower-http = { version = "0.6.1", features = ["fs"] } +axum = { workspace = true, features = ["macros", "ws"] } +serde = { workspace = true, features = ["derive", "rc"] } +thiserror = { workspace = true } +tls_codec = { workspace = true } +tokio = { workspace = true, features = ["full"] } +tower-http = { workspace = true, features = ["fs"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } diff --git a/pumpe/Cargo.toml b/pumpe/Cargo.toml index 7afd29f..fdf1774 100644 --- a/pumpe/Cargo.toml +++ b/pumpe/Cargo.toml @@ -4,12 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -axum = { version = "0.7.7", features = ["macros"] } +axum = { workspace = true, features = ["macros"] } camino = "1.1.9" clap = { version = "4.5.18", features = ["derive"] } http-body-util = "0.1.2" -# http = "1.1.0" -thiserror = "1.0.64" -tokio = { version = "1.40.0", features = ["full"] } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["full"] } tower = { version = "0.5.1", features = ["full"] } -tower-http = { version = "0.6.1", features = ["compression-full", "fs"] } +tower-http = { workspace = true, features = ["compression-full", "fs"] } -- 2.51.2