From 9d759a1471196e9c82695061b80b2293d6fe1a3a Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 28 Mar 2025 13:58:56 +0100 Subject: [PATCH 1/4] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 10e86f48f..e0c97cb89 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.26 -CURRENT_PROJECT_VERSION = 1.11.26 +MARKETING_VERSION = 1.11.27 +CURRENT_PROJECT_VERSION = 1.11.27 From 0fe3a64d39c782b4cad523b29ad766cd19a99567 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 28 Mar 2025 15:38:38 +0100 Subject: [PATCH 2/4] update RTE --- Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved | 9 +++++---- .../Service/CompletionSuggestionService.swift | 2 ++ project.yml | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved index c90d47d46..c4cdb0b90 100644 --- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "7aef13d4107c517de08082c578f4e05c70046de1a77e79990a0ba3eef4abdf25", "pins" : [ { "identity" : "devicekit", @@ -48,10 +49,10 @@ { "identity" : "matrix-rich-text-editor-swift", "kind" : "remoteSourceControl", - "location" : "https://github.com/matrix-org/matrix-rich-text-editor-swift", + "location" : "https://github.com/element-hq/matrix-rich-text-editor-swift", "state" : { - "revision" : "21c0dd6e9c0b38d19d97af8e3e99fe01df56825d", - "version" : "2.37.3" + "revision" : "b6583a47b5d14d2dc8405a0303ebd4041b877707", + "version" : "2.37.12" } }, { @@ -100,5 +101,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift b/RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift index ff52739cf..b0a494329 100644 --- a/RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift +++ b/RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift @@ -120,6 +120,8 @@ class CompletionSuggestionService: CompletionSuggestionServiceProtocol { currentTextTriggerSubject.send(nil) case .slash: currentTextTriggerSubject.send(TextTrigger(key: .slash, text: suggestionPattern.text)) + case .custom: + break } } diff --git a/project.yml b/project.yml index f72c75b5a..fe12f342f 100644 --- a/project.yml +++ b/project.yml @@ -58,8 +58,8 @@ packages: url: https://github.com/element-hq/swift-ogg branch: 0.0.1 WysiwygComposer: - url: https://github.com/matrix-org/matrix-rich-text-editor-swift - version: 2.37.3 + url: https://github.com/element-hq/matrix-rich-text-editor-swift + exactVersion: 2.37.12 DeviceKit: url: https://github.com/devicekit/DeviceKit majorVersion: 4.7.0 From d2e47d9e68c78223801e3f9a15638cf77619f992 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 28 Mar 2025 16:02:55 +0100 Subject: [PATCH 3/4] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index c9a5d8582..6967d43cc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.11.27 (2025-03-28) + +No significant changes. + + ## Changes in 1.11.26 (2025-03-28) No significant changes. From b142472a8ea642f1ac0fdf7d890de84f007d8673 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Fri, 28 Mar 2025 16:03:39 +0100 Subject: [PATCH 4/4] finish version++