From 0ea16866d9c38170e8fa125fe3f245720e17279b Mon Sep 17 00:00:00 2001 From: jonnyandrew Date: Mon, 18 Sep 2023 13:28:50 +0100 Subject: [PATCH] Version 2.12.0 (#815) --- CHANGELOG.md | 14 ++++++++++++++ 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 +- .../wysiwyg/compose/RichTextEditorStyleTest.kt | 9 --------- platforms/web/package.json | 2 +- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b04fece50..1f3bfc644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +# [2.12.0] - 2023-09-18 + +### Added + +- Android: Add customisation options for links and code (#813) + +### Changed + +- Android: [API breaking change] Simplifiy API for setting code background (#813) + +### Fixed + +- iOS: Fix code block and inline code fonts (#814) + # [2.11.0] - 2023-09-15 - iOS: Add API to change the text view placeholder color (#810) diff --git a/Cargo.lock b/Cargo.lock index 99bb9b063..ea2a84112 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1401,7 +1401,7 @@ dependencies = [ [[package]] name = "uniffi-wysiwyg-composer" -version = "2.11.0" +version = "2.12.0" dependencies = [ "uniffi", "uniffi_build", @@ -1839,7 +1839,7 @@ dependencies = [ [[package]] name = "wysiwyg" -version = "2.11.0" +version = "2.12.0" dependencies = [ "cfg-if", "email_address", @@ -1862,7 +1862,7 @@ dependencies = [ [[package]] name = "wysiwyg-wasm" -version = "2.11.0" +version = "2.12.0" dependencies = [ "console_error_panic_hook", "js-sys", diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml index 942384901..299dbdae8 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.11.0" +version = "2.12.0" rust-version = { workspace = true } [features] diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml index 9469538aa..e3be99a68 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.11.0" +version = "2.12.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 e003d2739..10095330c 100644 --- a/bindings/wysiwyg-wasm/package-lock.json +++ b/bindings/wysiwyg-wasm/package-lock.json @@ -1,12 +1,12 @@ { "name": "wysiwyg-wasm", - "version": "2.11.0", + "version": "2.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wysiwyg-wasm", - "version": "2.11.0", + "version": "2.12.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 9009563b7..a518623e1 100644 --- a/bindings/wysiwyg-wasm/package.json +++ b/bindings/wysiwyg-wasm/package.json @@ -1,6 +1,6 @@ { "name": "wysiwyg-wasm", - "version": "2.11.0", + "version": "2.12.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 e6101e2c8..c5bef8589 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.11.0" +version = "2.12.0" rust-version = { workspace = true } [features] diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties index a45f9aec6..d9234fedf 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.11.0 +VERSION_NAME=2.12.0 POM_NAME=Matrix WYSIWYG POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output. diff --git a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt index 5815ffe6b..4e262186f 100644 --- a/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt +++ b/platforms/android/library-compose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt @@ -43,15 +43,6 @@ class RichTextEditorStyleTest { .check(matches(withText("Hello, world"))) } - @Test(expected = NotFoundException::class) - fun testBadResourceThrows() = runTest { - showContent() - - codeBgColor.emit(Color.Red) - - composeTestRule.awaitIdle() - } - private fun showContent() = composeTestRule.setContent { val bulletRadius by bulletRadius.collectAsState() diff --git a/platforms/web/package.json b/platforms/web/package.json index 8f01a307d..01053676e 100644 --- a/platforms/web/package.json +++ b/platforms/web/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/matrix-wysiwyg", - "version": "2.11.0", + "version": "2.12.0", "type": "module", "description": "Wysiwyg composer for matrix.org using React", "author": "matrix.org",