From 97990b287781ceb855eef2c46087f05cd142ef45 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Mon, 13 Jul 2026 09:49:15 +0100 Subject: [PATCH] Update the SDK and Compound tokens. (#5857) * Update Compound Design Tokens. No changes, just makes some new ones available. * Update the SDK. --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 10 +-- .../Sources/Generated/SDKGeneratedMocks.swift | 90 +++++++++++++++++++ .../xcshareddata/swiftpm/Package.resolved | 6 +- compound-ios/Package.resolved | 6 +- compound-ios/Package.swift | 2 +- project.yml | 2 +- 7 files changed, 104 insertions(+), 14 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index f33ddf137..7a5f8cb6d 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -10349,7 +10349,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 26.07.03; + version = 26.07.08; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a6f39ad92..2861cd53b 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "1c7d307d80ee561100a0432a5ae13f345392a1175c7f6c17c2eb0da269382c57", + "originHash" : "b2bcfd4f704c144b36ac18bb17859627163be8018ed52c4ec3cbf11d3e3f4469", "pins" : [ { "identity" : "compound-design-tokens", "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-design-tokens", "state" : { - "revision" : "6e33c5bf3cbb4c29dbe5fc063d24b375849c0fac", - "version" : "10.2.2" + "revision" : "bc390b74b53447f04bc0a7a07adaecbb90e02e25", + "version" : "10.2.3" } }, { @@ -167,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "24c26f6697e03e42d176c61b5923ac958f5fa32d", - "version" : "26.7.3" + "revision" : "b286aeac2774f516839abcb91bbac1450188a591", + "version" : "26.7.8" } }, { diff --git a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift index 5753b9615..78b5d4330 100644 --- a/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift +++ b/SDKMocks/Sources/Generated/SDKGeneratedMocks.swift @@ -8653,6 +8653,96 @@ open class OAuthAuthorizationDataSDKMock: MatrixRustSDK.OAuthAuthorizationData, } } } +open class PasswordStrengthEstimatorSDKMock: MatrixRustSDK.PasswordStrengthEstimator, @unchecked Sendable { + public init() { + super.init(noHandle: .init()) + } + + public required init(unsafeFromHandle handle: UInt64) { + fatalError("init(unsafeFromHandle:) has not been implemented") + } + + fileprivate var handle: UInt64 { + get { return underlyingHandle } + set(value) { underlyingHandle = value } + } + fileprivate var underlyingHandle: UInt64! + static func reset() + { + } + + //MARK: - estimate + + private let estimatePasswordUserInputsCallsCountLock = NSLock() + private var estimatePasswordUserInputsUnderlyingCallsCount = 0 + open var estimatePasswordUserInputsCallsCount: Int { + get { estimatePasswordUserInputsCallsCountLock.withLock { estimatePasswordUserInputsUnderlyingCallsCount } } + set { estimatePasswordUserInputsCallsCountLock.withLock { estimatePasswordUserInputsUnderlyingCallsCount = newValue } } + } + open var estimatePasswordUserInputsCalled: Bool { + return estimatePasswordUserInputsCallsCount > 0 + } + private let estimatePasswordUserInputsReceivedArgumentsLock = NSLock() + private var estimatePasswordUserInputsUnderlyingReceivedArguments: (password: String, userInputs: [String])? + open var estimatePasswordUserInputsReceivedArguments: (password: String, userInputs: [String])? { + get { estimatePasswordUserInputsReceivedArgumentsLock.withLock { estimatePasswordUserInputsUnderlyingReceivedArguments } } + set { estimatePasswordUserInputsReceivedArgumentsLock.withLock { estimatePasswordUserInputsUnderlyingReceivedArguments = newValue } } + } + private let estimatePasswordUserInputsReceivedInvocationsLock = NSLock() + private var estimatePasswordUserInputsUnderlyingReceivedInvocations: [(password: String, userInputs: [String])] = [] + open var estimatePasswordUserInputsReceivedInvocations: [(password: String, userInputs: [String])] { + get { estimatePasswordUserInputsReceivedInvocationsLock.withLock { estimatePasswordUserInputsUnderlyingReceivedInvocations } } + set { estimatePasswordUserInputsReceivedInvocationsLock.withLock { estimatePasswordUserInputsUnderlyingReceivedInvocations = newValue } } + } + + private let estimatePasswordUserInputsReturnValueLock = NSLock() + open var estimatePasswordUserInputsUnderlyingReturnValue: PasswordStrengthEstimate! + open var estimatePasswordUserInputsReturnValue: PasswordStrengthEstimate! { + get { estimatePasswordUserInputsReturnValueLock.withLock { estimatePasswordUserInputsUnderlyingReturnValue } } + set { estimatePasswordUserInputsReturnValueLock.withLock { estimatePasswordUserInputsUnderlyingReturnValue = newValue } } + } + open var estimatePasswordUserInputsClosure: ((String, [String]) -> PasswordStrengthEstimate)? + + open override func estimate(password: String, userInputs: [String]) -> PasswordStrengthEstimate { + estimatePasswordUserInputsCallsCountLock.withLock { estimatePasswordUserInputsUnderlyingCallsCount += 1 } + estimatePasswordUserInputsReceivedArguments = (password: password, userInputs: userInputs) + estimatePasswordUserInputsReceivedInvocationsLock.withLock { estimatePasswordUserInputsUnderlyingReceivedInvocations.append((password: password, userInputs: userInputs)) } + if let estimatePasswordUserInputsClosure = estimatePasswordUserInputsClosure { + return estimatePasswordUserInputsClosure(password, userInputs) + } else { + return estimatePasswordUserInputsReturnValue + } + } + + //MARK: - thresholds + + private let thresholdsCallsCountLock = NSLock() + private var thresholdsUnderlyingCallsCount = 0 + open var thresholdsCallsCount: Int { + get { thresholdsCallsCountLock.withLock { thresholdsUnderlyingCallsCount } } + set { thresholdsCallsCountLock.withLock { thresholdsUnderlyingCallsCount = newValue } } + } + open var thresholdsCalled: Bool { + return thresholdsCallsCount > 0 + } + + private let thresholdsReturnValueLock = NSLock() + open var thresholdsUnderlyingReturnValue: PasswordStrengthThresholds! + open var thresholdsReturnValue: PasswordStrengthThresholds! { + get { thresholdsReturnValueLock.withLock { thresholdsUnderlyingReturnValue } } + set { thresholdsReturnValueLock.withLock { thresholdsUnderlyingReturnValue = newValue } } + } + open var thresholdsClosure: (() -> PasswordStrengthThresholds)? + + open override func thresholds() -> PasswordStrengthThresholds { + thresholdsCallsCountLock.withLock { thresholdsUnderlyingCallsCount += 1 } + if let thresholdsClosure = thresholdsClosure { + return thresholdsClosure() + } else { + return thresholdsReturnValue + } + } +} open class PrivateStringSDKMock: MatrixRustSDK.PrivateString, @unchecked Sendable { public init() { super.init(noHandle: .init()) diff --git a/compound-ios/Inspector/Inspector.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/compound-ios/Inspector/Inspector.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3d7f5a38d..47c7093dc 100644 --- a/compound-ios/Inspector/Inspector.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/compound-ios/Inspector/Inspector.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "38092aeb975b0dafe051df313112892dfbe3eb3329c38308856befdf6843cddb", + "originHash" : "89c566dd1386002d6eb972c1cd428caf08db40d80235fb7bc4c296139b11e7c7", "pins" : [ { "identity" : "compound-design-tokens", "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-design-tokens", "state" : { - "revision" : "6e33c5bf3cbb4c29dbe5fc063d24b375849c0fac", - "version" : "10.2.2" + "revision" : "bc390b74b53447f04bc0a7a07adaecbb90e02e25", + "version" : "10.2.3" } }, { diff --git a/compound-ios/Package.resolved b/compound-ios/Package.resolved index b7f97ab22..47c7093dc 100644 --- a/compound-ios/Package.resolved +++ b/compound-ios/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "b176ccc5aeb79a3bc3e26b224bb259b7fd4dd0ff8d124a2f4d17d9858b087aa0", + "originHash" : "89c566dd1386002d6eb972c1cd428caf08db40d80235fb7bc4c296139b11e7c7", "pins" : [ { "identity" : "compound-design-tokens", "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-design-tokens", "state" : { - "revision" : "6e33c5bf3cbb4c29dbe5fc063d24b375849c0fac", - "version" : "10.2.2" + "revision" : "bc390b74b53447f04bc0a7a07adaecbb90e02e25", + "version" : "10.2.3" } }, { diff --git a/compound-ios/Package.swift b/compound-ios/Package.swift index 8f68e6a2c..0ce977859 100644 --- a/compound-ios/Package.swift +++ b/compound-ios/Package.swift @@ -9,7 +9,7 @@ let package = Package( .library(name: "Compound", targets: ["Compound"]) ], dependencies: [ - .package(url: "https://github.com/element-hq/compound-design-tokens", exact: "10.2.2"), + .package(url: "https://github.com/element-hq/compound-design-tokens", exact: "10.2.3"), // .package(path: "../compound-design-tokens"), .package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "26.0.1"), .package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols", from: "7.0.0"), diff --git a/project.yml b/project.yml index 7de26a2bb..1473381fb 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.07.03 + exactVersion: 26.07.08 # path: ../matrix-rust-sdk Compound: path: compound-ios