From 691166879dbc126c04b9be2b29239db550fc37bc Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Thu, 14 Dec 2023 12:33:34 +0100 Subject: [PATCH 1/2] Version 2.22.0 --- CHANGELOG.md | 7 +++++++ Cargo.lock | 6 +++--- bindings/wysiwyg-ffi/Cargo.toml | 2 +- bindings/wysiwyg-wasm/Cargo.toml | 2 +- bindings/wysiwyg-wasm/package-lock.json | 4 ++-- bindings/wysiwyg-wasm/package.json | 2 +- crates/wysiwyg/Cargo.toml | 2 +- platforms/android/gradle.properties | 2 +- platforms/web/package.json | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e4bb98f3..1c5cb874e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +# [2.22.0] - 2023-12-06 + +### Fixed +- [Android] Fix for user suggestions not updating the RTE text properly sometimes. +- [Android] Fix for the editor crashign after entering right, next to a mention. +- [iOS] Fix for shift+enter key not working properly and refactored the Key Commands handling. +- [Rust] Fix for markdown mode now correctly parsing multilined text. # [2.21.0] - 2023-12-06 diff --git a/Cargo.lock b/Cargo.lock index 195411538..eecb8a380 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1551,7 +1551,7 @@ dependencies = [ [[package]] name = "uniffi-wysiwyg-composer" -version = "2.21.0" +version = "2.22.0" dependencies = [ "matrix_mentions", "uniffi", @@ -2020,7 +2020,7 @@ dependencies = [ [[package]] name = "wysiwyg" -version = "2.21.0" +version = "2.22.0" dependencies = [ "cfg-if", "email_address", @@ -2044,7 +2044,7 @@ dependencies = [ [[package]] name = "wysiwyg-wasm" -version = "2.21.0" +version = "2.22.0" dependencies = [ "console_error_panic_hook", "js-sys", diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml index a01d94ce4..6636ab212 100644 --- 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.21.0" +version = "2.22.0" rust-version = { workspace = true } [features] diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml index fe38fbc10..c143bf0e2 100644 --- 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.21.0" +version = "2.22.0" 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 index 9cb8cb7a1..8e233f16a 100644 --- a/bindings/wysiwyg-wasm/package-lock.json +++ b/bindings/wysiwyg-wasm/package-lock.json @@ -1,12 +1,12 @@ { "name": "wysiwyg-wasm", - "version": "2.21.0", + "version": "2.22.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wysiwyg-wasm", - "version": "2.21.0", + "version": "2.22.0", "license": "Apache-2.0", "devDependencies": { "jest": "^28.1.0", diff --git a/bindings/wysiwyg-wasm/package.json b/bindings/wysiwyg-wasm/package.json index ee38e9c20..f5a2f048d 100644 --- a/bindings/wysiwyg-wasm/package.json +++ b/bindings/wysiwyg-wasm/package.json @@ -1,6 +1,6 @@ { "name": "wysiwyg-wasm", - "version": "2.21.0", + "version": "2.22.0", "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 index d949ca0b6..762366e91 100644 --- 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.21.0" +version = "2.22.0" rust-version = { workspace = true } [features] diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties index 8cbb905cc..a4f9414e6 100644 --- 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.21.0 +VERSION_NAME=2.22.0 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 index 67f58c425..402cf2065 100644 --- a/platforms/web/package.json +++ b/platforms/web/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/matrix-wysiwyg", - "version": "2.21.0", + "version": "2.22.0", "type": "module", "description": "Wysiwyg composer for matrix.org using React", "author": "matrix.org", From daa4122e928239ea5f4e51b95b2bc0d0a62a4c67 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Thu, 14 Dec 2023 15:43:39 +0100 Subject: [PATCH 2/2] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5cb874e..62bd565fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ### Fixed - [Android] Fix for user suggestions not updating the RTE text properly sometimes. -- [Android] Fix for the editor crashign after entering right, next to a mention. +- [Common] Fix for the editor crashing when adding a new line just after a mention. - [iOS] Fix for shift+enter key not working properly and refactored the Key Commands handling. - [Rust] Fix for markdown mode now correctly parsing multilined text.