From 4e6ed9b966884b04d0b73e1ae4a091127b380d61 Mon Sep 17 00:00:00 2001
From: aringenbach <80891108+aringenbach@users.noreply.github.com>
Date: Wed, 26 Jul 2023 14:40:11 +0200
Subject: [PATCH] Version 2.4.0 (#750)

---
 CHANGELOG.md                            | 13 +++++++++++++
 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, 24 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0b372d79..bd9ca0321 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+# [2.4.0] - 2023-07-26
+
+### Changed
+
+- Common: API for getting Markdown content now depends on context (composer usage or final output)
+- Common: Set Rust version to 1.71 and Uniffi version to 0.24.1
+
+### Fixed
+
+- Common: Fix an inconsistency with code blocks when parsing back and forth between Markdown & HTML
+- iOS: Fixed XCFramework hierarchy to avoid modulemap files conflicting with other C or Rust libraries
+- iOS: Fixed an issue with Uniffi C symbols conflicting with other Rust libraries in a shared namespace
+
 # [2.3.1] - 2023-06-30
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index 834126fab..e9526e795 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1401,7 +1401,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi-wysiwyg-composer"
-version = "2.3.1"
+version = "2.4.0"
 dependencies = [
  "uniffi",
  "uniffi_build",
@@ -1839,7 +1839,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg"
-version = "2.3.1"
+version = "2.4.0"
 dependencies = [
  "cfg-if",
  "email_address",
@@ -1862,7 +1862,7 @@ dependencies = [
 
 [[package]]
 name = "wysiwyg-wasm"
-version = "2.3.1"
+version = "2.4.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
diff --git a/bindings/wysiwyg-ffi/Cargo.toml b/bindings/wysiwyg-ffi/Cargo.toml
index daf0a85bb..440c09e9c 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.3.1"
+version = "2.4.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/bindings/wysiwyg-wasm/Cargo.toml b/bindings/wysiwyg-wasm/Cargo.toml
index 3c2f6186e..4141ec926 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.3.1"
+version = "2.4.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 448357bd8..7891f29fe 100644
--- a/bindings/wysiwyg-wasm/package-lock.json
+++ b/bindings/wysiwyg-wasm/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wysiwyg-wasm",
-      "version": "2.3.1",
+      "version": "2.4.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 1c8f5b39a..1b4f6fba8 100644
--- a/bindings/wysiwyg-wasm/package.json
+++ b/bindings/wysiwyg-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysiwyg-wasm",
-  "version": "2.3.1",
+  "version": "2.4.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 bb306e95a..1d27a535f 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.3.1"
+version = "2.4.0"
 rust-version = { workspace = true }
 
 [features]
diff --git a/platforms/android/gradle.properties b/platforms/android/gradle.properties
index c154eadef..913606dd8 100644
--- a/platforms/android/gradle.properties
+++ b/platforms/android/gradle.properties
@@ -30,7 +30,7 @@ RELEASE_SIGNING_ENABLED=true
 
 GROUP=io.element.android
 POM_ARTIFACT_ID=wysiwyg
-VERSION_NAME=2.3.1
+VERSION_NAME=2.4.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 057408ded..b399dce27 100644
--- a/platforms/web/package.json
+++ b/platforms/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@matrix-org/matrix-wysiwyg",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "type": "module",
     "description": "Wysiwyg composer for matrix.org using React",
     "author": "matrix.org",