From 9a7a9c8d98f612cc368936ee2afe0cfbd83fb837 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Tue, 8 Aug 2023 03:59:20 -0700
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 16 ++++++++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 changelog.d/639.bugfix             |  1 -
 changelog.d/pr-1428.bugfix         |  1 -
 changelog.d/pr-1448.feature        |  1 -
 changelog.d/pr-1457.build          |  1 -
 project.yml                        |  2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/639.bugfix
 delete mode 100644 changelog.d/pr-1428.bugfix
 delete mode 100644 changelog.d/pr-1448.feature
 delete mode 100644 changelog.d/pr-1457.build

diff --git a/CHANGES.md b/CHANGES.md
index 013f6cf3f..80b484efb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+## Changes in 1.2.2 (2023-08-08)
+
+✨ Features
+
+- Display avatars full screen when tapping on them from the room or member detail screens ([#1448](https://github.com/vector-im/element-x-ios/pull/1448))
+
+🐛 Bugfixes
+
+- Fix a bug where media previews would sometimes dismiss to show the timeline with a big empty space at the bottom. ([#1428](https://github.com/vector-im/element-x-ios/pull/1428))
+- Send read receipts as messages are displayed instead of on opening/closing rooms. ([#639](https://github.com/vector-im/element-x-ios/issues/639))
+
+🧱 Build
+
+- Make CI upload dSyms to Sentry before releasing to GitHub to avoid tagging failed runs. ([#1457](https://github.com/vector-im/element-x-ios/pull/1457))
+
+
 ## Changes in 1.2.1 (2023-08-01)
 
 ✨ Features
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 4273a5605..620d97264 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -5049,7 +5049,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -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.2;
+				MARKETING_VERSION = 1.2.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/changelog.d/639.bugfix b/changelog.d/639.bugfix
deleted file mode 100644
index ab1eda069..000000000
--- a/changelog.d/639.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Send read receipts as messages are displayed instead of on opening/closing rooms.
\ No newline at end of file
diff --git a/changelog.d/pr-1428.bugfix b/changelog.d/pr-1428.bugfix
deleted file mode 100644
index c2d77f0ff..000000000
--- a/changelog.d/pr-1428.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where media previews would sometimes dismiss to show the timeline with a big empty space at the bottom.
\ No newline at end of file
diff --git a/changelog.d/pr-1448.feature b/changelog.d/pr-1448.feature
deleted file mode 100644
index d59c66eb0..000000000
--- a/changelog.d/pr-1448.feature
+++ /dev/null
@@ -1 +0,0 @@
-Display avatars full screen when tapping on them from the room or member detail screens
\ No newline at end of file
diff --git a/changelog.d/pr-1457.build b/changelog.d/pr-1457.build
deleted file mode 100644
index 9e6e67325..000000000
--- a/changelog.d/pr-1457.build
+++ /dev/null
@@ -1 +0,0 @@
-Make CI upload dSyms to Sentry before releasing to GitHub to avoid tagging failed runs.
\ No newline at end of file
diff --git a/project.yml b/project.yml
index 2d6a3a82b..6533b2f9d 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.2
+  MARKETING_VERSION: 1.2.3
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT