diff --git a/Cargo.lock b/Cargo.lock index 0291977d..07df89e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5109,7 +5109,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.14.1" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "assign", "js_int", @@ -5124,7 +5124,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.22.1" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "as_variant", "assign", @@ -5147,7 +5147,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.17.1" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "as_variant", "base64", @@ -5179,7 +5179,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.32.1" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "as_variant", "indexmap 2.13.0", @@ -5201,7 +5201,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.6.0" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "as_variant", "html5ever", @@ -5212,7 +5212,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.0" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "js_int", "thiserror 2.0.17", @@ -5221,7 +5221,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.17.1" -source = "git+https://github.com/project-robius/ruma.git?branch=tsp#98196b1db32d3393216f31d2c085a7082bd1d28d" +source = "git+https://github.com/project-robius/ruma.git?branch=tolerant_sliding_sync_strings#1f1b25a96227d0435570ba5508c159bf508194ac" dependencies = [ "as_variant", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index 381ee34c..c00b7a20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,7 +166,11 @@ askar-storage = { git = "https://github.com/openwallet-foundation/askar.git" } ## Note: matrix-sdk currently uses a git dependency for ruma, ## so we patch the git source, not crates-io. [patch."https://github.com/ruma/ruma"] -ruma = { git = "https://github.com/project-robius/ruma.git", branch = "tsp" } +## Temporary: the `tolerant_sliding_sync_strings` branch makes simplified sliding sync +## tolerate non-string name/avatar fields instead of failing the whole response. +## Revert to the `tsp` branch once that fix is merged into it. See: +## https://github.com/project-robius/robrix/issues/886 +ruma = { git = "https://github.com/project-robius/ruma.git", branch = "tolerant_sliding_sync_strings" } [build-dependencies] toml = "1"