char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

matrix-sdk: Switch to upstream crates

master
stoically 2020-05-12 15:47:37 +02:00
parent 890dbdaa39
commit aa42951f15
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

3
Cargo.toml
View File

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

5
matrix_sdk/examples/wasm_command_bot/Cargo.toml
View File

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

2
matrix_sdk_crypto/Cargo.toml
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"] } olm-rs = { version = "0.5.0", features = ["serde"] }
serde = { version = "1.0.106", features = ["derive"] } serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.52" 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"] } zeroize = { version = "1.1.0", features = ["zeroize_derive"] }
url = "2.1.1" url = "2.1.1"