Skip to content

Commit

Permalink
Merge pull request #183 from matrix-org/release-v12.1.0
Browse files Browse the repository at this point in the history
Release v12.1.0
  • Loading branch information
andybalaam authored Dec 19, 2024
2 parents a2f753d + 21f7cc7 commit 4edf96c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# UNRELEASED

# matrix-sdk-crypto-wasm v12.1.0

- Update matrix-rusk-sdk to `37c17cf854a70f` for the fix for
https://github.com/matrix-org/matrix-rust-sdk/issues/4424

# matrix-sdk-crypto-wasm v12.0.0

- Update matrix-rusk-sdk to `e99939db857ca`.
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ console_error_panic_hook = "0.1.7"
futures-util = "0.3.27"
http = "1.1.0"
js-sys = "0.3.49"
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", features = ["js"] }
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["e2e-encryption"] }
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", optional = true }
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", features = ["js"], branch="release-for-crypto-wasm-12" }
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["e2e-encryption"], branch="release-for-crypto-wasm-12" }
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", optional = true, branch="release-for-crypto-wasm-12" }
serde = "1.0.91"
serde_json = "1.0.91"
serde-wasm-bindgen = "0.5.0"
Expand All @@ -84,6 +84,7 @@ vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] }
git = "https://github.com/matrix-org/matrix-rust-sdk"
default_features = false
features = ["js", "automatic-room-key-forwarding"]
branch = "release-for-crypto-wasm-12"

[lints.rust]
# Workaround for https://github.com/rustwasm/wasm-bindgen/issues/4283, while we work up the courage to upgrade
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@matrix-org/matrix-sdk-crypto-wasm",
"version": "12.0.0",
"version": "12.1.0",
"homepage": "https://github.com/matrix-org/matrix-rust-sdk-wasm",
"description": "WebAssembly bindings of the matrix-sdk-crypto encryption library",
"license": "Apache-2.0",
Expand Down

0 comments on commit 4edf96c

Please sign in to comment.