mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-14 11:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #963 from gnunicorn/ben-update-ruma

Browse Source 
chore: Update ruma
This commit is contained in:
Benjamin Kampmann
2022-08-18 16:13:15 +02:00
committed by GitHub
parent 3581d83389 549c829000
commit 68107e6285
16 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@@ -3551,7 +3551,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.6.3"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"assign",
"js_int",
@@ -3564,7 +3564,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.6.0"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"ruma-common",
"serde",
@@ -3574,7 +3574,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.14.1"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"assign",
"bytes",
@@ -3590,7 +3590,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.9.2"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"base64",
"bytes",
@@ -3620,7 +3620,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.5.0"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"js_int",
"ruma-common",
@@ -3631,7 +3631,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.8.1"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"js_int",
"thiserror",
@@ -3640,7 +3640,7 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.9.2"
source = "git+https://github.com/ruma/ruma?rev=1dbb2d9561379c2de5e7901f81d5d5d16d0fb456#1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
source = "git+https://github.com/ruma/ruma?rev=2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a#2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
dependencies = [
"once_cell",
"proc-macro-crate",

2
benchmarks/Cargo.toml
View File

@@ -12,7 +12,7 @@ criterion = { version = "0.3.5", features = ["async", "async_tokio", "html_repor
matrix-sdk-crypto = { path = "../crates/matrix-sdk-crypto", version = "0.5.0" }
matrix-sdk-sled = { path = "../crates/matrix-sdk-sled", version = "0.1.0", default-features = false, features = ["crypto-store"] }
matrix-sdk-test = { path = "../testing/matrix-sdk-test", version = "0.5.0" }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456" }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a" }
serde_json = "1.0.79"
tempfile = "3.3.0"
tokio = { version = "1.17.0", default-features = false, features = ["rt-multi-thread"] }

2
bindings/matrix-sdk-crypto-ffi/Cargo.toml
View File

@@ -20,7 +20,7 @@ hmac = "0.12.1"
http = "0.2.6"
pbkdf2 = "0.11.0"
rand = "0.8.5"
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c"] }
serde = "1.0.136"
serde_json = "1.0.79"
sha2 = "0.10.2"

2
bindings/matrix-sdk-crypto-js/Cargo.toml
View File

@@ -28,7 +28,7 @@ tracing = []
[dependencies]
matrix-sdk-common = { version = "0.5.0", path = "../../crates/matrix-sdk-common" }
matrix-sdk-crypto = { version = "0.5.0", path = "../../crates/matrix-sdk-crypto" }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c", "js", "rand", "unstable-msc2676", "unstable-msc2677"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c", "js", "rand", "unstable-msc2676", "unstable-msc2677"] }
wasm-bindgen = "0.2.80"
wasm-bindgen-futures = "0.4.30"
js-sys = "0.3.49"

2
bindings/matrix-sdk-crypto-nodejs/Cargo.toml
View File

@@ -26,7 +26,7 @@ tracing = ["dep:tracing-subscriber"]
matrix-sdk-crypto = { version = "0.5.0", path = "../../crates/matrix-sdk-crypto" }
matrix-sdk-common = { version = "0.5.0", path = "../../crates/matrix-sdk-common" }
matrix-sdk-sled = { version = "0.1.0", path = "../../crates/matrix-sdk-sled", default-features = false, features = ["crypto-store"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c", "rand", "unstable-msc2676", "unstable-msc2677"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c", "rand", "unstable-msc2676", "unstable-msc2677"] }
napi = { git = "https://github.com/Hywan/napi-rs", branch = "fix-napi-strict-on-t-and-ref-t", default-features = false, features = ["napi6", "tokio_rt"] }
napi-derive = { git = "https://github.com/Hywan/napi-rs", branch = "fix-napi-strict-on-t-and-ref-t" }
serde_json = "1.0.79"

2
crates/matrix-sdk-appservice/Cargo.toml
View File

@@ -34,7 +34,7 @@ http = "0.2.6"
matrix-sdk = { version = "0.5.0", path = "../matrix-sdk", default-features = false, features = ["appservice"] }
percent-encoding = "2.1.0"
regex = "1.5.5"
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c", "appservice-api-s"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c", "appservice-api-s"] }
serde = "1.0.136"
serde_json = "1.0.79"
serde_yaml = "0.9.4"

4
crates/matrix-sdk-base/Cargo.toml
View File

@@ -44,10 +44,10 @@ tracing = "0.1.34"
zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
[target.'cfg(target_arch = "wasm32")'.dependencies]
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c", "js", "canonical-json"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c", "js", "canonical-json"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c", "canonical-json"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c", "canonical-json"] }
[dev-dependencies]
futures = { version = "0.3.21", default-features = false, features = ["executor"] }

