From 8b53ff2f375fc26343376f472f2b9f00071c8d3e Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Wed, 18 Jun 2025 04:31:21 -0700
Subject: [PATCH] Prepare next release

---
 CHANGES.md                         | 29 +++++++++++++++++++++++++++++
 ElementX.xcodeproj/project.pbxproj |  4 ++--
 project.yml                        |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f9194a5e7..e218e21d3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,32 @@
+## Changes in 25.06.4 (2025-06-18)
+
+### What's Changed
+
+✨ Features
+* Thread aware drafting by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4197
+
+🐛 Bugfixes
+* Fixes #4180 - Prevent room header autolayout crashes on iOS 26. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4191
+* Bump Compound and prevent Introspect from breaking on newer OS versions. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4203
+* Fix OS 26 crashes when not running a development build by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4217
+
+🚧 In development 🚧
+* Allow sending locations within threads and render the number of replies in their summaries. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4192
+
+Others
+* Update dependency jpsim/Yams to from: "6.0.1" by @renovate in https://github.com/element-hq/element-x-ios/pull/4189
+* Add state to the accessibility label of RTE formatting buttons by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4194
+* Exclude protocol files from code coverage checks. by @stefanceriu in https://github.com/element-hq/element-x-ios/pull/4196
+* Improved the accessibility in PollFormScreen by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4200
+* Focus voice over automatically when focussing a timeline event by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4206
+* Improved a11y in `CollapsibleRoomTimelineView` by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4208
+* Improved reactions a11y by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4215
+* Flip the timeline for voice over users by @Velin92 in https://github.com/element-hq/element-x-ios/pull/4212
+* Update the SDK. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4220
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/25.06.3...release/25.06.4
+
 ## Changes in 25.06.3 (2025-06-11)
 
 ### What's Changed
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index a07374436..f0c823c8b 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -8340,7 +8340,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 25.06.4;
+				MARKETING_VERSION = 25.06.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCTION_APP_NAME = Element;
@@ -8416,7 +8416,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 25.06.4;
+				MARKETING_VERSION = 25.06.5;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/project.yml b/project.yml
index 51a0c66c1..929b7046a 100644
--- a/project.yml
+++ b/project.yml
@@ -46,7 +46,7 @@ settings:
   ENABLE_BITCODE: false
   APP_NAME: ElementX
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"
-  MARKETING_VERSION: 25.06.4
+  MARKETING_VERSION: 25.06.5
   CURRENT_PROJECT_VERSION: 1
   SUPPORTS_MACCATALYST: false