Version 2.12.0 (#815)

matrix-org · Sep 18, 2023 · 0ea1686 · 0ea1686
1 parent 6f862ed
commit 0ea1686
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 20 deletions.
diff --git 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
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.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
@@ -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
diff --git 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
@@ -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
@@ -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/...ompose/src/androidTest/java/io/element/android/wysiwyg/compose/RichTextEditorStyleTest.kt b/...ompose/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
@@ -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",