diff --git a/Cargo.toml b/Cargo.toml index c4925020..fc993d0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,3 @@ members = [ "matrix_sdk_common", "matrix_sdk_common_macros", ] - -[patch.crates-io] -olm-rs = { git = 'https://gitlab.gnome.org/jhaye/olm-rs/'} -olm-sys = { git = 'https://gitlab.gnome.org/BrainBlasted/olm-sys' } diff --git a/matrix_sdk/Cargo.toml b/matrix_sdk/Cargo.toml index ac819118..fe62a9b9 100644 --- a/matrix_sdk/Cargo.toml +++ b/matrix_sdk/Cargo.toml @@ -20,9 +20,9 @@ sqlite-cryptostore = ["matrix-sdk-base/sqlite-cryptostore"] http = "0.2.1" # FIXME: Revert to regular dependency once 0.10.8 or 0.11.0 is released reqwest = { git = "https://github.com/seanmonstar/reqwest", rev = "dd8441fd23dae6ffb79b4cea2862e5bca0c59743" } -serde_json = "1.0.56" +serde_json = "1.0.57" thiserror = "1.0.20" -tracing = "0.1.16" +tracing = "0.1.19" url = "2.1.1" matrix-sdk-common-macros = { version = "0.1.0", path = "../matrix_sdk_common_macros" } @@ -49,11 +49,11 @@ features = ["wasm-bindgen"] async-trait = "0.1.36" dirs = "3.0.1" matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } -tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] } -serde_json = "1.0.56" -tracing-subscriber = "0.2.7" +tokio = { version = "0.2.22", features = ["rt-threaded", "macros"] } +serde_json = "1.0.57" +tracing-subscriber = "0.2.11" tempfile = "3.1.0" -mockito = "0.26.0" +mockito = "0.27.0" lazy_static = "1.4.0" futures = "0.3.5" diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml index 5c16e448..b1e919d4 100644 --- a/matrix_sdk_base/Cargo.toml +++ b/matrix_sdk_base/Cargo.toml @@ -18,10 +18,10 @@ sqlite-cryptostore = ["matrix-sdk-crypto/sqlite-cryptostore"] [dependencies] async-trait = "0.1.36" -serde = "1.0.114" -serde_json = "1.0.56" +serde = "1.0.115" +serde_json = "1.0.57" zeroize = "1.1.0" -tracing = "0.1.16" +tracing = "0.1.19" matrix-sdk-common-macros = { version = "0.1.0", path = "../matrix_sdk_common_macros" } matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } @@ -31,19 +31,19 @@ matrix-sdk-crypto = { version = "0.1.0", path = "../matrix_sdk_crypto", optional thiserror = "1.0.20" [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] -version = "0.2.21" +version = "0.2.22" default-features = false features = ["sync", "fs"] [dev-dependencies] matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } http = "0.2.1" -tracing-subscriber = "0.2.7" +tracing-subscriber = "0.2.11" tempfile = "3.1.0" -mockito = "0.26.0" +mockito = "0.27.0" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "0.2.21", features = ["rt-threaded", "macros"] } +tokio = { version = "0.2.22", features = ["rt-threaded", "macros"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3.15" +wasm-bindgen-test = "0.3.17" diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index 71f5ac16..bb8aff84 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -12,7 +12,7 @@ version = "0.1.0" [dependencies] instant = { version = "0.1.6", features = ["wasm-bindgen", "now"] } -js_int = "0.1.8" +js_int = "0.1.9" [dependencies.ruma] version = "0.0.1" @@ -24,7 +24,7 @@ features = ["client-api"] uuid = { version = "0.8.1", features = ["v4"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] -version = "0.2.21" +version = "0.2.22" default-features = false features = ["sync", "time", "fs"] diff --git a/matrix_sdk_common_macros/Cargo.toml b/matrix_sdk_common_macros/Cargo.toml index 959d5805..6648570f 100644 --- a/matrix_sdk_common_macros/Cargo.toml +++ b/matrix_sdk_common_macros/Cargo.toml @@ -14,5 +14,5 @@ version = "0.1.0" proc-macro = true [dependencies] -syn = "1.0.34" +syn = "1.0.38" quote = "1.0.7" diff --git a/matrix_sdk_crypto/Cargo.toml b/matrix_sdk_crypto/Cargo.toml index 509a3ee3..64f2d2f3 100644 --- a/matrix_sdk_crypto/Cargo.toml +++ b/matrix_sdk_crypto/Cargo.toml @@ -20,18 +20,18 @@ async-trait = "0.1.36" matrix-sdk-common-macros = { version = "0.1.0", path = "../matrix_sdk_common_macros" } matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } -olm-rs = { version = "0.5.0", features = ["serde"] } -serde = { version = "1.0.114", features = ["derive"] } -serde_json = "1.0.56" +olm-rs = { git = 'https://gitlab.gnome.org/jhaye/olm-rs/', features = ["serde"]} +serde = { version = "1.0.115", features = ["derive"] } +serde_json = "1.0.57" cjson = "0.1.1" zeroize = { version = "1.1.0", features = ["zeroize_derive"] } url = "2.1.1" # Misc dependencies thiserror = "1.0.20" -tracing = "0.1.16" -atomic = "0.4.6" -dashmap = "3.11.7" +tracing = "0.1.19" +atomic = "0.5.0" +dashmap = "3.11.10" [dependencies.tracing-futures] version = "0.2.4" diff --git a/matrix_sdk_crypto/src/verification/mod.rs b/matrix_sdk_crypto/src/verification/mod.rs index 2f2f23a2..db955382 100644 --- a/matrix_sdk_crypto/src/verification/mod.rs +++ b/matrix_sdk_crypto/src/verification/mod.rs @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#[allow(dead_code)] mod machine; #[allow(dead_code)] mod sas; diff --git a/matrix_sdk_test/Cargo.toml b/matrix_sdk_test/Cargo.toml index 17ca6f84..4c58f638 100644 --- a/matrix_sdk_test/Cargo.toml +++ b/matrix_sdk_test/Cargo.toml @@ -11,9 +11,9 @@ repository = "https://github.com/matrix-org/matrix-rust-sdk" version = "0.1.0" [dependencies] -serde_json = "1.0.56" +serde_json = "1.0.57" http = "0.2.1" matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-test-macros = { version = "0.1.0", path = "../matrix_sdk_test_macros" } lazy_static = "1.4.0" -serde = "1.0.114" +serde = "1.0.115"