2
crates/matrix-sdk-common/Cargo.toml
View File

@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
[dependencies]
futures-core = "0.3.21"
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c"] }
serde = "1.0.136"
[target.'cfg(target_arch = "wasm32")'.dependencies]

9
crates/matrix-sdk-common/src/deserialized_responses.rs
View File

@@ -3,9 +3,12 @@ use std::{borrow::Borrow, collections::BTreeMap};
use ruma::{
api::client::{
push::get_notifications::v3::Notification,
sync::sync_events::v3::{
DeviceLists, Ephemeral, GlobalAccountData, InvitedRoom, Presence, RoomAccountData,
State, ToDevice, UnreadNotificationsCount as RumaUnreadNotificationsCount,
sync::sync_events::{
v3::{
DeviceLists, Ephemeral, GlobalAccountData, InvitedRoom, Presence, RoomAccountData,
State, ToDevice,
},
UnreadNotificationsCount as RumaUnreadNotificationsCount,
},
},
events::{

4
crates/matrix-sdk-crypto/Cargo.toml
View File

@@ -52,12 +52,12 @@ tokio = { version = "1.18", default-features = false, features = ["time"] }
[target.'cfg(target_arch = "wasm32")'.dependencies.ruma]
git = "https://github.com/ruma/ruma"
rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
features = ["client-api-c", "js", "rand", "canonical-json", "unstable-msc2676", "unstable-msc2677"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.ruma]
git = "https://github.com/ruma/ruma"
rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
features = ["client-api-c", "rand", "canonical-json", "unstable-msc2676", "unstable-msc2677"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.vodozemac]

2
crates/matrix-sdk-indexeddb/Cargo.toml
View File

@@ -31,7 +31,7 @@ js-sys = { version = "0.3.58" }
matrix-sdk-base = { version = "0.5.0", path = "../matrix-sdk-base" }
matrix-sdk-crypto = { version = "0.5.0", path = "../matrix-sdk-crypto", optional = true }
matrix-sdk-store-encryption = { version = "0.1.0", path = "../matrix-sdk-store-encryption" }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456" }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a" }
serde = "1.0.136"
serde_json = "1.0.79"
thiserror = "1.0.30"

2
crates/matrix-sdk-qrcode/Cargo.toml
View File

@@ -27,7 +27,7 @@ byteorder = "1.4.3"
image = { version = "0.23.0", optional = true }
qrcode = { version = "0.12.0", default-features = false }
rqrr = { version = "0.4.0", optional = true }
ruma-common = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456" }
ruma-common = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a" }
thiserror = "1.0.30"
[dependencies.vodozemac]

2
crates/matrix-sdk-sled/Cargo.toml
View File

@@ -39,7 +39,7 @@ matrix-sdk-base = { version = "0.5.0", path = "../matrix-sdk-base", optional = t
matrix-sdk-common = { version = "0.5.0", path = "../matrix-sdk-common" }
matrix-sdk-crypto = { version = "0.5.0", path = "../matrix-sdk-crypto", optional = true }
matrix-sdk-store-encryption = { version = "0.1.0", path = "../matrix-sdk-store-encryption" }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456" }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a" }
serde = "1.0.136"
serde_json = "1.0.79"
sled = "0.34.7"

2
crates/matrix-sdk/Cargo.toml
View File

@@ -112,7 +112,7 @@ default_features = false
[dependencies.ruma]
git = "https://github.com/ruma/ruma"
rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456"
rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a"
features = ["client-api-c", "compat", "rand", "unstable-msc2448", "unstable-msc2965"]
[dependencies.tokio-stream]

2
labs/sled-state-inspector/Cargo.toml
View File

@@ -14,7 +14,7 @@ clap = "3.2.4"
futures = { version = "0.3.21", default-features = false, features = ["executor"] }
matrix-sdk-base = { path = "../../crates/matrix-sdk-base", version = "0.5.0" }
matrix-sdk-sled = { path = "../../crates/matrix-sdk-sled", version = "0.1.0" }
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456" }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a" }
rustyline = "10.0.0"
rustyline-derive = "0.7.0"
serde = "1.0.136"

2
testing/matrix-sdk-test/Cargo.toml
View File

@@ -23,7 +23,7 @@ appservice = []
http = "0.2.6"
matrix-sdk-test-macros = { version = "0.2.0", path = "../matrix-sdk-test-macros" }
once_cell = "1.10.0"
ruma = { git = "https://github.com/ruma/ruma", rev = "1dbb2d9561379c2de5e7901f81d5d5d16d0fb456", features = ["client-api-c"] }
ruma = { git = "https://github.com/ruma/ruma", rev = "2b4ac409810b38dbbdd9893b6ec6ee52f5850d4a", features = ["client-api-c"] }
serde = "1.0.136"
serde_json = "1.0.79"