From 2272063765f7011125b0f4a82f0c0f6f7b37a5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 26 Dec 2025 16:37:48 +0100 Subject: [PATCH] Upgrade matrix-sdk and ruma --- Cargo.lock | 150 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 12 ++--- 2 files changed, 80 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e936c3e5..9c13e9c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,6 +201,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "async-once-cell" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" + [[package]] name = "async-recursion" version = "1.1.1" @@ -2341,45 +2347,6 @@ dependencies = [ "quote", ] -[[package]] -name = "indexed_db_futures" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ff41758cbd104e91033bb53bc449bec7eea65652960c81eddf3fc146ecea19" -dependencies = [ - "accessory", - "cfg-if", - "delegate-display", - "derive_more 2.0.1", - "fancy_constructor", - "futures-core", - "indexed_db_futures_macros_internal", - "js-sys", - "sealed", - "serde", - "serde-wasm-bindgen", - "smallvec", - "thiserror 2.0.17", - "tokio", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm_evt_listener", - "web-sys", - "web-time", -] - -[[package]] -name = "indexed_db_futures_macros_internal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caeba94923b68f254abef921cea7e7698bf4675fdd89d7c58bf1ed885b49a27d" -dependencies = [ - "macroific", - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "indexmap" version = "2.12.1" @@ -2868,13 +2835,14 @@ dependencies = [ [[package]] name = "matrix-sdk" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "anymap2", "aquamarine", "as_variant", "async-channel", + "async-once-cell", "async-stream", "async-trait", "axum", @@ -2926,8 +2894,8 @@ dependencies = [ [[package]] name = "matrix-sdk-base" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "as_variant", "async-trait", @@ -2953,8 +2921,8 @@ dependencies = [ [[package]] name = "matrix-sdk-common" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "eyeball-im", "futures-core", @@ -2976,8 +2944,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "aes", "aquamarine", @@ -3017,8 +2985,8 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "async-trait", "base64", @@ -3026,11 +2994,11 @@ dependencies = [ "getrandom 0.2.16", "gloo-utils", "hkdf", - "indexed_db_futures", "js-sys", "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", + "matrix_indexed_db_futures", "rmp-serde", "ruma", "serde", @@ -3048,8 +3016,8 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "byteorder", "qrcode", @@ -3060,8 +3028,8 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "as_variant", "async-trait", @@ -3087,8 +3055,8 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "base64", "blake3", @@ -3107,8 +3075,8 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" -version = "0.15.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=19b703611934e054f05062cf91bf5f9068e00d3f#19b703611934e054f05062cf91bf5f9068e00d3f" +version = "0.16.0" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=cd9f433358586e8717417fc043650f46362aa14c#cd9f433358586e8717417fc043650f46362aa14c" dependencies = [ "as_variant", "async-rx", @@ -3144,6 +3112,45 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "matrix_indexed_db_futures" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245ff6a224b4df7b0c90dda2dd5a6eb46112708d49e8bdd8b007fccb09fea8e4" +dependencies = [ + "accessory", + "cfg-if", + "delegate-display", + "derive_more 2.0.1", + "fancy_constructor", + "futures-core", + "js-sys", + "matrix_indexed_db_futures_macros_internal", + "sealed", + "serde", + "serde-wasm-bindgen", + "smallvec", + "thiserror 2.0.17", + "tokio", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm_evt_listener", + "web-sys", + "web-time", +] + +[[package]] +name = "matrix_indexed_db_futures_macros_internal" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b428aee5c0fe9e5babd29e99d289b7f64718c444989aac0442d1fd6d3e3f66d1" +dependencies = [ + "macroific", + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "memchr" version = "2.7.6" @@ -4038,8 +4045,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "070c1de99c5b1fe78827abfce71b858104a2d1dae8f19029ee52cd876e8d2654" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "assign", "js_int", @@ -4055,8 +4061,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2353d8d42b3aa0b58ed4187ef40fba3ed66d12c47201fd201803a122262985c" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "as_variant", "assign", @@ -4079,8 +4084,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d9223155004bd089d840d87a6b77dc17378657d0f597087eb0eb541a28c37e0" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "as_variant", "base64", @@ -4113,8 +4117,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ad82efa481b458c37ed3bdf47404bd41c8611d15336da387a0dd1e0f088689" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "as_variant", "indexmap", @@ -4140,8 +4143,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c464d081bcd3a677b1eef2e0f5db6b796acb7f5eed0a99ba501ca1423d2590ed" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "headers", "http", @@ -4160,8 +4162,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6dcd6e9823e177d15460d3cd3a413f38a2beea381f26aca1001c05cd6954ff" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "as_variant", "html5ever", @@ -4173,8 +4174,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c6b5643060beec0fc9d7acfb41d2c5d91e1591db440ff62361d178e77c35fe" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "js_int", "thiserror 2.0.17", @@ -4183,8 +4183,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffb3fa639bd851add9ca8a89200e6b8e00dd54cea9b21d39e8884e71e377633" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "cfg-if", "proc-macro-crate", @@ -4199,8 +4198,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146ace2cd59b60ec80d3e801a84e7e6a91e3e01d18a9f5d896ea7ca16a6b8e08" +source = "git+https://github.com/ruma/ruma.git?rev=a67081e402dce14365089b34f50489dacc9c53b5#a67081e402dce14365089b34f50489dacc9c53b5" dependencies = [ "base64", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 19d71b5e..751f455b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,23 +76,23 @@ sourceview = { version = "0.10", package = "sourceview5" } [dependencies.matrix-sdk] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "19b703611934e054f05062cf91bf5f9068e00d3f" +rev = "cd9f433358586e8717417fc043650f46362aa14c" features = ["socks", "sso-login", "markdown", "qrcode"] [dependencies.matrix-sdk-store-encryption] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "19b703611934e054f05062cf91bf5f9068e00d3f" +rev = "cd9f433358586e8717417fc043650f46362aa14c" [dependencies.matrix-sdk-ui] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "19b703611934e054f05062cf91bf5f9068e00d3f" +rev = "cd9f433358586e8717417fc043650f46362aa14c" [dependencies.ruma] -version = "0.14" -# git = "https://github.com/ruma/ruma.git" -# rev = "c441eccb92a36467217ff929cd71462fbeeeaf1a" +# version = "0.14" +git = "https://github.com/ruma/ruma.git" +rev = "a67081e402dce14365089b34f50489dacc9c53b5" features = [ "client-api-c", "markdown",