From d8439090844d433bd78d6cdbd8e5bcd6fdf247a2 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Wed, 5 Nov 2025 16:16:01 +0100 Subject: [PATCH] Update Cargo.toml --- Cargo.lock | 2 +- Cargo.toml | 45 ++++++++++++++++++---------------- crates/caldav/Cargo.toml | 31 +++++++++++------------ crates/carddav/Cargo.toml | 27 ++++++++++---------- crates/dav/Cargo.toml | 1 + crates/dav_push/Cargo.toml | 19 +++++++------- crates/frontend/Cargo.toml | 1 + crates/ical/Cargo.toml | 1 + crates/oidc/Cargo.toml | 1 + crates/store/Cargo.toml | 25 ++++++++++--------- crates/store_sqlite/Cargo.toml | 13 +++++----- crates/xml/Cargo.toml | 1 + crates/xml/derive/Cargo.toml | 5 ++-- 13 files changed, 93 insertions(+), 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fce9bd..80b1f5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5013,7 +5013,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "xml_derive" -version = "0.1.0" +version = "0.10.1" dependencies = [ "darling", "heck", diff --git a/Cargo.toml b/Cargo.toml index 18c96d1..d585eb1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = ["crates/*"] [workspace.package] version = "0.10.1" +rust-version = "1.91" edition = "2024" description = "A CalDAV server" documentation = "https://lennart-k.github.io/rustical/" @@ -12,6 +13,7 @@ license = "AGPL-3.0-or-later" [package] name = "rustical" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -35,6 +37,17 @@ opentelemetry = [ debug = 0 [workspace.dependencies] +rustical_dav = { path = "./crates/dav/" } +rustical_dav_push = { path = "./crates/dav_push/" } +rustical_store = { path = "./crates/store/" } +rustical_store_sqlite = { path = "./crates/store_sqlite/" } +rustical_caldav = { path = "./crates/caldav/" } +rustical_carddav = { path = "./crates/carddav/" } +rustical_frontend = { path = "./crates/frontend/" } +rustical_xml = { path = "./crates/xml/" } +rustical_oidc = { path = "./crates/oidc/" } +rustical_ical = { path = "./crates/ical/" } + matchit = "0.9" uuid = { version = "1.11", features = ["v4", "fast-rng"] } async-trait = "0.1" @@ -108,16 +121,6 @@ tower-http = { version = "0.6", features = [ "catch-panic", ] } percent-encoding = "2.3" -rustical_dav = { path = "./crates/dav/" } -rustical_dav_push = { path = "./crates/dav_push/" } -rustical_store = { path = "./crates/store/" } -rustical_store_sqlite = { path = "./crates/store_sqlite/" } -rustical_caldav = { path = "./crates/caldav/" } -rustical_carddav = { path = "./crates/carddav/" } -rustical_frontend = { path = "./crates/frontend/" } -rustical_xml = { path = "./crates/xml/" } -rustical_oidc = { path = "./crates/oidc/" } -rustical_ical = { path = "./crates/ical/" } chrono-tz = "0.10" chrono-humanize = "0.2" rand = "0.9" @@ -147,19 +150,19 @@ openssl = { version = "0.10", features = ["vendored"] } async-std = { version = "1.13", features = ["attributes"] } [dependencies] -rustical_store = { workspace = true } -rustical_store_sqlite = { workspace = true } -rustical_caldav = { workspace = true } +rustical_store.workspace = true +rustical_store_sqlite.workspace = true +rustical_caldav.workspace = true rustical_carddav.workspace = true -rustical_frontend = { workspace = true } -toml = { workspace = true } -serde = { workspace = true } -tokio = { workspace = true } -tracing = { workspace = true } -anyhow = { workspace = true } +rustical_frontend.workspace = true +toml.workspace = true +serde.workspace = true +tokio.workspace = true +tracing.workspace = true +anyhow.workspace = true clap.workspace = true -sqlx = { workspace = true } -async-trait = { workspace = true } +sqlx.workspace = true +async-trait.workspace = true uuid.workspace = true axum.workspace = true diff --git a/crates/caldav/Cargo.toml b/crates/caldav/Cargo.toml index 2903282..a5bce0f 100644 --- a/crates/caldav/Cargo.toml +++ b/crates/caldav/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_caldav" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -17,21 +18,21 @@ serde_json.workspace = true axum.workspace = true axum-extra.workspace = true tower.workspace = true -async-trait = { workspace = true } -thiserror = { workspace = true } -quick-xml = { workspace = true } -tracing = { workspace = true } -futures-util = { workspace = true } -derive_more = { workspace = true } -base64 = { workspace = true } -serde = { workspace = true } -tokio = { workspace = true } -url = { workspace = true } -rustical_dav = { workspace = true } -rustical_store = { workspace = true } -chrono = { workspace = true } -chrono-tz = { workspace = true } -sha2 = { workspace = true } +async-trait.workspace = true +thiserror.workspace = true +quick-xml.workspace = true +tracing.workspace = true +futures-util.workspace = true +derive_more.workspace = true +base64.workspace = true +serde.workspace = true +tokio.workspace = true +url.workspace = true +rustical_dav.workspace = true +rustical_store.workspace = true +chrono.workspace = true +chrono-tz.workspace = true +sha2.workspace = true ical.workspace = true percent-encoding.workspace = true rustical_xml.workspace = true diff --git a/crates/carddav/Cargo.toml b/crates/carddav/Cargo.toml index aaf28f3..ef26313 100644 --- a/crates/carddav/Cargo.toml +++ b/crates/carddav/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_carddav" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -11,19 +12,19 @@ publish = false axum.workspace = true axum-extra.workspace = true tower.workspace = true -async-trait = { workspace = true } -thiserror = { workspace = true } -quick-xml = { workspace = true } -tracing = { workspace = true } -futures-util = { workspace = true } -derive_more = { workspace = true } -base64 = { workspace = true } -serde = { workspace = true } -tokio = { workspace = true } -url = { workspace = true } -rustical_dav = { workspace = true } -rustical_store = { workspace = true } -chrono = { workspace = true } +async-trait.workspace = true +thiserror.workspace = true +quick-xml.workspace = true +tracing.workspace = true +futures-util.workspace = true +derive_more.workspace = true +base64.workspace = true +serde.workspace = true +tokio.workspace = true +url.workspace = true +rustical_dav.workspace = true +rustical_store.workspace = true +chrono.workspace = true rustical_xml.workspace = true uuid.workspace = true rustical_dav_push.workspace = true diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml index 1cfbb79..e54df5b 100644 --- a/crates/dav/Cargo.toml +++ b/crates/dav/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_dav" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true diff --git a/crates/dav_push/Cargo.toml b/crates/dav_push/Cargo.toml index ff740f6..f47954e 100644 --- a/crates/dav_push/Cargo.toml +++ b/crates/dav_push/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_dav_push" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -9,15 +10,15 @@ publish = false [dependencies] rustical_xml.workspace = true -async-trait = { workspace = true } -futures-util = { workspace = true } -quick-xml = { workspace = true } -serde = { workspace = true } -thiserror = { workspace = true } -itertools = { workspace = true } -log = { workspace = true } -derive_more = { workspace = true } -tracing = { workspace = true } +async-trait.workspace = true +futures-util.workspace = true +quick-xml.workspace = true +serde.workspace = true +thiserror.workspace = true +itertools.workspace = true +log.workspace = true +derive_more.workspace = true +tracing.workspace = true reqwest.workspace = true tokio.workspace = true rustical_dav.workspace = true diff --git a/crates/frontend/Cargo.toml b/crates/frontend/Cargo.toml index 009de98..2aa2148 100644 --- a/crates/frontend/Cargo.toml +++ b/crates/frontend/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_frontend" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true diff --git a/crates/ical/Cargo.toml b/crates/ical/Cargo.toml index a02cb26..8318de8 100644 --- a/crates/ical/Cargo.toml +++ b/crates/ical/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_ical" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true diff --git a/crates/oidc/Cargo.toml b/crates/oidc/Cargo.toml index 14ce514..40335b2 100644 --- a/crates/oidc/Cargo.toml +++ b/crates/oidc/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_oidc" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index 98823af..eaaba56 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_store" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -8,16 +9,16 @@ license.workspace = true publish = false [dependencies] -anyhow = { workspace = true } -async-trait = { workspace = true } -serde = { workspace = true } -sha2 = { workspace = true } -ical = { workspace = true } -chrono = { workspace = true } -regex = { workspace = true } -thiserror = { workspace = true } -tracing = { workspace = true } -chrono-tz = { workspace = true } +anyhow.workspace = true +async-trait.workspace = true +serde.workspace = true +sha2.workspace = true +ical.workspace = true +chrono.workspace = true +regex.workspace = true +thiserror.workspace = true +tracing.workspace = true +chrono-tz.workspace = true derive_more = { workspace = true, features = ["as_ref"] } rustical_xml.workspace = true tokio.workspace = true @@ -34,7 +35,7 @@ tower-sessions.workspace = true vtimezones-rs.workspace = true [dev-dependencies] -rstest = { workspace = true } -rstest_reuse = { workspace = true } +rstest.workspace = true +rstest_reuse.workspace = true rustical_store_sqlite.workspace = true tokio.workspace = true diff --git a/crates/store_sqlite/Cargo.toml b/crates/store_sqlite/Cargo.toml index e4b67f4..9807c10 100644 --- a/crates/store_sqlite/Cargo.toml +++ b/crates/store_sqlite/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_store_sqlite" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true @@ -15,12 +16,12 @@ rstest.workspace = true [dependencies] tokio.workspace = true -rustical_store = { workspace = true } -async-trait = { workspace = true } -serde = { workspace = true } -sqlx = { workspace = true } -thiserror = { workspace = true } -tracing = { workspace = true } +rustical_store.workspace = true +async-trait.workspace = true +serde.workspace = true +sqlx.workspace = true +thiserror.workspace = true +tracing.workspace = true derive_more.workspace = true chrono.workspace = true password-auth.workspace = true diff --git a/crates/xml/Cargo.toml b/crates/xml/Cargo.toml index a4497ec..fa03c71 100644 --- a/crates/xml/Cargo.toml +++ b/crates/xml/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "rustical_xml" version.workspace = true +rust-version.workspace = true edition.workspace = true description.workspace = true repository.workspace = true diff --git a/crates/xml/derive/Cargo.toml b/crates/xml/derive/Cargo.toml index ffb04f3..ef6c293 100644 --- a/crates/xml/derive/Cargo.toml +++ b/crates/xml/derive/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "xml_derive" -version = "0.1.0" -edition = "2024" +version.workspace = true +rust-version.workspace = true +edition.workspace = true license.workspace = true [lib]