Skip to content

Commit 075988a

Browse files
Daniel SalinasDaniel Salinas
authored andcommitted
Move to uniffi 29.2
1 parent 5a40876 commit 075988a

File tree

11 files changed

+255
-125
lines changed

11 files changed

+255
-125
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ tracing = { version = "0.1.40", default-features = false, features = ["std"] }
9494
tracing-core = "0.1.32"
9595
tracing-subscriber = "0.3.18"
9696
unicode-normalization = "0.1.24"
97-
uniffi = { version = "0.28.0" }
98-
uniffi_bindgen = { version = "0.28.0" }
97+
uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "c7f6caa3d1bf20f934346cefd8e82b5093f0dc6f" }
98+
uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "c7f6caa3d1bf20f934346cefd8e82b5093f0dc6f" }
99+
uniffi_core = { git = "https://github.com/mozilla/uniffi-rs", rev = "c7f6caa3d1bf20f934346cefd8e82b5093f0dc6f" }
99100
url = "2.5.4"
100101
uuid = "1.12.1"
101102
vodozemac = { version = "0.9.0", features = ["insecure-pk-encryption"] }

bindings/matrix-sdk-ffi-macros/src/lib.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ pub fn export(attr: TokenStream, item: TokenStream) -> TokenStream {
5151

5252
let res = match syn::parse(item) {
5353
Ok(item) => match has_async_fn(item) {
54-
true => quote! { #[uniffi::export(async_runtime = "tokio", #attr2)] },
54+
true => {
55+
quote! {
56+
#[cfg_attr(target_arch = "wasm32", uniffi::export(#attr2))]
57+
#[cfg_attr(not(target_arch = "wasm32"), uniffi::export(async_runtime = "tokio", #attr2))]
58+
}
59+
}
5560
false => quote! { #[uniffi::export(#attr2)] },
5661
},
5762
Err(e) => e.into_compile_error(),

0 commit comments

Comments
 (0)