From ce4e0c5ecb56dd3b9126435fa7e25eb90aecb86d Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Thu, 28 Nov 2024 10:25:27 +0000 Subject: [PATCH] Upgrade dependencies --- Cargo.lock | 62 +++++++++++++++++++++++++---------------- Cargo.toml | 3 -- thoth-app/Cargo.toml | 2 +- thoth-client/Cargo.toml | 4 +-- thoth-errors/Cargo.toml | 4 +-- 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f9ee9dd..32f6e5fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,12 +600,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "cargo-husky" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" - [[package]] name = "cc" version = "1.2.1" @@ -967,7 +961,7 @@ dependencies = [ "console", "shell-words", "tempfile", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -1435,7 +1429,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -1450,7 +1444,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -1519,7 +1513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" dependencies = [ "combine 3.8.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2412,7 +2406,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -2449,7 +2443,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "uuid", ] @@ -2861,24 +2855,24 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", "http 1.1.0", "reqwest", "serde", - "thiserror", + "thiserror 1.0.69", "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83df1aaec00176d0fabb65dea13f832d2a446ca99107afc17c5d2d4981221d0" +checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178" dependencies = [ "anyhow", "async-trait", @@ -2890,6 +2884,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "retry-policies", + "thiserror 1.0.69", "tokio", "tracing", "wasm-timer", @@ -3207,7 +3202,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -3406,7 +3401,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] @@ -3420,11 +3424,21 @@ dependencies = [ "syn 2.0.89", ] +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "thoth" version = "0.13.2" dependencies = [ - "cargo-husky", "clap", "dialoguer", "dotenv", @@ -3495,7 +3509,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "thoth-api", "thoth-errors", "uuid", @@ -3551,7 +3565,7 @@ dependencies = [ "reqwest-middleware", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "uuid", "xml-rs", "yewtil", @@ -4194,7 +4208,7 @@ dependencies = [ "serde", "serde_json", "slab", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4279,7 +4293,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", "yew 0.19.3", diff --git a/Cargo.toml b/Cargo.toml index 1f5e9aea..365629d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,3 @@ thoth-export-server = { version = "=0.13.2", path = "thoth-export-server" } clap = { version = "4.5.21", features = ["cargo", "env"] } dialoguer = { version = "0.11.0", features = ["password"] } dotenv = "0.15.0" - -[dev-dependencies] -cargo-husky = { version = "1.5.0", default-features = false, features = ["prepush-hook", "run-cargo-check", "run-cargo-test", "run-cargo-clippy", "run-cargo-fmt"] } diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml index eccb5bbc..bd604c82 100644 --- a/thoth-app/Cargo.toml +++ b/thoth-app/Cargo.toml @@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" } chrono = { version = "0.4.38", features = ["serde"] } gloo-storage = "0.3.0" gloo-timers = "0.3.0" -thiserror = "1.0.69" +thiserror = "2.0" yew = "0.19.3" yew-agent = "0.1.0" yew-router = "0.16.0" diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml index f3f8a3f5..f86c3890 100644 --- a/thoth-client/Cargo.toml +++ b/thoth-client/Cargo.toml @@ -15,8 +15,8 @@ thoth-errors = {version = "=0.13.2", path = "../thoth-errors" } graphql_client = "0.14.0" chrono = { version = "0.4.38", features = ["serde"] } reqwest = { version = "0.12", features = ["json"] } -reqwest-middleware = { version = "0.3.3", features = ["json"] } -reqwest-retry = "0.6.1" +reqwest-middleware = { version = "0.4.0", features = ["json"] } +reqwest-retry = "0.7.0" serde = "1.0" serde_json = "1.0" uuid = { version = "1.11.0", features = ["serde"] } diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml index aebac1a2..e1db0853 100644 --- a/thoth-errors/Cargo.toml +++ b/thoth-errors/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] chrono = "0.4.38" -thiserror = "1.0" +thiserror = "2.0" reqwest = { version = "0.12", features = ["json"] } serde = "1.0" serde_json = "1.0" @@ -26,5 +26,5 @@ csv = "1.3.0" juniper = "0.16.1" marc = { version = "3.1.1", features = ["xml"] } phf = { version = "0.11", features = ["macros"] } -reqwest-middleware = "0.3.3" +reqwest-middleware = "0.4.0" xml-rs = "0.8.19"