From 42aacf7c45d37dfa47c823dae1df7e607d37c4d0 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Tue, 23 May 2023 05:00:38 -0700
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 13 +++++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 changelog.d/438.bugfix             |  1 -
 changelog.d/686.bugfix             |  1 -
 changelog.d/921.feature            |  1 -
 changelog.d/925.feature            |  1 -
 project.yml                        |  2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/438.bugfix
 delete mode 100644 changelog.d/686.bugfix
 delete mode 100644 changelog.d/921.feature
 delete mode 100644 changelog.d/925.feature

diff --git a/CHANGES.md b/CHANGES.md
index f18d9225c..21b38bc2a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+## Changes in 1.1.1 (2023-05-23)
+
+✨ Features
+
+- Redesigned the delivery status icon. ([#921](https://github.com/vector-im/element-x-ios/issues/921))
+- Add creation of a room, fetching the summary, so the room will be ready to be presented. ([#925](https://github.com/vector-im/element-x-ios/issues/925))
+
+🐛 Bugfixes
+
+- Stopping bg task when the app is suspended and the slidingSyncObserver is finished. ([#438](https://github.com/vector-im/element-x-ios/issues/438))
+- Added the context menu to the plain style. ([#686](https://github.com/vector-im/element-x-ios/issues/686))
+
+
 ## Changes in 1.1.0 (2023-05-18)
 
 ✨ Features
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 62d98ed33..6638d301b 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -4291,7 +4291,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4364,7 +4364,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/changelog.d/438.bugfix b/changelog.d/438.bugfix
deleted file mode 100644
index dfdec8560..000000000
--- a/changelog.d/438.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Stopping bg task when the app is suspended and the slidingSyncObserver is finished.
\ No newline at end of file
diff --git a/changelog.d/686.bugfix b/changelog.d/686.bugfix
deleted file mode 100644
index f4517e015..000000000
--- a/changelog.d/686.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added the context menu to the plain style.
\ No newline at end of file
diff --git a/changelog.d/921.feature b/changelog.d/921.feature
deleted file mode 100644
index d23b1c11d..000000000
--- a/changelog.d/921.feature
+++ /dev/null
@@ -1 +0,0 @@
-Redesigned the delivery status icon.
\ No newline at end of file
diff --git a/changelog.d/925.feature b/changelog.d/925.feature
deleted file mode 100644
index 2b7af1f40..000000000
--- a/changelog.d/925.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add creation of a room, fetching the summary, so the room will be ready to be presented.
\ No newline at end of file
diff --git a/project.yml b/project.yml
index fa64186e4..2a8adfd87 100644
--- a/project.yml
+++ b/project.yml
@@ -27,7 +27,7 @@ settings:
   APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER)
   BASE_BUNDLE_IDENTIFIER: io.element.elementx
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)
-  MARKETING_VERSION: 1.1.1
+  MARKETING_VERSION: 1.1.2
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT