From 4a38e2cca6e8e3d952b0f60de47d8c60ae546570 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 27 Nov 2025 21:15:27 +0000 Subject: [PATCH] Update the SDK. (#4792) --- ElementX.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- ElementX/Sources/Other/Logging/MXLog.swift | 4 ++-- .../Services/Authentication/AuthenticationService.swift | 2 +- project.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 656b5aa90..0f38ac521 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -9494,7 +9494,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.11.24; + version = 25.11.27; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9ea4452b3..2ff2497c3 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -158,8 +158,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rust-components-swift", "state" : { - "revision" : "05f951fe1144ef2296fa93110274e9bf51c80cb7", - "version" : "25.11.24" + "revision" : "1490877fdef3a870f5008eda68486edbd280d16c", + "version" : "25.11.27" } }, { diff --git a/ElementX/Sources/Other/Logging/MXLog.swift b/ElementX/Sources/Other/Logging/MXLog.swift index 08f46022c..69b1e63ab 100644 --- a/ElementX/Sources/Other/Logging/MXLog.swift +++ b/ElementX/Sources/Other/Logging/MXLog.swift @@ -19,7 +19,7 @@ enum MXLog { static func configure(currentTarget: String) { self.currentTarget = currentTarget - rootSpan = Span(file: #file, line: #line, level: .info, target: self.currentTarget, name: "root") + rootSpan = Span(file: #file, line: #line, level: .info, target: self.currentTarget, name: "root", bridgeTraceId: nil) rootSpan.enter() } @@ -122,7 +122,7 @@ enum MXLog { rootSpan.enter() } - return Span(file: file, line: UInt32(line), level: level.rustLogLevel, target: currentTarget, name: name) + return Span(file: file, line: UInt32(line), level: level.rustLogLevel, target: currentTarget, name: name, bridgeTraceId: nil) } // periphery:ignore:parameters function,column diff --git a/ElementX/Sources/Services/Authentication/AuthenticationService.swift b/ElementX/Sources/Services/Authentication/AuthenticationService.swift index f1c7a062f..391c6721e 100644 --- a/ElementX/Sources/Services/Authentication/AuthenticationService.swift +++ b/ElementX/Sources/Services/Authentication/AuthenticationService.swift @@ -248,7 +248,7 @@ private extension HumanQrLoginError { .qrCodeError(.deviceNotSupported) case .OtherDeviceNotSignedIn: .qrCodeError(.deviceNotSignedIn) - case .Unknown, .OidcMetadataInvalid, .CheckCodeAlreadySent, .CheckCodeCannotBeSent: + case .Unknown, .NotFound, .OidcMetadataInvalid, .CheckCodeAlreadySent, .CheckCodeCannotBeSent: .qrCodeError(.unknown) } } diff --git a/project.yml b/project.yml index ebf032d65..b4ae5ed97 100644 --- a/project.yml +++ b/project.yml @@ -71,7 +71,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.11.24 + exactVersion: 25.11.27 # path: ../matrix-rust-sdk Compound: path: compound-ios