Merge pull request #1010 from matrix-org/version-2.37.5

matrix-org · Jul 8, 2024 · 5668601 · 5668601
2 parents 7488319 + 412f140
commit 5668601
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# [2.37.5] - 2024-06-20
+- [Rust] Fixed a crash that happened when entering a new line after setting through html a blockquote containing a single line.
+- [Common] Updated dependencies.
+
 # [2.37.4] - 2024-06-20
 - [Android] Make `CustomMentionSpan` public.
 - [Rust] Escape text passed to `ComposerModel::set_link_with_text` and `insert_mention*` methods.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
@@ -7,7 +7,7 @@ description = "Swift and Kotlin bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "uniffi-wysiwyg-composer"
-version = "2.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [features]

diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
@@ -7,7 +7,7 @@ description = "WASM bindings for wysiwyg-rust"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg-wasm"
-version = "2.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [package.metadata.wasm-pack.profile.profiling]

diff --git a/bindings/wysiwyg-wasm/package-lock.json b/bindings/wysiwyg-wasm/package-lock.json
diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.37.4",
+  "version": "2.37.5",
   "homepage": "https://gitlab.com/andybalaam/wysiwyg-rust",
   "description": "WASM bindings for wysiwyg-rust",
   "license": "Apache-2.0",

diff --git a/crates/wysiwyg/Cargo.toml b/crates/wysiwyg/Cargo.toml
@@ -7,7 +7,7 @@ description = "Model code to power a rich text editor for Matrix"
 keywords = ["matrix", "chat", "messaging", "composer", "wysiwyg"]
 license = "Apache-2.0"
 name = "wysiwyg"
-version = "2.37.4"
+version = "2.37.5"
 rust-version = { workspace = true }
 
 [features]

diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
@@ -27,7 +27,7 @@ RELEASE_SIGNING_ENABLED=true
 
 GROUP=io.element.android
 # POM_ARTIFACT_ID is configured in each module's gradle.properties
-VERSION_NAME=2.37.4
+VERSION_NAME=2.37.5
 
 POM_NAME=Matrix WYSIWYG
 POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.

diff --git a/platforms/web/package.json b/platforms/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-wysiwyg",
-    "version": "2.37.4",
+    "version": "2.37.5",
     "type": "module",
     "description": "Wysiwyg composer for matrix.org using React",
     "author": "matrix.org",