From e590035fea968f24a1f161697568e13d85877b14 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 26 May 2025 09:12:35 +0300 Subject: [PATCH] Bump the RustSDK to v25.05.26 and handle breaking changes - the new sentry integration will be handled in #4145 --- ElementX.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- ElementX/Sources/Application/TargetConfiguration.swift | 8 ++++---- ElementX/Sources/Other/Logging/Tracing.swift | 3 ++- project.yml | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 374721869..d861be3ef 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8695,7 +8695,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; requirement = { kind = exactVersion; - version = 25.05.21; + version = 25.05.26; }; }; 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f7c1681b8..7a410b3fb 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" : "ce4a5f25ada21246d62e4b54c26fb1414432fb77", - "version" : "25.5.21" + "revision" : "966e64d8145b857a4dd586c735024a7762efe603", + "version" : "25.5.26" } }, { diff --git a/ElementX/Sources/Application/TargetConfiguration.swift b/ElementX/Sources/Application/TargetConfiguration.swift index d0a0406e2..9c1fc0afa 100644 --- a/ElementX/Sources/Application/TargetConfiguration.swift +++ b/ElementX/Sources/Application/TargetConfiguration.swift @@ -27,25 +27,25 @@ enum Target: String { traceLogPacks: traceLogPacks, currentTarget: rawValue, filePrefix: nil) - initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: false) + try? initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: false) case .nse: let tracingConfiguration = Tracing.buildConfiguration(logLevel: logLevel, traceLogPacks: traceLogPacks, currentTarget: rawValue, filePrefix: rawValue) - initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: true) + try? initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: true) case .shareExtension: let tracingConfiguration = Tracing.buildConfiguration(logLevel: logLevel, traceLogPacks: traceLogPacks, currentTarget: rawValue, filePrefix: rawValue) - initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: true) + try? initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: true) case .tests: let tracingConfiguration = Tracing.buildConfiguration(logLevel: logLevel, traceLogPacks: traceLogPacks, currentTarget: rawValue, filePrefix: rawValue) - initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: false) + try? initPlatform(config: tracingConfiguration, useLightweightTokioRuntime: false) } MXLog.configure(currentTarget: rawValue) diff --git a/ElementX/Sources/Other/Logging/Tracing.swift b/ElementX/Sources/Other/Logging/Tracing.swift index b442a5a68..ebc293dc5 100644 --- a/ElementX/Sources/Other/Logging/Tracing.swift +++ b/ElementX/Sources/Other/Logging/Tracing.swift @@ -45,7 +45,8 @@ enum Tracing { writeToFiles: .init(path: logsDirectory.path(percentEncoded: false), filePrefix: fileName, fileSuffix: fileExtension, - maxFiles: maxFiles)) + maxFiles: maxFiles), + sentryDsn: nil) } /// A list of all log file URLs, sorted chronologically. This is only public for testing purposes, within diff --git a/project.yml b/project.yml index bfbcd306e..caf24eeee 100644 --- a/project.yml +++ b/project.yml @@ -65,7 +65,7 @@ packages: # Element/Matrix dependencies MatrixRustSDK: url: https://github.com/element-hq/matrix-rust-components-swift - exactVersion: 25.05.21 + exactVersion: 25.05.26 # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios