From b4111d57d72593876f95c266d2951674ce0c027e Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Fri, 18 Aug 2023 07:11:56 -0700
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 11 +++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 changelog.d/pr-1483.feature        |  1 -
 changelog.d/pr-1484.change         |  1 -
 project.yml                        |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/pr-1483.feature
 delete mode 100644 changelog.d/pr-1484.change

diff --git a/CHANGES.md b/CHANGES.md
index a0928d3df8..b726537018 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+## Changes in 1.2.4 (2023-08-18)
+
+✨ Features
+
+- Allow fuzzy searching for room list rooms ([#1483](https://github.com/vector-im/element-x-ios/pull/1483))
+
+🙌 Improvements
+
+- Use Compound ListRow instead of .xyzStyle(.compoundRow) ([#1484](https://github.com/vector-im/element-x-ios/pull/1484))
+
+
 ## Changes in 1.2.3 (2023-08-10)
 
 ✨ Features
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index c14afef9df..4b6442778f 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -5124,7 +5124,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5199,7 +5199,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/changelog.d/pr-1483.feature b/changelog.d/pr-1483.feature
deleted file mode 100644
index f457e41159..0000000000
--- a/changelog.d/pr-1483.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow fuzzy searching for room list rooms
\ No newline at end of file
diff --git a/changelog.d/pr-1484.change b/changelog.d/pr-1484.change
deleted file mode 100644
index 8cf19b1fd7..0000000000
--- a/changelog.d/pr-1484.change
+++ /dev/null
@@ -1 +0,0 @@
-Use Compound ListRow instead of .xyzStyle(.compoundRow)
\ No newline at end of file
diff --git a/project.yml b/project.yml
index 16875fec04..7883506dd0 100644
--- a/project.yml
+++ b/project.yml
@@ -29,7 +29,7 @@ settings:
   APP_NAME: ElementX
   APP_DISPLAY_NAME: Element X
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)
-  MARKETING_VERSION: 1.2.4
+  MARKETING_VERSION: 1.2.5
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT