From 7986dd540a4ccf582cd3f7e6e7a58be0d284cf71 Mon Sep 17 00:00:00 2001
From: Element CI <ci@element.io>
Date: Fri, 15 Aug 2025 02:52:48 -0700
Subject: [PATCH] Prepare next release

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

diff --git a/CHANGES.md b/CHANGES.md
index 0222ac419..60bc17970 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,36 @@
+## Changes in 25.08.5 (2025-08-15)
+
+### What's Changed
+
+🐛 Bugfixes
+* Fix a bug when a compact split view doesn't react to a change of root coordinator in the sidebar. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4393
+* Add a workaround to include some via parameters for room v12 tombstone links. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4413
+* Fix a bug where the image upload screen was unintentionally dismissed for some failures. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4414
+* Fix some app route navigation bugs. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4415
+
+🗣 Translations
+* Translations update by @RiotRobot in https://github.com/element-hq/element-x-ios/pull/4398
+
+🚧 In development 🚧
+* Add a SpaceExplorerFlowCoordinator. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4383
+* Move the Settings flow from the Chats flow up one level to the UserSession flow. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4390
+* Add `SpaceRoomCell` & `Space…ProxyProtocols` and use them on the `SpaceListScreen`. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4404
+* Add a SpaceScreen for listing rooms and subspaces within a space. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4412
+
+Others
+* Label rageshakes from macOS and report the right operating system. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4392
+* Remove unreachable guard condition in String.asciified() by @Copilot in https://github.com/element-hq/element-x-ios/pull/4395
+* Update dependency jpsim/Yams to from: "6.1.0" by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/4397
+* Update Roles & Permissions UI test snapshots. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4399
+* Update actions/checkout action to v5 by @renovate[bot] in https://github.com/element-hq/element-x-ios/pull/4401
+* Update the SDK. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4405
+* Remove the share_pos developer option. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/4406
+
+### New Contributors
+* @Copilot made their first contribution in https://github.com/element-hq/element-x-ios/pull/4395
+
+**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/25.08.3...release/25.08.5
+
 ## Changes in 25.08.4 (2025-08-12)
 
 ### What's Changed
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 6e13f0429..debac2a32 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -8799,7 +8799,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 17.5;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 14.5;
-				MARKETING_VERSION = 25.08.5;
+				MARKETING_VERSION = 25.08.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCTION_APP_NAME = Element;
@@ -8875,7 +8875,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 17.5;
 				KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)";
 				MACOSX_DEPLOYMENT_TARGET = 14.5;
-				MARKETING_VERSION = 25.08.5;
+				MARKETING_VERSION = 25.08.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
diff --git a/project.yml b/project.yml
index 95b7ecbeb..4d976962c 100644
--- a/project.yml
+++ b/project.yml
@@ -48,7 +48,7 @@ settings:
   ENABLE_BITCODE: false
   APP_NAME: ElementX
   KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"
-  MARKETING_VERSION: 25.08.5
+  MARKETING_VERSION: 25.08.6
   CURRENT_PROJECT_VERSION: 1
   SUPPORTS_MACCATALYST: false