matrix-sdk: Switch to upstream crates

This commit is contained in:
stoically 2020-05-12 15:47:37 +02:00
parent 890dbdaa39
commit aa42951f15
4 changed files with 3 additions and 9 deletions

View file

@ -38,7 +38,7 @@ jobs:
cd -
cd matrix_sdk_base
cargo test --target wasm32-unknown-unknown --no-default-features --features encryption
cargo test --target wasm32-unknown-unknown --no-default-features

View file

@ -7,6 +7,3 @@ members = [
"matrix_sdk_crypto",
"matrix_sdk_common",
]
[patch.crates-io]
olm-sys = { git = "https://gitlab.gnome.org/stoically/olm-sys", branch = "wasm-target" }

View file

@ -10,13 +10,10 @@ edition = "2018"
crate-type = ["cdylib"]
[dependencies]
matrix-sdk = { path = "../..", default-features = false, features = ["encryption"] }
matrix-sdk = { path = "../..", default-features = false }
url = "2.1.1"
wasm-bindgen = { version = "0.2.62", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.12"
web-sys = { version = "0.3.39", features = ["console"] }
[workspace]
[patch.crates-io]
olm-sys = { git = "https://gitlab.gnome.org/stoically/olm-sys", branch = "wasm-target" }

View file

@ -22,7 +22,7 @@ matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" }
olm-rs = { version = "0.5.0", features = ["serde"] }
serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.52"
cjson = { git = "https://github.com/stoically/cjson", rev = "24a82d94e339e27a62434493869f3dce62c60e0d" }
cjson = "0.1.0"
zeroize = { version = "1.1.0", features = ["zeroize_derive"] }
url = "2.1.1"