From 582551ffbf79d43e3b0e83d00294abbd820cc039 Mon Sep 17 00:00:00 2001 From: Element CI Date: Thu, 20 Mar 2025 11:56:21 -0700 Subject: [PATCH] Prepare next release --- CHANGES.md | 10 ++++++++++ ElementX.xcodeproj/project.pbxproj | 4 ++-- project.yml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a141b6ac5..c0403d701 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,13 @@ +## Changes in 25.03.4 (2025-03-20) + +### What's Changed + +🧱 Build +* Discard any changes before rebasing main. by @pixlwave in https://github.com/element-hq/element-x-ios/pull/3927 + + +**Full Changelog**: https://github.com/element-hq/element-x-ios/compare/release/25.03.3...release/25.03.4 + ## Changes in 25.03.3 (2025-03-20) ### What's Changed diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index b0b4e7530..29f6073b6 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8167,7 +8167,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 17.6; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 25.03.4; + MARKETING_VERSION = 25.03.5; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCTION_APP_NAME = Element; @@ -8243,7 +8243,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 17.6; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 25.03.4; + MARKETING_VERSION = 25.03.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; diff --git a/project.yml b/project.yml index aa15014c2..bbe23e711 100644 --- a/project.yml +++ b/project.yml @@ -40,7 +40,7 @@ settings: ENABLE_BITCODE: false APP_NAME: ElementX KEYCHAIN_ACCESS_GROUP_IDENTIFIER: "$(DEVELOPMENT_TEAM).$(BASE_BUNDLE_IDENTIFIER)" - MARKETING_VERSION: 25.03.4 + MARKETING_VERSION: 25.03.5 CURRENT_PROJECT_VERSION: 1 SUPPORTS_MACCATALYST: false