Skip to content

Commit e0e9256

Browse files
committed
chore(ffi): use ruma's built-in uniffi support for power levels
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
1 parent ce0bba5 commit e0e9256

File tree

6 files changed

+128
-47
lines changed

6 files changed

+128
-47
lines changed

.deny.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,7 @@ allow-git = [
5252
# on releases.
5353
"https://github.com/matrix-org/vodozemac",
5454
# A patch override for the bindings: https://github.com/Alorel/rust-indexed-db/pull/72
55-
"https://github.com/matrix-org/rust-indexed-db"
55+
"https://github.com/matrix-org/rust-indexed-db",
56+
# Required for the unstable-uniffi feature in ruma
57+
"https://github.com/mozilla/uniffi-rs"
5658
]

Cargo.lock

Lines changed: 109 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ rand = { version = "0.8.5", default-features = false, features = ["std", "std_rn
7171
regex = { version = "1.12.2", default-features = false }
7272
reqwest = { version = "0.12.24", default-features = false }
7373
rmp-serde = { version = "1.3.0", default-features = false }
74-
ruma = { git = "https://github.com/ruma/ruma", rev = "289bee87974bd3c2ad14a6c15801c80b683b67dc", features = [
74+
ruma = { git = "https://github.com/ruma/ruma", rev = "43d940f79847e7ff1443266a84591f049018830d", features = [
7575
"client-api-c",
7676
"compat-unset-avatar",
7777
"compat-upload-signatures",
@@ -113,7 +113,7 @@ tracing-core = { version = "0.1.34", default-features = false }
113113
tracing-subscriber = { version = "0.3.20", default-features = false, features = ["std", "smallvec", "fmt"] }
114114
unicode-normalization = { version = "0.1.25", default-features = false }
115115
unicode-segmentation = { version = "1.12.0", default-features = false }
116-
uniffi = { version = "0.31.0", default-features = false, features = ["cargo-metadata"] }
116+
uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "e5f4821410bea19e71984ea5e06a7bc8b11ed9e5", default-features = false, features = ["cargo-metadata"] }
117117
uniffi_bindgen = { version = "0.31.0", default-features = false, features = ["cargo-metadata"] }
118118
url = { version = "2.5.7", default-features = false }
119119
uuid = { version = "1.18.1", default-features = false }

bindings/matrix-sdk-ffi/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ All notable changes to this project will be documented in this file.
3131

3232
### Features
3333

34+
- Enable `unstable-uniffi` feature in ruma and use ruma types directly in the power levels API.
35+
([#6161](https://github.com/matrix-org/matrix-rust-sdk/pull/6161/))
3436
- Add `NotificationItem::raw_event` to get the raw event content of the event that triggered the notification, which can be useful for debugging and to support clients that want to implement custom handling for certain notifications. ([#6122](https://github.com/matrix-org/matrix-rust-sdk/pull/6122))
3537
- [**breaking**] Extend `TimelineFocus::Event` to allow marking the target
3638
event as the root of a thread.

bindings/matrix-sdk-ffi/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ ruma = { workspace = true, features = [
8888
"unstable-msc2545",
8989
# Room language event type
9090
"unstable-msc4334",
91+
"unstable-uniffi",
9192
] }
9293
serde.workspace = true
9394
serde_json.workspace = true

0 commit comments

Comments
 (0)