From 3015896d46af53096331c3de8b49272411ef2344 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Fri, 3 Feb 2023 06:21:42 -0800
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 13 +++++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 changelog.d/430.change             |  1 -
 changelog.d/500.bugfix             |  1 -
 changelog.d/pr-502.change          |  1 -
 changelog.d/pr-514.change          |  1 -
 project.yml                        |  2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/430.change
 delete mode 100644 changelog.d/500.bugfix
 delete mode 100644 changelog.d/pr-502.change
 delete mode 100644 changelog.d/pr-514.change

diff --git a/CHANGES.md b/CHANGES.md
index e18d6caa7..c1d3c12fc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+## Changes in 1.0.17 (2023-02-03)
+
+🙌 Improvements
+
+- Hardcode the sliding sync proxy to matrix.org for FOSDEM demo. ([#502](https://github.com/vector-im/element-x-ios/pull/502))
+- Add different states for a room's last message to distinguish loading from loaded from unknown. ([#514](https://github.com/vector-im/element-x-ios/pull/514))
+- Finish the design review ready for a public TestFlight. ([#430](https://github.com/vector-im/element-x-ios/issues/430))
+
+🐛 Bugfixes
+
+- Fixed a bug that recognised any amount in dollars as an untappable link. ([#500](https://github.com/vector-im/element-x-ios/issues/500))
+
+
 ## Changes in 1.0.15 (2023-01-26)
 
 🙌 Improvements
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index a81f81552..73709476d 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3712,7 +3712,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.17;
+				MARKETING_VERSION = 1.0.18;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3784,7 +3784,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0.17;
+				MARKETING_VERSION = 1.0.18;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/changelog.d/430.change b/changelog.d/430.change
deleted file mode 100644
index 8a15eed51..000000000
--- a/changelog.d/430.change
+++ /dev/null
@@ -1 +0,0 @@
-Finish the design review ready for a public TestFlight.
\ No newline at end of file
diff --git a/changelog.d/500.bugfix b/changelog.d/500.bugfix
deleted file mode 100644
index 10bb35868..000000000
--- a/changelog.d/500.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug that recognised any amount in dollars as an untappable link.
\ No newline at end of file
diff --git a/changelog.d/pr-502.change b/changelog.d/pr-502.change
deleted file mode 100644
index 1d2a4f226..000000000
--- a/changelog.d/pr-502.change
+++ /dev/null
@@ -1 +0,0 @@
-Hardcode the sliding sync proxy to matrix.org for FOSDEM demo.
diff --git a/changelog.d/pr-514.change b/changelog.d/pr-514.change
deleted file mode 100644
index 605fb0974..000000000
--- a/changelog.d/pr-514.change
+++ /dev/null
@@ -1 +0,0 @@
-Add different states for a room's last message to distinguish loading from loaded from unknown.
diff --git a/project.yml b/project.yml
index e8c06c661..8cc1c0676 100644
--- a/project.yml
+++ b/project.yml
@@ -26,7 +26,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.0.17
+  MARKETING_VERSION: 1.0.18
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT