From bc370f9fa980bafb553f011ae250fedc13dab9b5 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sun, 21 Jan 2024 15:31:38 +0100 Subject: [PATCH] Update dependencies and make version constraints more lenient --- Cargo.lock | 106 +++++++++++---------------------------- Cargo.toml | 20 ++++---- crates/api/Cargo.toml | 10 ++-- crates/auth/Cargo.toml | 12 ++--- crates/caldav/Cargo.toml | 26 +++++----- crates/dav/Cargo.toml | 12 ++--- crates/store/Cargo.toml | 22 ++++---- 7 files changed, 79 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9074db..fe802ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -715,16 +715,26 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eeb342678d785662fd2514be38c459bb925f02b68dd2a3e0f21d7ef82d979dd" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] @@ -1061,8 +1071,8 @@ dependencies = [ [[package]] name = "ical" -version = "0.7.0" -source = "git+https://github.com/Peltoche/ical-rs.git?rev=4f7aeb0#4f7aeb0bc39d159e8349750f0bea6ff4992e479a" +version = "0.10.0" +source = "git+https://github.com/Peltoche/ical-rs.git#7f93147560b333e5fe3ab20c49b2d102ba678573" dependencies = [ "thiserror", ] @@ -1087,17 +1097,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.12.0" @@ -1538,9 +1537,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -1550,9 +1549,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", @@ -1567,12 +1566,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "roxmltree" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rsa" @@ -2158,15 +2154,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.56" @@ -2289,9 +2276,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -2310,9 +2297,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -2499,37 +2486,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" @@ -2680,12 +2636,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - [[package]] name = "zerocopy" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index e0d4e0e..c28917c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,21 +8,21 @@ rustical_store = { path = "./crates/store/" } rustical_auth = { path = "./crates/auth/" } rustical_api = { path = "./crates/api/" } rustical_caldav = { path = "./crates/caldav/" } -serde = { version = "1.0.188", features = ["derive"] } -tokio = { version = "1.32.0", features = [ +serde = { version = "1.0", features = ["derive"] } +tokio = { version = "1.35", features = [ "net", "tracing", "macros", "rt-multi-thread", "full", ] } -tracing = "0.1.37" -env_logger = "0.10.0" -actix-web = "4.4.0" -anyhow = { version = "1.0.75", features = ["backtrace"] } -toml = "0.7.6" -clap = { version = "4.4.2", features = ["derive", "env"] } -sqlx = { version = "0.7.1", features = [ +tracing = "0.1" +env_logger = "0.11" +actix-web = "4.4" +anyhow = { version = "1.0", features = ["backtrace"] } +toml = "0.8" +clap = { version = "4.4", features = ["derive", "env"] } +sqlx = { version = "0.7", features = [ "sqlx-sqlite", "sqlx-postgres", "uuid", @@ -33,4 +33,4 @@ sqlx = { version = "0.7.1", features = [ "runtime-tokio", "migrate", ] } -async-trait = "0.1.73" +async-trait = "0.1" diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 6ce1a06..df30187 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -actix-web = "4.4.0" -anyhow = { version = "1.0.75", features = ["backtrace"] } +actix-web = "4.4" +anyhow = { version = "1.0", features = ["backtrace"] } rustical_store = { path = "../store/" } -serde = "1.0.188" -serde_json = "1.0.105" -tokio = { version = "1.32.0", features = ["sync"] } +serde = "1.0" +serde_json = "1.0" +tokio = { version = "1.32", features = ["sync"] } diff --git a/crates/auth/Cargo.toml b/crates/auth/Cargo.toml index 3b46bc4..ff044a3 100644 --- a/crates/auth/Cargo.toml +++ b/crates/auth/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = "4.4.0" -actix-web-httpauth = "0.8.0" -derive_more = "0.99.17" -futures-util = "0.3.28" -password-auth = "1.0.0" -serde = { version = "1.0.188", features = ["derive"] } +actix-web = "4.4" +actix-web-httpauth = "0.8" +derive_more = "0.99" +futures-util = "0.3" +password-auth = "1.0" +serde = { version = "1.0", features = ["derive"] } diff --git a/crates/caldav/Cargo.toml b/crates/caldav/Cargo.toml index 960975f..0905551 100644 --- a/crates/caldav/Cargo.toml +++ b/crates/caldav/Cargo.toml @@ -4,26 +4,26 @@ version = "0.1.0" edition = "2021" [dependencies] -actix-web = "4.4.0" -actix-web-httpauth = "0.8.0" -anyhow = { version = "1.0.75", features = ["backtrace"] } -base64 = "0.21.3" -derive_more = "0.99.17" -futures-util = "0.3.28" -quick-xml = { version = "0.30.0", features = [ +actix-web = "4.4" +actix-web-httpauth = "0.8" +anyhow = { version = "1.0", features = ["backtrace"] } +base64 = "0.21" +derive_more = "0.99" +futures-util = "0.3" +quick-xml = { version = "0.30", features = [ "serde", "serde-types", "serialize", ] } -roxmltree = "0.18.0" +roxmltree = "0.19" rustical_store = { path = "../store/" } rustical_dav = { path = "../dav/" } rustical_auth = { path = "../auth/" } -serde = { version = "1.0.188", features = ["serde_derive", "derive"] } -serde_json = "1.0.105" -tokio = { version = "1.32.0", features = ["sync", "full"] } -async-trait = "0.1.73" -thiserror = "1.0.48" +serde = { version = "1.0", features = ["serde_derive", "derive"] } +serde_json = "1.0" +tokio = { version = "1.35", features = ["sync", "full"] } +async-trait = "0.1" +thiserror = "1.0" ical = { git = "https://github.com/Peltoche/ical-rs.git", features = [ "generator", ] } diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml index 66b349b..f1721ff 100644 --- a/crates/dav/Cargo.toml +++ b/crates/dav/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -actix-web = "4.4.0" -anyhow = "1.0.75" -async-trait = "0.1.73" -derive_more = "0.99.17" -futures-util = "0.3.28" -quick-xml = "0.30.0" +actix-web = "4.4" +anyhow = "1.0" +async-trait = "0.1" +derive_more = "0.99" +futures-util = "0.3" +quick-xml = "0.30" rustical_auth = { path = "../auth/" } diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml index 3c03bf6..9271daa 100644 --- a/crates/store/Cargo.toml +++ b/crates/store/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = { version = "1.0.75", features = ["backtrace"] } -async-trait = "0.1.73" -serde = { version = "1.0.188", features = ["derive", "rc"] } -sha2 = "0.10.7" -sqlx = { version = "0.7.1", features = [ +anyhow = { version = "1.0", features = ["backtrace"] } +async-trait = "0.1" +serde = { version = "1.0", features = ["derive", "rc"] } +sha2 = "0.10" +sqlx = { version = "0.7", features = [ "sqlx-sqlite", "sqlx-postgres", "uuid", @@ -21,11 +21,11 @@ sqlx = { version = "0.7.1", features = [ "runtime-tokio", "migrate", ] } -tokio = { version = "1.32.0", features = ["sync", "full"] } -toml = "0.7.6" -ical = { git = "https://github.com/Peltoche/ical-rs.git", rev = "4f7aeb0", features = [ +tokio = { version = "1.35", features = ["sync", "full"] } +toml = "0.8" +ical = { git = "https://github.com/Peltoche/ical-rs.git", features = [ "generator", ] } -chrono = "0.4.31" -regex = "1.9.5" -lazy_static = "1.4.0" +chrono = "0.4" +regex = "1.10" +lazy_static = "1.4"