From 6aec4f210afa0d403a851d093684545df85e816b Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 13 May 2026 15:18:38 +0300 Subject: [PATCH] Bump the RustSDK to v26.05.13 --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +- .../Services/Spaces/SpaceRoomListProxy.swift | 10 +- Package.resolved | 4 +- .../Sources/Generated/SDKGeneratedMocks.swift | 203 +++++++++++++++++- project.yml | 2 +- 6 files changed, 210 insertions(+), 17 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 6937adff4..5e03d6662 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10131,7 +10131,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.05.12; + version = 26.05.13; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 061e4f701..c32a76cfe 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "56ffe9d7d62816027f5ec24272e0c7117a5f241303febda32adb0b1e64a148f1", + "originHash" : "03817e609ee3e9e372d9320f569c830d82dd6dd0f4455b29822903349a85c61e", "pins" : [ { "identity" : "compound-design-tokens", @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "a6f7f2893a7afa249b464a7bee7c793875c07f8f", - "version" : "26.5.12" + "revision" : "7e9e15ca678dff7791dfacd736a603fcbb2d543f", + "version" : "26.5.13" } }, { diff --git a/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift b/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift index 4b7712c6c..e2f28e199 100644 --- a/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift +++ b/ElementX/Sources/Services/Spaces/SpaceRoomListProxy.swift @@ -44,14 +44,16 @@ class SpaceRoomListProxy: SpaceRoomListProxyProtocol { paginationStateSubject.send(paginationState) }) - spaceRoomsHandle = spaceRoomList.subscribeToRoomUpdate(listener: SDKListener { [weak self] updates in - self?.handleUpdates(updates) - }) - spaceServiceRoomHandle = spaceRoomList.subscribeToSpaceUpdates(listener: SDKListener { [weak self] spaceRoom in guard let spaceRoom else { return } self?.spaceServiceRoomSubject.send(SpaceServiceRoom(spaceRoom: spaceRoom)) }) + + Task { + spaceRoomsHandle = await spaceRoomList.subscribeToRoomUpdate(listener: SDKListener { [weak self] updates in + self?.handleUpdates(updates) + }) + } } func paginate() async { diff --git a/Package.resolved b/Package.resolved index 12ddcbaa2..d8636f65d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser", "state" : { - "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615", - "version" : "1.7.0" + "revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b", + "version" : "1.7.1" } }, { diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index c38271d4f..30b8f7b4f 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -3507,6 +3507,46 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { try await logoutClosure?() } + //MARK: - markAllRoomsAsRead + + open var markAllRoomsAsReadThrowableError: Error? + open var markAllRoomsAsReadUnderlyingCallsCount = 0 + open var markAllRoomsAsReadCallsCount: Int { + get { + if Thread.isMainThread { + return markAllRoomsAsReadUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = markAllRoomsAsReadUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + markAllRoomsAsReadUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + markAllRoomsAsReadUnderlyingCallsCount = newValue + } + } + } + } + open var markAllRoomsAsReadCalled: Bool { + return markAllRoomsAsReadCallsCount > 0 + } + open var markAllRoomsAsReadClosure: (() async throws -> Void)? + + open override func markAllRoomsAsRead() async throws { + if let error = markAllRoomsAsReadThrowableError { + throw error + } + markAllRoomsAsReadCallsCount += 1 + try await markAllRoomsAsReadClosure?() + } + //MARK: - newGrantLoginWithQrCodeHandler open var newGrantLoginWithQrCodeHandlerUnderlyingCallsCount = 0 @@ -3904,6 +3944,46 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { try await optimizeStoresClosure?() } + //MARK: - pause + + open var pauseThrowableError: Error? + open var pauseUnderlyingCallsCount = 0 + open var pauseCallsCount: Int { + get { + if Thread.isMainThread { + return pauseUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = pauseUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + pauseUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + pauseUnderlyingCallsCount = newValue + } + } + } + } + open var pauseCalled: Bool { + return pauseCallsCount > 0 + } + open var pauseClosure: (() async throws -> Void)? + + open override func pause() async throws { + if let error = pauseThrowableError { + throw error + } + pauseCallsCount += 1 + try await pauseClosure?() + } + //MARK: - registerNotificationHandler open var registerNotificationHandlerListenerUnderlyingCallsCount = 0 @@ -4302,6 +4382,46 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable { try await restoreSessionWithSessionRoomLoadSettingsClosure?(session, roomLoadSettings) } + //MARK: - resume + + open var resumeThrowableError: Error? + open var resumeUnderlyingCallsCount = 0 + open var resumeCallsCount: Int { + get { + if Thread.isMainThread { + return resumeUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = resumeUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + resumeUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + resumeUnderlyingCallsCount = newValue + } + } + } + } + open var resumeCalled: Bool { + return resumeCallsCount > 0 + } + open var resumeClosure: (() async throws -> Void)? + + open override func resume() async throws { + if let error = resumeThrowableError { + throw error + } + resumeCallsCount += 1 + try await resumeClosure?() + } + //MARK: - roomAliasExists open var roomAliasExistsRoomAliasThrowableError: Error? @@ -7478,6 +7598,77 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } + //MARK: - dmRoomDefinition + + open var dmRoomDefinitionDmRoomDefinitionUnderlyingCallsCount = 0 + open var dmRoomDefinitionDmRoomDefinitionCallsCount: Int { + get { + if Thread.isMainThread { + return dmRoomDefinitionDmRoomDefinitionUnderlyingCallsCount + } else { + var returnValue: Int? = nil + DispatchQueue.main.sync { + returnValue = dmRoomDefinitionDmRoomDefinitionUnderlyingCallsCount + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + dmRoomDefinitionDmRoomDefinitionUnderlyingCallsCount = newValue + } else { + DispatchQueue.main.sync { + dmRoomDefinitionDmRoomDefinitionUnderlyingCallsCount = newValue + } + } + } + } + open var dmRoomDefinitionDmRoomDefinitionCalled: Bool { + return dmRoomDefinitionDmRoomDefinitionCallsCount > 0 + } + open var dmRoomDefinitionDmRoomDefinitionReceivedDmRoomDefinition: DmRoomDefinition? + open var dmRoomDefinitionDmRoomDefinitionReceivedInvocations: [DmRoomDefinition] = [] + + open var dmRoomDefinitionDmRoomDefinitionUnderlyingReturnValue: ClientBuilder! + open var dmRoomDefinitionDmRoomDefinitionReturnValue: ClientBuilder! { + get { + if Thread.isMainThread { + return dmRoomDefinitionDmRoomDefinitionUnderlyingReturnValue + } else { + var returnValue: ClientBuilder? = nil + DispatchQueue.main.sync { + returnValue = dmRoomDefinitionDmRoomDefinitionUnderlyingReturnValue + } + + return returnValue! + } + } + set { + if Thread.isMainThread { + dmRoomDefinitionDmRoomDefinitionUnderlyingReturnValue = newValue + } else { + DispatchQueue.main.sync { + dmRoomDefinitionDmRoomDefinitionUnderlyingReturnValue = newValue + } + } + } + } + open var dmRoomDefinitionDmRoomDefinitionClosure: ((DmRoomDefinition) -> ClientBuilder)? + + open override func dmRoomDefinition(dmRoomDefinition: DmRoomDefinition) -> ClientBuilder { + dmRoomDefinitionDmRoomDefinitionCallsCount += 1 + dmRoomDefinitionDmRoomDefinitionReceivedDmRoomDefinition = dmRoomDefinition + DispatchQueue.main.async { + self.dmRoomDefinitionDmRoomDefinitionReceivedInvocations.append(dmRoomDefinition) + } + if let dmRoomDefinitionDmRoomDefinitionClosure = dmRoomDefinitionDmRoomDefinitionClosure { + return dmRoomDefinitionDmRoomDefinitionClosure(dmRoomDefinition) + } else { + return dmRoomDefinitionDmRoomDefinitionReturnValue + } + } + //MARK: - enableShareHistoryOnInvite open var enableShareHistoryOnInviteEnableShareHistoryOnInviteUnderlyingCallsCount = 0 @@ -25031,12 +25222,12 @@ open class SpaceRoomListSDKMock: MatrixRustSDK.SpaceRoomList, @unchecked Sendabl } } } - open var roomsClosure: (() -> [SpaceRoom])? + open var roomsClosure: (() async -> [SpaceRoom])? - open override func rooms() -> [SpaceRoom] { + open override func rooms() async -> [SpaceRoom] { roomsCallsCount += 1 if let roomsClosure = roomsClosure { - return roomsClosure() + return await roomsClosure() } else { return roomsReturnValue } @@ -25234,16 +25425,16 @@ open class SpaceRoomListSDKMock: MatrixRustSDK.SpaceRoomList, @unchecked Sendabl } } } - open var subscribeToRoomUpdateListenerClosure: ((SpaceRoomListEntriesListener) -> TaskHandle)? + open var subscribeToRoomUpdateListenerClosure: ((SpaceRoomListEntriesListener) async -> TaskHandle)? - open override func subscribeToRoomUpdate(listener: SpaceRoomListEntriesListener) -> TaskHandle { + open override func subscribeToRoomUpdate(listener: SpaceRoomListEntriesListener) async -> TaskHandle { subscribeToRoomUpdateListenerCallsCount += 1 subscribeToRoomUpdateListenerReceivedListener = listener DispatchQueue.main.async { self.subscribeToRoomUpdateListenerReceivedInvocations.append(listener) } if let subscribeToRoomUpdateListenerClosure = subscribeToRoomUpdateListenerClosure { - return subscribeToRoomUpdateListenerClosure(listener) + return await subscribeToRoomUpdateListenerClosure(listener) } else { return subscribeToRoomUpdateListenerReturnValue } diff --git a/project.yml b/project.yml index 9bbc97abf..cb8da7010 100644 --- a/project.yml +++ b/project.yml @@ -74,7 +74,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 26.05.12 + exactVersion: 26.05.13 # path: ../matrix-rust-sdk Compound: path: compound-ios