From b9476f65a38d8b6ee78ac0384698b4e06b8deb0d Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 23 Jun 2026 17:50:53 +0300 Subject: [PATCH] Bump the RustSDK to 26.06.23 --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +- .../Sources/Generated/SDKGeneratedMocks.swift | 65 ++++++++++++------- project.yml | 2 +- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 7a5d14354..6056b82ab 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10236,7 +10236,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.06.16; + version = 26.06.23; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1fb00e807..b3744f9cb 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "96bc6d1f8871c4b0823e82c2f9171715c3d2aeff1da526d2349369204d30b03f", + "originHash" : "ff8cfb62fc686fc24c445d89c94fd74a4f51075b737940288a0f0f3da0dd575e", "pins" : [ { "identity" : "compound-design-tokens", @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "9acf348eeeb3787542cf54e1ada1e79ad75ed67a", - "version" : "26.6.16" + "revision" : "5b1b8c718e232ec2ff9831e64835054c6ed69b26", + "version" : "26.6.23" } }, { diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index 669c9becd..ce92ef4e5 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -4574,6 +4574,49 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl } } + //MARK: - enableContentScanner + + private let enableContentScannerScannerUrlCallsCountLock = NSLock() + private var enableContentScannerScannerUrlUnderlyingCallsCount = 0 + open var enableContentScannerScannerUrlCallsCount: Int { + get { enableContentScannerScannerUrlCallsCountLock.withLock { enableContentScannerScannerUrlUnderlyingCallsCount } } + set { enableContentScannerScannerUrlCallsCountLock.withLock { enableContentScannerScannerUrlUnderlyingCallsCount = newValue } } + } + open var enableContentScannerScannerUrlCalled: Bool { + return enableContentScannerScannerUrlCallsCount > 0 + } + private let enableContentScannerScannerUrlReceivedScannerUrlLock = NSLock() + private var enableContentScannerScannerUrlUnderlyingReceivedScannerUrl: String? + open var enableContentScannerScannerUrlReceivedScannerUrl: String? { + get { enableContentScannerScannerUrlReceivedScannerUrlLock.withLock { enableContentScannerScannerUrlUnderlyingReceivedScannerUrl } } + set { enableContentScannerScannerUrlReceivedScannerUrlLock.withLock { enableContentScannerScannerUrlUnderlyingReceivedScannerUrl = newValue } } + } + private let enableContentScannerScannerUrlReceivedInvocationsLock = NSLock() + private var enableContentScannerScannerUrlUnderlyingReceivedInvocations: [String] = [] + open var enableContentScannerScannerUrlReceivedInvocations: [String] { + get { enableContentScannerScannerUrlReceivedInvocationsLock.withLock { enableContentScannerScannerUrlUnderlyingReceivedInvocations } } + set { enableContentScannerScannerUrlReceivedInvocationsLock.withLock { enableContentScannerScannerUrlUnderlyingReceivedInvocations = newValue } } + } + + private let enableContentScannerScannerUrlReturnValueLock = NSLock() + open var enableContentScannerScannerUrlUnderlyingReturnValue: ClientBuilder! + open var enableContentScannerScannerUrlReturnValue: ClientBuilder! { + get { enableContentScannerScannerUrlReturnValueLock.withLock { enableContentScannerScannerUrlUnderlyingReturnValue } } + set { enableContentScannerScannerUrlReturnValueLock.withLock { enableContentScannerScannerUrlUnderlyingReturnValue = newValue } } + } + open var enableContentScannerScannerUrlClosure: ((String) -> ClientBuilder)? + + open override func enableContentScanner(scannerUrl: String) -> ClientBuilder { + enableContentScannerScannerUrlCallsCountLock.withLock { enableContentScannerScannerUrlUnderlyingCallsCount += 1 } + enableContentScannerScannerUrlReceivedScannerUrl = scannerUrl + enableContentScannerScannerUrlReceivedInvocationsLock.withLock { enableContentScannerScannerUrlUnderlyingReceivedInvocations.append(scannerUrl) } + if let enableContentScannerScannerUrlClosure = enableContentScannerScannerUrlClosure { + return enableContentScannerScannerUrlClosure(scannerUrl) + } else { + return enableContentScannerScannerUrlReturnValue + } + } + //MARK: - enableShareHistoryOnInvite private let enableShareHistoryOnInviteEnableShareHistoryOnInviteCallsCountLock = NSLock() @@ -8962,28 +9005,6 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable { try await clearComposerDraftThreadRootClosure?(threadRoot) } - //MARK: - clearEventCacheStorage - - open var clearEventCacheStorageThrowableError: Error? - private let clearEventCacheStorageCallsCountLock = NSLock() - private var clearEventCacheStorageUnderlyingCallsCount = 0 - open var clearEventCacheStorageCallsCount: Int { - get { clearEventCacheStorageCallsCountLock.withLock { clearEventCacheStorageUnderlyingCallsCount } } - set { clearEventCacheStorageCallsCountLock.withLock { clearEventCacheStorageUnderlyingCallsCount = newValue } } - } - open var clearEventCacheStorageCalled: Bool { - return clearEventCacheStorageCallsCount > 0 - } - open var clearEventCacheStorageClosure: (() async throws -> Void)? - - open override func clearEventCacheStorage() async throws { - if let error = clearEventCacheStorageThrowableError { - throw error - } - clearEventCacheStorageCallsCountLock.withLock { clearEventCacheStorageUnderlyingCallsCount += 1 } - try await clearEventCacheStorageClosure?() - } - //MARK: - declineCall open var declineCallRtcNotificationEventIdThrowableError: Error? diff --git a/project.yml b/project.yml index 7c3ecf840..e09df450d 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.06.16 + exactVersion: 26.06.23 # path: ../matrix-rust-sdk Compound: path: compound-ios