matrix-sdk: Switch to upstream crates

.travis.yml

@@ -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
 
 
 

Cargo.toml

@@ -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" }

matrix_sdk/examples/wasm_command_bot/Cargo.toml

@@ -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" }

matrix_sdk_crypto/Cargo.toml

@@ -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"