Merge branch 'main' into ganfra/kotlin_bindings

Author: ganfra

Cargo.lock

@@ -19,8 +19,8 @@ resolver = "2"
 rust-version = "1.65"
 
 [workspace.dependencies]
-ruma = { git = "https://github.com/ruma/ruma", rev = "ed100afddb5fb30f1ccf368d7e712a3a483e63bf", features = ["client-api-c"] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "ed100afddb5fb30f1ccf368d7e712a3a483e63bf" }
+ruma = { git = "https://github.com/ruma/ruma", rev = "3211fccab0b58a9adab1c8a775c1a3a8cff4121d", features = ["client-api-c"] }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "3211fccab0b58a9adab1c8a775c1a3a8cff4121d" }
 tracing = { version = "0.1.36", default-features = false, features = ["std"] }
 uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "779e955f21a70e4aba43a7408f1841dcdf728b32" }
 uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "779e955f21a70e4aba43a7408f1841dcdf728b32" }

Cargo.toml

@@ -42,6 +42,22 @@ Some crates of the **matrix-rust-sdk** can be embedded inside other
 environments, like Swift, Kotlin, JavaScript, Node.js etc. Please,
 explore the [`bindings/`](./bindings/) directory to learn more.
 
+## Testing
+
+You can run most of the tests that also happen in CI also using `cargo xtask ci`.
+This needs a few dependencies to be installed, as it also runs automatic WASM tests:
+
+```bash
+rustup component add clippy
+cargo install cargo-nextest typos-cli wasm-pack
+```
+
+If you want to execute only one part of CI, there are a few sub-commands (see `cargo xtask ci --help`).
+
+Some tests are not automatically run in `cargo xtask ci`, for example the integration tests,
+that need a running synapse instance. These tests reside in `./testing/matrix-sdk-integration-testing`.
+See its [README](./testing/matrix-sdk-integration-testing/README.md) to easily set up a synapse for testing purposes.
+
 ## License
 
 [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0)

README.md

@@ -15,6 +15,7 @@ crate-type = ["cdylib", "staticlib"]
 [dependencies]
 anyhow = "1.0.57"
 base64 = "0.13.0"
+futures-util = "0.3.25"
 hmac = "0.12.1"
 http = "0.2.6"
 pbkdf2 = "0.11.0"

bindings/matrix-sdk-crypto-ffi/Cargo.toml

@@ -45,8 +45,8 @@ use ruma::{
 use serde::{Deserialize, Serialize};
 pub use users::UserIdentity;
 pub use verification::{
-    CancelInfo, ConfirmVerificationResult, QrCode, RequestVerificationResult, Sas, ScanResult,
-    StartSasResult, Verification, VerificationRequest,
+    CancelInfo, ConfirmVerificationResult, QrCode, RequestVerificationResult, Sas, SasListener,
+    SasState, ScanResult, StartSasResult, Verification, VerificationRequest,
 };
 
 /// Struct collecting data that is important to migrate to the rust-sdk