From 567f22b8060c03cdad66ca9f0ae3017a459a32a7 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Tue, 25 Jun 2024 01:31:41 -0700
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 14 ++++++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 changelog.d/2679.bugfix            |  1 -
 changelog.d/pr-2943.feature        |  1 -
 changelog.d/pr-2954.change         |  1 -
 project.yml                        |  2 +-
 6 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/2679.bugfix
 delete mode 100644 changelog.d/pr-2943.feature
 delete mode 100644 changelog.d/pr-2954.change

diff --git a/CHANGES.md b/CHANGES.md
index 14d132067..2cc3e423d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,17 @@
+## Changes in 1.6.12 (2024-06-25)
+
+✨ Features
+
+- Draft restoring is enabled by default. ([#2943](https://github.com/element-hq/element-x-ios/pull/2943))
+
+🙌 Improvements
+
+- Adopt the new authentication methods exposed on Rust's Client. ([#2954](https://github.com/element-hq/element-x-ios/pull/2954))
+
+🐛 Bugfixes
+
+- Timestamps in room list inconsistently use absolute and relative formatting ([#2679](https://github.com/element-hq/element-x-ios/issues/2679))
+
 ## Changes in 1.6.11 (2024-06-18)
 
 No significant changes.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 76e240bd5..04929b992 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -7021,7 +7021,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.6.12;
+				MARKETING_VERSION = 1.6.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCTION_APP_NAME = Element;
@@ -7098,7 +7098,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 1.6.12;
+				MARKETING_VERSION = 1.6.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/changelog.d/2679.bugfix b/changelog.d/2679.bugfix
deleted file mode 100644
index ddd1f9038..000000000
--- a/changelog.d/2679.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Timestamps in room list inconsistently use absolute and relative formatting
\ No newline at end of file
diff --git a/changelog.d/pr-2943.feature b/changelog.d/pr-2943.feature
deleted file mode 100644
index 8d1786f1b..000000000
--- a/changelog.d/pr-2943.feature
+++ /dev/null
@@ -1 +0,0 @@
-Draft restoring is enabled by default.
\ No newline at end of file
diff --git a/changelog.d/pr-2954.change b/changelog.d/pr-2954.change
deleted file mode 100644
index 27e84fc21..000000000
--- a/changelog.d/pr-2954.change
+++ /dev/null
@@ -1 +0,0 @@
-Adopt the new authentication methods exposed on Rust's Client.
\ No newline at end of file
diff --git a/project.yml b/project.yml
index 056f2d426..03be9cfab 100644
--- a/project.yml
+++ b/project.yml
@@ -30,7 +30,7 @@ settings:
   APP_DISPLAY_NAME: Element X
   PRODUCTION_APP_NAME: Element
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)
-  MARKETING_VERSION: 1.6.12
+  MARKETING_VERSION: 1.6.13
   CURRENT_PROJECT_VERSION: 1
   DEVELOPMENT_TEAM: 7J4U792NQT
   SUPPORTS_MACCATALYST: NO