From 47dfc2ddfffbfd31f6c6f45d903b0a469b1b676b Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Thu, 12 Jun 2025 13:50:47 +0200 Subject: [PATCH 1/4] chore: releaseprep (MESSENGER-7405) --- CHANGES_BWI.md | 18 ++++++++++++++++++ Config/BWIBuildSettings.swift | 2 +- Riot/Assets/new_features.html | 12 ++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index 75405dff3..31cfa323e 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,21 @@ +Changes in BWI project 2.25.0 (2025-06-12) +=================================================== + +Upstream merge ✨: +- v1.27.11 + +Improvements 🙌: +- MESSENGER-6759 remove hash based server vailidation + +Bugfix 🐛: +- MESSENGER-7257 Fix for pushes with sound +- MESSENGER-7295 fix passphrase reset for newer synapse +- MESSENGER-7295 fix JWT library for XCode 16 + +Build 🧱: +- Update shared pipelines +- Build with XCode 16.2 + Changes in BWI project 2.24.0 (2025-02-17) =================================================== diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 768485202..cb3a1a566 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -479,7 +479,7 @@ class BWIBuildSettings: NSObject { var passwordIndicatorOnLogin = true // MARK: Displays the element base version on the settings screen - var elementBaseVersion = "1.11.19" + var elementBaseVersion = "1.27.11" var showElementBaseVersion = true diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index 7f4523f96..470c8c3c0 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,18 @@ +
+

+ Version 2.25.0 +

+ + Verbesserungen + + +

Version 2.24.0 From 55068b3fb9ac847d29a48f5a3f94809b19f72602 Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Thu, 12 Jun 2025 13:55:14 +0200 Subject: [PATCH 2/4] chore: releaseprep update matrix sdk (MESSENGER-7405) --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 8d7eb2a73..2b12e6e29 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.25.0-RC01' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.25.0-RC02' } ######################################## From 4bebfc4b6a9f9c0baa2c314b4adfccfa711eff79 Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Fri, 13 Jun 2025 13:11:47 +0200 Subject: [PATCH 3/4] chore: sdk release tag (MESSENGER-7408) --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 2b12e6e29..f87e16533 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.25.0-RC02' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.25.0' } ######################################## From 50c8e8739b5c371fdfc2361b256a7f92005b3f20 Mon Sep 17 00:00:00 2001 From: Frank Rotermund Date: Mon, 16 Jun 2025 13:42:55 +0200 Subject: [PATCH 4/4] chore: disable banner (MESSENGER-7408) --- Config/BWIBuildSettings.swift | 2 +- Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift | 2 +- Config/BuM/BWIBuildSettings+BuM.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index cb3a1a566..02ec6f2b0 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -488,7 +488,7 @@ class BWIBuildSettings: NSObject { var forgotPasswordInformationAlert = true // MARK: Promote new feature within a banner below the navigation view - var showTopBanner = true + var showTopBanner = false var showCustomServerDisplayName = true var customServerDisplayName = "" diff --git a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift index 6346b79a5..5297617bc 100644 --- a/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift +++ b/Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift @@ -44,6 +44,6 @@ extension BWIBuildSettings { avoidServerSelectionOnAppConfig = true enableFeatureWYSIWYGByDefault = true bwiEnableTokenizedLoginProtection = true - bwiShowHappyBirthdayCampaign = true + bwiShowHappyBirthdayCampaign = false } } diff --git a/Config/BuM/BWIBuildSettings+BuM.swift b/Config/BuM/BWIBuildSettings+BuM.swift index 948097e95..5b47a7c81 100644 --- a/Config/BuM/BWIBuildSettings+BuM.swift +++ b/Config/BuM/BWIBuildSettings+BuM.swift @@ -32,7 +32,7 @@ extension BWIBuildSettings { avoidServerSelectionOnAppConfig = true enableFeatureWYSIWYGByDefault = true bwiEnableTokenizedLoginProtection = true - bwiShowHappyBirthdayCampaign = true + bwiShowHappyBirthdayCampaign = false } }