diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 6e76938f0..b80524ccf 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -17,7 +17,7 @@ log = "0.4.16" serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" thiserror = "1.0.30" -tokio = { version = "1.17.0", features = ["fs", "io-util"] } +tokio = { version = "1.18.0", features = ["fs", "io-util"] } toml = { version = "0.5.9", features = ["preserve_order"] } types = { path = "../types/" } diff --git a/crates/load_save/Cargo.toml b/crates/load_save/Cargo.toml index bd9fb2609..7d025c929 100644 --- a/crates/load_save/Cargo.toml +++ b/crates/load_save/Cargo.toml @@ -23,12 +23,12 @@ regex = { version = "1.5.5", optional = true } serde = { version = "1.0.136", features = ["derive"] } serde_json = { version = "1.0.79", optional = true } thiserror = "1.0.30" -tokio = { version = "1.17.0", features = ["fs"], optional = true } +tokio = { version = "1.18.0", features = ["fs"], optional = true } types = { path = "../types/", features = ["lock"] } wkhtmltopdf = { version = "0.4.0", optional = true } [dev-dependencies] -tokio = { version = "1.17.0", features = ["rt", "macros"] } +tokio = { version = "1.18.0", features = ["rt", "macros"] } [features] beryllium = ["chrono", "quick-xml", "regex"] diff --git a/crates/logger/Cargo.toml b/crates/logger/Cargo.toml index df5c1fc3d..4d2b54b76 100644 --- a/crates/logger/Cargo.toml +++ b/crates/logger/Cargo.toml @@ -15,5 +15,5 @@ config = { path = "../config/" } fern = "0.6.1" log = "0.4.16" serde = { version = "1.0.136", features = ["derive"], optional = true } -tokio = "1.17.0" +tokio = "1.18.0" types = { path = "../types/" } diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml index e964698f0..9226861db 100644 --- a/crates/search/Cargo.toml +++ b/crates/search/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" structopt = { version = "0.3.26", optional = true } thiserror = "1.0.30" -tokio = { version = "1.17.0", default-features = false, optional = true } +tokio = { version = "1.18.0", default-features = false, optional = true } types = { path = "../types/", features = ["lock"] } [features] diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml index 4cca23a6f..b88fc41aa 100644 --- a/crates/types/Cargo.toml +++ b/crates/types/Cargo.toml @@ -14,7 +14,7 @@ cfg-if = { version = "1.0.0", optional = true } chrono = { version = "0.4.19", features = ["serde"] } log = "0.4.16" serde = { version = "1.0.136", features = ["derive"] } -tokio = { version = "1.17.0", features = ["sync"], default-features = false, optional = true } +tokio = { version = "1.18.0", features = ["sync"], default-features = false, optional = true } [features] lock = ["cfg-if"] diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock index 02b46878d..2c7110b28 100644 --- a/frontend/src-tauri/Cargo.lock +++ b/frontend/src-tauri/Cargo.lock @@ -1999,14 +1999,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -3924,15 +3925,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" dependencies = [ "bytes", "libc", "memchr", "mio", "num_cpus", + "once_cell", "pin-project-lite", "socket2", "tokio-macros", @@ -4178,6 +4180,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.79" diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index 8d5aa28ff..4a395b3c0 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ logger = { path = "../../crates/logger/" } search = { path = "../../crates/search/" } serde_json = "1.0.79" tauri = { version = "1.0.0-rc.6", features = ["api-all"] } -tokio = { version = "1.17.0", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.18.0", features = ["macros", "rt-multi-thread"] } types = { path = "../../crates/types" } [features] diff --git a/webserver/Cargo.lock b/webserver/Cargo.lock index e0cb636f8..cb9ca24e5 100644 --- a/webserver/Cargo.lock +++ b/webserver/Cargo.lock @@ -500,7 +500,7 @@ checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -839,14 +839,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -1633,7 +1634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -1692,15 +1693,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" dependencies = [ "bytes", "libc", "memchr", "mio", "num_cpus", + "once_cell", "pin-project-lite", "socket2", "tokio-macros", @@ -1994,6 +1996,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.79" diff --git a/webserver/Cargo.toml b/webserver/Cargo.toml index cfa8988d0..3aff5b63e 100644 --- a/webserver/Cargo.toml +++ b/webserver/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4.16" logger = { path = "../crates/logger/" } search = { path = "../crates/search/" } serde = { version = "1.0.136", features = ["derive"] } -tokio = { version = "1.17.0", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.18.0", features = ["macros", "rt-multi-thread"] } types = { path = "../crates/types/" } uuid = { version = "1.0.0", features = ["serde", "v4"] } warp = "0.3.2"