diff --git a/Cargo.toml b/Cargo.toml index 9f770a43..574ea190 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,8 @@ members = [ "bindings/cashu-ffi", "bindings/cashu-sdk-ffi" ] +resolver = "2" + [workspace.package] license = "BSD-3-Clause" @@ -26,8 +28,8 @@ keywords = ["bitcoin", "e-cash", "cashu"] serde = { version = "1.0.160", features = ["derive"]} serde_json = "1.0.96" url = "2.3.1" -tokio = { version = "1", default-features = false } -tracing = "0.1" +tokio = { version = "1.32", default-features = false } +tracing = { version = "0.1", default-features = false } tracing-subscriber = "0.3" uniffi = "0.24" diff --git a/crates/cashu-sdk/Cargo.toml b/crates/cashu-sdk/Cargo.toml index c9df4a41..1f5639c6 100644 --- a/crates/cashu-sdk/Cargo.toml +++ b/crates/cashu-sdk/Cargo.toml @@ -11,8 +11,8 @@ license.workspace = true [features] default = ["mint", "wallet"] mint = ["cashu/mint"] -blocking = ["once_cell"] -wallet = ["cashu/wallet", "minreq", "once_cell"] +blocking = ["dep:once_cell"] +wallet = ["cashu/wallet", "dep:minreq", "dep:once_cell"] # Fix: Should be minreq or gloo @@ -31,13 +31,13 @@ tracing = { workspace = true } futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] } once_cell = { version = "1.17", optional = true } - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "time", "macros", "sync"] } minreq = { version = "2.7.0", optional = true, features = ["json-using-serde", "https"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -tokio = { workspace = true, features = ["rt", "macros", "sync"] } +tokio = { workspace = true, features = ["rt", "macros", "sync", "time"] } gloo = { version = "0.10.0", features = ["net"]} + diff --git a/crates/cashu-sdk/src/lib.rs b/crates/cashu-sdk/src/lib.rs index b6f8a158..9914c783 100644 --- a/crates/cashu-sdk/src/lib.rs +++ b/crates/cashu-sdk/src/lib.rs @@ -1,3 +1,6 @@ +#[cfg(all(target_arch = "wasm32", feature = "blocking"))] +compile_error!("`blocking` feature can't be enabled for WASM targets"); + #[cfg(feature = "blocking")] use once_cell::sync::Lazy; #[cfg(feature = "blocking")]