diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 16102ba328f..7c1542d80c0 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -30,6 +30,7 @@ let package = Package( dependencies: [ .product(name: "WireFoundation", package: "WireFoundation"), .product(name: "WireLogging", package: "WireLogging"), + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -50,7 +51,10 @@ let package = Package( .target( name: "WireDatadog", - dependencies: datadogDependencies() + ["WireLogging"], + dependencies: datadogDependencies() + [ + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") + ], sources: datadogFiles() ), @@ -101,9 +105,9 @@ func datadogDependencies() -> [Target.Dependency] { func datadogFiles() -> [String] { if isDatadogEnabled { - ["WireDatadog.swift"] + ["WireDatadog.swift", "WireLegacyLogging.swift"] } else { - ["WireFakeDatadog.swift"] + ["WireFakeDatadog.swift", "WireLegacyLogging.swift"] } } diff --git a/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift b/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift new file mode 100644 index 00000000000..f7df465066d --- /dev/null +++ b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireAuthentication/Package.swift b/WireAuthentication/Package.swift index 0939cd9f92f..58d5eedabce 100644 --- a/WireAuthentication/Package.swift +++ b/WireAuthentication/Package.swift @@ -63,7 +63,7 @@ let package = Package( .target( name: "WireAuthenticationUI", dependencies: [ - "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireFoundation", "WireAuthenticationAPI", .product(name: "WireDesign", package: "WireUI"), diff --git a/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift b/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift new file mode 100644 index 00000000000..f7df465066d --- /dev/null +++ b/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift b/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift new file mode 100644 index 00000000000..f7df465066d --- /dev/null +++ b/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireBackup/Package.swift b/WireBackup/Package.swift index 81b57b504da..88d627c44d8 100644 --- a/WireBackup/Package.swift +++ b/WireBackup/Package.swift @@ -22,6 +22,7 @@ let package = Package( "KaliumBackup", "WireFoundation", "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "WireUtilitiesPackage", package: "WireFoundation") ] ), diff --git a/WireBackup/Sources/WireBackup/WireLegacyLogging.swift b/WireBackup/Sources/WireBackup/WireLegacyLogging.swift new file mode 100644 index 00000000000..8ac00beb489 --- /dev/null +++ b/WireBackup/Sources/WireBackup/WireLegacyLogging.swift @@ -0,0 +1,22 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias WireLogger = WireLegacyLogging.WireLogger +public typealias LoggerProtocol = WireLegacyLogging.LoggerProtocol diff --git a/WireCalling/Package.swift b/WireCalling/Package.swift index 29e4c1e0a26..b90fa78b6b4 100644 --- a/WireCalling/Package.swift +++ b/WireCalling/Package.swift @@ -24,7 +24,7 @@ let package = Package( name: "WireCallingDomain", dependencies: [ "WireFoundation", - "WireLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -39,7 +39,7 @@ let package = Package( name: "WireCallingData", dependencies: [ "WireCallingDomain", - "WireLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( diff --git a/WireDomain/Package.swift b/WireDomain/Package.swift index eb827bdb2c2..96bf1359d23 100644 --- a/WireDomain/Package.swift +++ b/WireDomain/Package.swift @@ -23,7 +23,7 @@ let package = Package( name: "WireDomainPackage", dependencies: [ "WireNetwork", - "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireFoundation" ] ), diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift index 2062123dc2e..ab2036f1fa3 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift @@ -85,7 +85,7 @@ public struct IncrementalSyncV2: LiveSyncProtocol { self.createPushChannelState = createPushChannelState } - private var logAttributes: WireLogging.LogAttributes { + private var logAttributes: LogAttributes { .incrementalSyncV3 } diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift index 9bdd1c3f3f8..5d8ac48adca 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift @@ -65,7 +65,7 @@ public struct PullPendingUpdateEventsSyncV2: PullPendingUpdateEventsSyncV2Protoc self.syncMarkerGenerator = syncMarkerGenerator } - private var logAttributes: WireLogging.LogAttributes { + private var logAttributes: LogAttributes { .incrementalSyncV3 + .newNSE } diff --git a/WireDomain/Sources/WireDomain/WireLegacyLogging.swift b/WireDomain/Sources/WireDomain/WireLegacyLogging.swift new file mode 100644 index 00000000000..d868cbffa06 --- /dev/null +++ b/WireDomain/Sources/WireDomain/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias Flow = WireLegacyLogging.Flow +typealias WireLogger = WireLegacyLogging.WireLogger +typealias LogAttributes = WireLegacyLogging.LogAttributes +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey diff --git a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj index bfe35f87447..bd5b8f75691 100644 --- a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj +++ b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59202AD12D54D3D500143413 /* WireDomainPackage */; }; 598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042C2C89C63100B64D71 /* WireFoundation */; }; 59DBDE982D395BB50069C64C /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59DBDE972D395BB50069C64C /* WireDomainPackage */; }; - 59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59EA774E2D00CE0C002CA0B8 /* WireLogging */; }; + 59EA774F2D00CE0C002CA0B8 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */; }; C91D188E2D7212FC00B63B66 /* NeedleFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = C91D188D2D7212FC00B63B66 /* NeedleFoundation */; }; C97BCCAA2C98704B004F2D0D /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; }; C9B4C1F72D4915F10072A0EE /* WireCrypto in Frameworks */ = {isa = PBXBuildFile; productRef = C9B4C1F62D4915F10072A0EE /* WireCrypto */; }; @@ -119,7 +119,7 @@ C91D188E2D7212FC00B63B66 /* NeedleFoundation in Frameworks */, 59DBDE982D395BB50069C64C /* WireDomainPackage in Frameworks */, 591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */, - 59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */, + 59EA774F2D00CE0C002CA0B8 /* WireLegacyLogging in Frameworks */, C9B4C1F72D4915F10072A0EE /* WireCrypto in Frameworks */, 01D0DCC62C1C8CD90076CB1C /* WireTransport.framework in Frameworks */, ); @@ -248,7 +248,7 @@ name = WireDomain; packageProductDependencies = ( 598D042C2C89C63100B64D71 /* WireFoundation */, - 59EA774E2D00CE0C002CA0B8 /* WireLogging */, + 59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */, C9B4C1F62D4915F10072A0EE /* WireCrypto */, 59DBDE972D395BB50069C64C /* WireDomainPackage */, C91D188D2D7212FC00B63B66 /* NeedleFoundation */, @@ -968,9 +968,9 @@ isa = XCSwiftPackageProductDependency; productName = WireDomainPackage; }; - 59EA774E2D00CE0C002CA0B8 /* WireLogging */ = { + 59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; C91D188D2D7212FC00B63B66 /* NeedleFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 6b1d48c94b2..d8292f128df 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -8,9 +8,12 @@ let package = Package( platforms: [.iOS("16.4"), .macOS(.v12)], products: [ .library(name: "WireLogging", targets: ["WireLogging"]), - .library(name: "WireLoggingSupport", targets: ["WireLoggingSupport"]) + .library(name: "WireLoggingSupport", targets: ["WireLoggingSupport"]), + .library(name: "WireLegacyLogging", targets: ["WireLegacyLogging"]), + .library(name: "WireLegacyLoggingSupport", targets: ["WireLegacyLoggingSupport"]) ], dependencies: [ + .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(path: "../WirePlugins") ], targets: [ @@ -18,11 +21,26 @@ let package = Package( .target( name: "WireLoggingSupport", dependencies: ["WireLogging"], - plugins: [.plugin(name: "SourceryPlugin", package: "WirePlugins")] + plugins: [ + .plugin(name: "SourceryPlugin", package: "WirePlugins") + ] ), .testTarget( name: "WireLoggingTests", - dependencies: ["WireLogging"] + dependencies: ["WireLogging", "WireLoggingSupport"] + ), + + .target(name: "WireLegacyLogging"), + .target( + name: "WireLegacyLoggingSupport", + dependencies: ["WireLegacyLogging"], + plugins: [ + .plugin(name: "SourceryPlugin", package: "WirePlugins") + ] + ), + .testTarget( + name: "WireLegacyLoggingTests", + dependencies: ["WireLegacyLogging"] ) ] ) diff --git a/WireLogging/Sources/WireLogging/AggregatedLogger.swift b/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift similarity index 99% rename from WireLogging/Sources/WireLogging/AggregatedLogger.swift rename to WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift index 1e507443852..636bfff9a48 100644 --- a/WireLogging/Sources/WireLogging/AggregatedLogger.swift +++ b/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift @@ -79,4 +79,5 @@ final class AggregatedLogger: LoggerProtocol { $0.addTag(key, value: value) } } + } diff --git a/WireLogging/Sources/WireLogging/Flow.swift b/WireLogging/Sources/WireLegacyLogging/Flow.swift similarity index 100% rename from WireLogging/Sources/WireLogging/Flow.swift rename to WireLogging/Sources/WireLegacyLogging/Flow.swift diff --git a/WireLogging/Sources/WireLogging/LogAttributes.swift b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift similarity index 99% rename from WireLogging/Sources/WireLogging/LogAttributes.swift rename to WireLogging/Sources/WireLegacyLogging/LogAttributes.swift index 352e83bc478..17db4a155c3 100644 --- a/WireLogging/Sources/WireLogging/LogAttributes.swift +++ b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift @@ -52,14 +52,20 @@ public enum LogAttributesKey: String, Comparable, Sendable { public static func < (lhs: LogAttributesKey, rhs: LogAttributesKey) -> Bool { lhs.rawValue < rhs.rawValue } + } public extension LogAttributes { + static let safePublic = [LogAttributesKey.public: true] + /// PushChannelV2 (consumable notications sync) static let pushChannelV2 = [LogAttributesKey.pushChannelVersion: "v2"] + /// PushChannel V1 (regular sync) static let pushChannelV1 = [LogAttributesKey.pushChannelVersion: "v1"] + /// legacy pushChannel (Starscream) static let pushChannelV0 = [LogAttributesKey.pushChannelVersion: "v0"] + } diff --git a/WireLogging/Sources/WireLogging/LogConvertible.swift b/WireLogging/Sources/WireLegacyLogging/LogConvertible.swift similarity index 100% rename from WireLogging/Sources/WireLogging/LogConvertible.swift rename to WireLogging/Sources/WireLegacyLogging/LogConvertible.swift diff --git a/WireLogging/Sources/WireLogging/LogFilesProviding.swift b/WireLogging/Sources/WireLegacyLogging/LogFilesProviding.swift similarity index 100% rename from WireLogging/Sources/WireLogging/LogFilesProviding.swift rename to WireLogging/Sources/WireLegacyLogging/LogFilesProviding.swift diff --git a/WireLogging/Sources/WireLogging/LogTarget.swift b/WireLogging/Sources/WireLegacyLogging/LogTarget.swift similarity index 100% rename from WireLogging/Sources/WireLogging/LogTarget.swift rename to WireLogging/Sources/WireLegacyLogging/LogTarget.swift diff --git a/WireLogging/Sources/WireLogging/LoggerProtocol.swift b/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift similarity index 94% rename from WireLogging/Sources/WireLogging/LoggerProtocol.swift rename to WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift index adf9a0a5db3..45aaec174c9 100644 --- a/WireLogging/Sources/WireLogging/LoggerProtocol.swift +++ b/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift @@ -27,6 +27,7 @@ public protocol LoggerProtocol { /// Add an attribute, value to each logs - DataDog only func addTag(_ key: LogAttributesKey, value: String?) + } public extension LoggerProtocol { @@ -35,8 +36,8 @@ public extension LoggerProtocol { var logAttributes = attributes // drop attributes used for visibility and category - logAttributes.removeValue(forKey: LogAttributesKey.public) - logAttributes.removeValue(forKey: LogAttributesKey.tag) + logAttributes.removeValue(forKey: .public) + logAttributes.removeValue(forKey: .tag) guard !logAttributes.isEmpty else { return "" diff --git a/WireLogging/Sources/WireLogging/Network/RequestLog.swift b/WireLogging/Sources/WireLegacyLogging/Network/RequestLog.swift similarity index 100% rename from WireLogging/Sources/WireLogging/Network/RequestLog.swift rename to WireLogging/Sources/WireLegacyLogging/Network/RequestLog.swift diff --git a/WireLogging/Sources/WireLogging/Network/ResponseLog.swift b/WireLogging/Sources/WireLegacyLogging/Network/ResponseLog.swift similarity index 100% rename from WireLogging/Sources/WireLogging/Network/ResponseLog.swift rename to WireLogging/Sources/WireLegacyLogging/Network/ResponseLog.swift diff --git a/WireLogging/Sources/WireLogging/SystemLogger.swift b/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift similarity index 99% rename from WireLogging/Sources/WireLogging/SystemLogger.swift rename to WireLogging/Sources/WireLegacyLogging/SystemLogger.swift index 201c3c69020..92e12d2fb2a 100644 --- a/WireLogging/Sources/WireLogging/SystemLogger.swift +++ b/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift @@ -87,4 +87,5 @@ public class SystemLogger: LoggerProtocol { os_log(osLogType, log: logger, "\(finalMessage)") #endif } + } diff --git a/WireLogging/Sources/WireLogging/WireLogger+Instances.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift similarity index 100% rename from WireLogging/Sources/WireLogging/WireLogger+Instances.swift rename to WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift diff --git a/WireLogging/Sources/WireLogging/WireLogger+MessageTime.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger+MessageTime.swift similarity index 100% rename from WireLogging/Sources/WireLogging/WireLogger+MessageTime.swift rename to WireLogging/Sources/WireLegacyLogging/WireLogger+MessageTime.swift diff --git a/WireLogging/Sources/WireLogging/WireLogger.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger.swift similarity index 100% rename from WireLogging/Sources/WireLogging/WireLogger.swift rename to WireLogging/Sources/WireLegacyLogging/WireLogger.swift diff --git a/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/AutoMockable.stencil b/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/AutoMockable.stencil new file mode 120000 index 00000000000..384e2627f10 --- /dev/null +++ b/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/AutoMockable.stencil @@ -0,0 +1 @@ +../../../../WirePlugins/Plugins/SourceryPlugin/Stencils/AutoMockable.stencil \ No newline at end of file diff --git a/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/sourcery.yml new file mode 100644 index 00000000000..6b01fdeb9bf --- /dev/null +++ b/WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/sourcery.yml @@ -0,0 +1,8 @@ +sources: +- ${PACKAGE_ROOT_DIR}/Sources/WireLegacyLogging +templates: +- ${TARGET_DIR}/Sourcery/AutoMockable.stencil +output: + ${DERIVED_SOURCES_DIR} +args: + autoMockablePublicImports: ["Foundation", "WireLegacyLogging"] diff --git a/WireLogging/Sources/WireLegacyLoggingSupport/WireLegacyLogging.swift b/WireLogging/Sources/WireLegacyLoggingSupport/WireLegacyLogging.swift new file mode 100644 index 00000000000..74d5741b771 --- /dev/null +++ b/WireLogging/Sources/WireLegacyLoggingSupport/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +// This target generates mocks via 'sourcery'. It uses the plugin configured in `Package.swift`. +// The generated mocks are processed from the sandbox directory and are not visible in the project folder: +// https://github.com/apple/swift-package-manager/blob/main/Documentation/Plugins.md#implementing-the-build-tool-plugin-script diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml index da40542bbce..ea60aecd8ba 100644 --- a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml +++ b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml @@ -5,4 +5,4 @@ templates: output: ${DERIVED_SOURCES_DIR} args: - autoMockablePublicImports: ["Foundation", "WireLogging"] + autoMockableImports: ["Foundation"] diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index c207acddbfe..1d2c64be5d6 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,15 +1,19 @@ { "configurations" : [ { - "id" : "8DA8C849-71C0-4072-92BA-9AF39BAA1039", - "name" : "Test Scheme Action", + "id" : "5D82ECB3-F716-4EAB-8FE5-C380EE8B8618", + "name" : "Configuration 1", "options" : { } } ], "defaultOptions" : { - "performanceAntipatternCheckerEnabled" : true + "language" : "en", + "region" : "DE", + "testExecutionOrdering" : "random", + "threadSanitizerEnabled" : true, + "undefinedBehaviorSanitizerEnabled" : true }, "testTargets" : [ { @@ -18,6 +22,14 @@ "identifier" : "WireLoggingTests", "name" : "WireLoggingTests" } + }, + { + "parallelizable" : false, + "target" : { + "containerPath" : "container:WireLogging", + "identifier" : "WireLegacyLoggingTests", + "name" : "WireLegacyLoggingTests" + } } ], "version" : 1 diff --git a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift b/WireLogging/Tests/WireLegacyLoggingTests/Network/RequestLogTests.swift similarity index 98% rename from WireLogging/Tests/WireLogging/Network/RequestLogTests.swift rename to WireLogging/Tests/WireLegacyLoggingTests/Network/RequestLogTests.swift index b6ab784cae6..25545f95b74 100644 --- a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift +++ b/WireLogging/Tests/WireLegacyLoggingTests/Network/RequestLogTests.swift @@ -18,7 +18,8 @@ import Foundation import XCTest -@testable import WireLogging + +@testable import WireLegacyLogging class RequestLogTests: XCTestCase { diff --git a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift new file mode 100644 index 00000000000..a54364d4d8c --- /dev/null +++ b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift @@ -0,0 +1,30 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import Testing + +@testable import WireLogging + +struct Test { + + @Test + func nothing() async throws { + // just a placeholder test + } + +} diff --git a/WireMessaging/Package.swift b/WireMessaging/Package.swift index e33558706ef..b91c44ed46e 100644 --- a/WireMessaging/Package.swift +++ b/WireMessaging/Package.swift @@ -29,7 +29,7 @@ let package = Package( dependencies: [ .product(name: "CellsSDK", package: "cells-sdk-swift"), "WireFoundation", - "WireLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -37,7 +37,7 @@ let package = Package( dependencies: [ "WireData", "WireMessagingDomain", - "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "AWSS3", package: "aws-sdk-swift"), .product(name: "CellsSDK", package: "cells-sdk-swift"), .product(name: "Collections", package: "swift-collections") diff --git a/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift b/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift new file mode 100644 index 00000000000..f7df465066d --- /dev/null +++ b/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireNetwork/Package.swift b/WireNetwork/Package.swift index cf36a2e0d93..faafef04211 100644 --- a/WireNetwork/Package.swift +++ b/WireNetwork/Package.swift @@ -20,9 +20,10 @@ let package = Package( .target( name: "WireNetwork", dependencies: [ + .product(name: "WireCrypto", package: "WireFoundation"), + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "WireFoundation", package: "WireFoundation"), - .product(name: "WireLogging", package: "WireLogging"), - .product(name: "WireCrypto", package: "WireFoundation") + .product(name: "WireLogging", package: "WireLogging") ] ), .target( diff --git a/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift b/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/WireUI/Package.swift b/WireUI/Package.swift index c8200981e55..c85df47b8c9 100644 --- a/WireUI/Package.swift +++ b/WireUI/Package.swift @@ -115,7 +115,7 @@ let package = Package( "WireDesign", .product(name: "WireDomainPackage", package: "WireDomainPackage"), "WireFoundation", - "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireReusableUIComponents", "WireLocators" ], diff --git a/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift b/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift new file mode 100644 index 00000000000..f4c7f4d466a --- /dev/null +++ b/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias LoggerProtocol = WireLegacyLogging.LoggerProtocol +public typealias LogConvertible = WireLegacyLogging.LogConvertible +public typealias LogAttributes = WireLegacyLogging.LogAttributes +public typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey diff --git a/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift b/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-data-model/Source/Utilis/WireLegacyLogging.swift b/wire-ios-data-model/Source/Utilis/WireLegacyLogging.swift new file mode 100644 index 00000000000..fd17cd04f04 --- /dev/null +++ b/wire-ios-data-model/Source/Utilis/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +public typealias LogAttributes = WireLegacyLogging.LogAttributes + +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index f6f41870512..baaf06c6f2c 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -8,9 +8,7 @@ /* Begin PBXBuildFile section */ 010093B32D4BA2F400429015 /* ZMConversationTests_SystemMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010093B22D4BA2DB00429015 /* ZMConversationTests_SystemMessages.swift */; }; - 010347222ED4566D000676DE /* NSManagedObjectContext+Unpack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010347212ED4566D000676DE /* NSManagedObjectContext+Unpack.swift */; }; 0129E7F929A520870065E6DB /* SafeCoreCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0129E7F829A520870065E6DB /* SafeCoreCrypto.swift */; }; - 0129E7FB29A520EB0065E6DB /* SafeFileContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0129E7FA29A520EB0065E6DB /* SafeFileContext.swift */; }; 013887A22B9A5C6000323DD0 /* CleanupModels107PreAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013887A12B9A5C6000323DD0 /* CleanupModels107PreAction.swift */; }; 013887A62B9A5C6B00323DD0 /* PrimaryKeyGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013887A32B9A5C6B00323DD0 /* PrimaryKeyGenerator.swift */; }; 013887A72B9A5C6B00323DD0 /* PrefillPrimaryKeyAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013887A42B9A5C6B00323DD0 /* PrefillPrimaryKeyAction.swift */; }; @@ -21,13 +19,11 @@ 01423BC92DB013DF00C49567 /* store2-125-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 01423BC82DB013DF00C49567 /* store2-125-0.wiredatabase */; }; 01482E8A2B10ED0800F3B2CB /* MLSSubgroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F0781129F6C59D0031E19D /* MLSSubgroup.swift */; }; 01482E8B2B10EEB000F3B2CB /* FetchSubgroupAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F0780C29F292770031E19D /* FetchSubgroupAction.swift */; }; - 014DD8D42B6D1FF6007ECFD1 /* UUID+SafeLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 014DD8D22B6D1FE9007ECFD1 /* UUID+SafeLogging.swift */; }; 0153CA932B8554EC000000CA /* store2-113-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0153CA8F2B855456000000CA /* store2-113-0.wiredatabase */; }; 01586D422CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01586D402CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift */; }; 01586D442CAED2B200C3BCE1 /* store2-119-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 01586D432CAED2B200C3BCE1 /* store2-119-0.wiredatabase */; }; 0158DF232C5A3C6700C7BFFD /* event_4.0.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = 0158DF222C5A3C6600C7BFFD /* event_4.0.sqlite */; }; - 016D293A2C10FB2F00DB969A /* ZMMessageTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016D29392C10FB2F00DB969A /* ZMMessageTimer.swift */; }; - 0176B8812E7AE25B005D448B /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 0176B8802E7AE25B005D448B /* WireLogging */; }; + 0176B8812E7AE25B005D448B /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 0176B8802E7AE25B005D448B /* WireLegacyLogging */; }; 0176BDD12D515764002C33DE /* store2-122-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0176BDD02D515764002C33DE /* store2-122-0.wiredatabase */; }; 017962982B83FC1400D6C7B6 /* DatabaseMigrationTests+UserUniqueness.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017962952B83FC1400D6C7B6 /* DatabaseMigrationTests+UserUniqueness.swift */; }; 017962992B83FC1400D6C7B6 /* DatabaseMigrationTests+TeamUniqueness.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017962962B83FC1400D6C7B6 /* DatabaseMigrationTests+TeamUniqueness.swift */; }; @@ -60,12 +56,10 @@ 060ED6D12499E97200412C4A /* NSManagedObjectContext+ServerTimeDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060ED6D02499E97200412C4A /* NSManagedObjectContext+ServerTimeDelta.swift */; }; 060ED6DC2499F78700412C4A /* ZMUpdateEvent+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F19550372040628000338E91 /* ZMUpdateEvent+Helper.swift */; }; 0612D241243DC134008811A7 /* store2-81-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0612D240243DC12E008811A7 /* store2-81-0.wiredatabase */; }; - 0614E96D2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0614E96C2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift */; }; 0617001323E2FC14005C262D /* GenericMessageTests+LinkMetaData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0617001123E2FBC0005C262D /* GenericMessageTests+LinkMetaData.swift */; }; 0630E17726E0F3570012E2F9 /* store2-95-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0630E17626E0F3570012E2F9 /* store2-95-0.wiredatabase */; }; 0630E4B6257F888600C75BFB /* NSManagedObjectContext+AppLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0630E4B5257F888600C75BFB /* NSManagedObjectContext+AppLock.swift */; }; 0630E4C1257FC41400C75BFB /* store2-88-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 0630E4C0257FC41300C75BFB /* store2-88-0.wiredatabase */; }; - 0634C3A924643A400006081D /* ZMUpdateEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0634C3A824643A400006081D /* ZMUpdateEvent.swift */; }; 063D2928242128D300FA6FEE /* ZMClientMessage+Ephemeral.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063D2927242128D200FA6FEE /* ZMClientMessage+Ephemeral.swift */; }; 063D292A24212AFD00FA6FEE /* ZMClientMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 063D292924212AFD00FA6FEE /* ZMClientMessage.swift */; }; 0642A3332445F2B600DCCFCD /* ZMClientMessage+UpdateEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0642A3322445F2B500DCCFCD /* ZMClientMessage+UpdateEvent.swift */; }; @@ -90,13 +84,11 @@ 069BCC662B30994300DF4EC2 /* E2eIVerificationStatusServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 069BCC652B30994300DF4EC2 /* E2eIVerificationStatusServiceTests.swift */; }; 069D07B82562671D00DBA592 /* FeatureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 069D07B72562671D00DBA592 /* FeatureTests.swift */; }; 06A0E60B281AE65D00E5F822 /* store2-99-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 06A0E60A281AE65D00E5F822 /* store2-99-0.wiredatabase */; }; - 06B1C493248F9173007FDA8D /* GenericMessage+Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B1C492248F9173007FDA8D /* GenericMessage+Debug.swift */; }; 06B99C79242A293500FEAFDE /* ZMClientMessage+Knock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B99C78242A293500FEAFDE /* ZMClientMessage+Knock.swift */; }; 06C6B1B02745675E0049B54E /* store2-97-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 06C6B1AF2745675D0049B54E /* store2-97-0.wiredatabase */; }; 06D0648E2DDFF2560089EB6D /* CoreCryptoKeyMigrationManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D0648D2DDFF2560089EB6D /* CoreCryptoKeyMigrationManagerProtocol.swift */; }; 06D33FCD2524F65D004B9BC1 /* ZMConversationTests+UnreadMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D33FCC2524F65D004B9BC1 /* ZMConversationTests+UnreadMessages.swift */; }; 06D33FCF2525D368004B9BC1 /* store2-86-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 06D33FCE2525D368004B9BC1 /* store2-86-0.wiredatabase */; }; - 06D48735241F930A00881B08 /* GenericMessage+Obfuscation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D48734241F930A00881B08 /* GenericMessage+Obfuscation.swift */; }; 06D48737241FB3F700881B08 /* ZMClientMessage+Obfuscate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D48736241FB3F700881B08 /* ZMClientMessage+Obfuscate.swift */; }; 06D4B1AB2D1F0736004627EB /* MLSClientManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06D4B1AA2D1F0731004627EB /* MLSClientManagerTests.swift */; }; 06E1C835244F1A2300CA4EF2 /* ZMOTRMessage+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E1C834244F1A2300CA4EF2 /* ZMOTRMessage+Helper.swift */; }; @@ -213,7 +205,6 @@ 5451DE371F604CD500C82E75 /* ZMMoveIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5451DE361F604CD500C82E75 /* ZMMoveIndex.swift */; }; 54563B761E0161730089B1D7 /* ZMMessage+Categorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54563B751E0161730089B1D7 /* ZMMessage+Categorization.swift */; }; 54563B7B1E0189780089B1D7 /* ZMMessageCategorizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54563B791E0189750089B1D7 /* ZMMessageCategorizationTests.swift */; }; - 546D3DE61CE5D0B100A6047F /* RichAssetFileType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546D3DE51CE5D0B100A6047F /* RichAssetFileType.swift */; }; 546D3DE91CE5D24C00A6047F /* RichAssetFileTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546D3DE81CE5D24C00A6047F /* RichAssetFileTypeTests.swift */; }; 5473CC731E14245C00814C03 /* NSManagedObjectContext+Debugging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5473CC721E14245C00814C03 /* NSManagedObjectContext+Debugging.swift */; }; 5473CC751E14268600814C03 /* NSManagedObjectContextDebuggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5473CC741E14268600814C03 /* NSManagedObjectContextDebuggingTests.swift */; }; @@ -234,7 +225,6 @@ 54E3EE451F61A53C00A261E3 /* ZMAssetClientMessage+Ephemeral.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E3EE441F61A53C00A261E3 /* ZMAssetClientMessage+Ephemeral.swift */; }; 54E3EE471F61A78B00A261E3 /* ZMAssetClientMessage+Deletion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E3EE461F61A78B00A261E3 /* ZMAssetClientMessage+Deletion.swift */; }; 54ED3A9D1F38CB6A0066AD47 /* DatabaseMigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54ED3A9C1F38CB6A0066AD47 /* DatabaseMigrationTests.swift */; }; - 54EDE6801CBBF1860044A17E /* PINCache+ZMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54EDE67F1CBBF1860044A17E /* PINCache+ZMessaging.swift */; }; 54F6CEAB1CE2972200A1276D /* ZMAssetClientMessage+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54F6CEAA1CE2972200A1276D /* ZMAssetClientMessage+Download.swift */; }; 54F84D041F995B0700ABD7D5 /* DiskDatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54F84D001F995A1F00ABD7D5 /* DiskDatabaseTests.swift */; }; 54FB03AF1E41FC86000E13DC /* NSManagedObjectContext+Patches.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54FB03AE1E41FC86000E13DC /* NSManagedObjectContext+Patches.swift */; }; @@ -254,11 +244,8 @@ 59506A882E2E61BD0051B07A /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 59506A872E2E61BD0051B07A /* SwiftProtobuf */; }; 5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0342E2EA1070051B07A /* GenericMessageProtocol */; }; 5950B0372E2EA1220051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0362E2EA1220051B07A /* GenericMessageProtocol */; }; - 59537CDB2CFF8F2B00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLogging */; }; - 5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */; }; - 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; }; + 59537CDB2CFF8F2B00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */; }; 5966D8342BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */; }; - 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */; }; 5978BFD42E2E6132004778CC /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 5978BFD32E2E6132004778CC /* SwiftProtobuf */; }; 5979E8482D478DD20051080F /* store2-121-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 5979E8472D478DD20051080F /* store2-121-0.wiredatabase */; }; 597B70C72B03C6A5006C2121 /* UpdateConversationProtocolAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C62B03C6A5006C2121 /* UpdateConversationProtocolAction.swift */; }; @@ -303,7 +290,6 @@ 6326E4762AEBB946006EEA28 /* ProteusToMLSMigrationStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6326E4732AEBB92D006EEA28 /* ProteusToMLSMigrationStorage.swift */; }; 63298D9A2434D04D006B6018 /* GenericMessage+External.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63298D992434D04D006B6018 /* GenericMessage+External.swift */; }; 63298D9C24374094006B6018 /* GenericMessageTests+External.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63298D9B24374094006B6018 /* GenericMessageTests+External.swift */; }; - 63298D9E24374489006B6018 /* Dictionary+ObjectForKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63298D9D24374489006B6018 /* Dictionary+ObjectForKey.swift */; }; 63340BBD241C2BC5004ED87C /* store2-80-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 63340BBC241C2BC5004ED87C /* store2-80-0.wiredatabase */; }; 63370C6C242A510A0072C37F /* ZMOTRMessage+UpdateEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63370C6B242A510A0072C37F /* ZMOTRMessage+UpdateEvent.swift */; }; 63370CBB242CB84A0072C37F /* CompositeMessageItemContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63370CBA242CB84A0072C37F /* CompositeMessageItemContent.swift */; }; @@ -324,7 +310,6 @@ 6391A7FD2A6FD7D100832665 /* DatabaseMigrationTests+UserClientUniqueness.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6391A7FB2A6FD7C900832665 /* DatabaseMigrationTests+UserClientUniqueness.swift */; }; 6391A7FF2A6FDB9100832665 /* store2-107-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 6391A7FE2A6FDB9100832665 /* store2-107-0.wiredatabase */; }; 639971AA2B1E301E009DD5CF /* ReplaceSelfMLSKeyPackagesAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 639971A92B1E301E009DD5CF /* ReplaceSelfMLSKeyPackagesAction.swift */; }; - 63AFE2D6244F49A90003F619 /* GenericMessage+MessageCapable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63AFE2D5244F49A90003F619 /* GenericMessage+MessageCapable.swift */; }; 63B1335429A503D100009D84 /* ProteusServiceInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1333729A503D000009D84 /* ProteusServiceInterface.swift */; }; 63B1335529A503D100009D84 /* ProteusService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1333829A503D000009D84 /* ProteusService.swift */; }; 63B1335629A503D100009D84 /* MLSGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1333A29A503D000009D84 /* MLSGroup.swift */; }; @@ -345,7 +330,6 @@ 63B1336B29A503D100009D84 /* MLSGroupStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1335029A503D000009D84 /* MLSGroupStatus.swift */; }; 63B1336E29A503D100009D84 /* StaleMLSKeyMaterialDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1335329A503D000009D84 /* StaleMLSKeyMaterialDetector.swift */; }; 63B658DE243754E100EF463F /* GenericMessage+UpdateEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B658DD243754E100EF463F /* GenericMessage+UpdateEvent.swift */; }; - 63B658E0243789DE00EF463F /* GenericMessage+Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B658DF243789DE00EF463F /* GenericMessage+Assets.swift */; }; 63B74CBD2AE1715000A73006 /* ProteusToMLSMigrationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B74CBC2AE1715000A73006 /* ProteusToMLSMigrationCoordinator.swift */; }; 63BEF5872A2636BC00F482E8 /* MLSConferenceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63BEF5862A2636BC00F482E8 /* MLSConferenceInfo.swift */; }; 63C07015291144F70075D598 /* CoreCryptoConfigProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63C07014291144F70075D598 /* CoreCryptoConfigProviderTests.swift */; }; @@ -355,17 +339,14 @@ 63D41E5324531BAD0076826F /* ZMMessage+Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D41E5224531BAD0076826F /* ZMMessage+Reaction.swift */; }; 63D41E6D245733AC0076826F /* ZMMessageTests+Removal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D41E6C245733AC0076826F /* ZMMessageTests+Removal.swift */; }; 63D41E6F24573F420076826F /* ZMConversationTests+SelfConversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D41E6E24573F420076826F /* ZMConversationTests+SelfConversation.swift */; }; - 63D41E7124597E420076826F /* GenericMessage+Flags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D41E7024597E420076826F /* GenericMessage+Flags.swift */; }; 63D9A19E282AA0050074C20C /* NSManagedObjectContext+Federation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63D9A19D282AA0050074C20C /* NSManagedObjectContext+Federation.swift */; }; 63DA335E286C9CF000818C3C /* NSManagedObjectContext+MLSService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DA335D286C9CF000818C3C /* NSManagedObjectContext+MLSService.swift */; }; 63DA33AF28746CCF00818C3C /* store2-103-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 63DA33AE28746CC100818C3C /* store2-103-0.wiredatabase */; }; 63E313D3274D5F57002EAF1D /* ZMConversationTests+Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E313D2274D5F57002EAF1D /* ZMConversationTests+Team.swift */; }; 63F376DA2834FF7200FE1F05 /* NSManagedObjectContextTests+Federation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F376D92834FF7200FE1F05 /* NSManagedObjectContextTests+Federation.swift */; }; - 63F65F01246B073900534A69 /* GenericMessage+Content.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F65F00246B073900534A69 /* GenericMessage+Content.swift */; }; 63FACD56291BC598003AB25D /* MLSClientIDTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63FACD55291BC598003AB25D /* MLSClientIDTests.swift */; }; 63FCE54828C78D1F00126D9D /* ZMConversationTests+Predicates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63FCE54728C78D1F00126D9D /* ZMConversationTests+Predicates.swift */; }; 76E000BA2DAFED1B00853C45 /* WireCellsMessageAttachmentDraftEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76E000B92DAFED1B00853C45 /* WireCellsMessageAttachmentDraftEntity.swift */; }; - 7A2778C6285223D90044A73F /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2778C5285223D90044A73F /* KeychainManager.swift */; }; 7A2778C8285329210044A73F /* KeychainManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A2778C7285329210044A73F /* KeychainManagerTests.swift */; }; 7C88C5352182FBD90037DD03 /* ZMClientMessageTests+Replies.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C88C5312182F6150037DD03 /* ZMClientMessageTests+Replies.swift */; }; 7CBC3FC120177C3C008D06E4 /* RasterImages+Protobuf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CBC3FC020177C3C008D06E4 /* RasterImages+Protobuf.swift */; }; @@ -456,7 +437,6 @@ CEB15E531D7EE5AB0048A011 /* ZMClientMessagesTests+Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEB15E501D7EE53A0048A011 /* ZMClientMessagesTests+Reaction.swift */; }; D5FA30C52063DC2D00716618 /* BackupMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5FA30C42063DC2D00716618 /* BackupMetadata.swift */; }; D5FA30CB2063ECD400716618 /* BackupMetadataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5FA30CA2063ECD400716618 /* BackupMetadataTests.swift */; }; - D5FA30CF2063F8EC00716618 /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5FA30CE2063F8EC00716618 /* Version.swift */; }; D5FA30D12063FD3A00716618 /* VersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5FA30D02063FD3A00716618 /* VersionTests.swift */; }; E4AD4E412E281FB800308EDC /* ResetBrokenMLSConversationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4AD4E402E281FB800308EDC /* ResetBrokenMLSConversationDelegate.swift */; }; E4E38CE52E2EC99E00E4FFA9 /* MLSServiceInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4E38CE42E2EC99E00E4FFA9 /* MLSServiceInterface.swift */; }; @@ -465,7 +445,6 @@ E61B3F382BA85923005FF9F8 /* OneOnOneConversationMigrationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E61B3F372BA85923005FF9F8 /* OneOnOneConversationMigrationAction.swift */; }; E61B3F3A2BA9C9FC005FF9F8 /* MigrateMLSOneOnOneConversationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E61B3F392BA9C9FC005FF9F8 /* MigrateMLSOneOnOneConversationError.swift */; }; E631D0472C18551F005D3178 /* CreateMLSGroupUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = E631D0462C18551F005D3178 /* CreateMLSGroupUseCase.swift */; }; - E66029D22BDA43E10033C524 /* SearchUsersCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = E66029D12BDA43E10033C524 /* SearchUsersCache.swift */; }; E662328B2BF4911E002B680A /* MLSGroupVerification.swift in Sources */ = {isa = PBXBuildFile; fileRef = E662328A2BF4911E002B680A /* MLSGroupVerification.swift */; }; E66232912BF4C75D002B680A /* MLSGroupVerificationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E66232902BF4C75D002B680A /* MLSGroupVerificationTests.swift */; }; E6707E902BBD683F00469D57 /* PINCache in Frameworks */ = {isa = PBXBuildFile; productRef = E6707E8F2BBD683F00469D57 /* PINCache */; }; @@ -504,7 +483,6 @@ EE002F222878345C0027D63A /* store2-104-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = EE002F212878345C0027D63A /* store2-104-0.wiredatabase */; }; EE032B3129A62CA600E1DDF3 /* ProteusSessionID.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE032B2F29A62CA600E1DDF3 /* ProteusSessionID.swift */; }; EE032B3629A62CD600E1DDF3 /* ProteusServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE032B3529A62CD600E1DDF3 /* ProteusServiceTests.swift */; }; - EE04084E28CA85B2009E4B8D /* Date+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE04084D28CA85B2009E4B8D /* Date+Helpers.swift */; }; EE0DE5042A24D2A10029746C /* DeleteSubgroupAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0DE5032A24D2A10029746C /* DeleteSubgroupAction.swift */; }; EE174FCE2522756700482A70 /* ZMConversationPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE174FCD2522756700482A70 /* ZMConversationPerformanceTests.swift */; }; EE19CE1F2AEBE4CB00CB8641 /* SyncMLSOneToOneConversationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE19CE1E2AEBE4CB00CB8641 /* SyncMLSOneToOneConversationAction.swift */; }; @@ -518,7 +496,6 @@ EE42938E252C460000E70670 /* Changes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE42938D252C460000E70670 /* Changes.swift */; }; EE429390252C466500E70670 /* ChangeInfoConsumer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE42938F252C466500E70670 /* ChangeInfoConsumer.swift */; }; EE46B92828A511630063B38D /* ZMClientMessageTests+MLSEncryptedPayloadGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE46B92728A511630063B38D /* ZMClientMessageTests+MLSEncryptedPayloadGenerator.swift */; }; - EE5316422A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */; }; EE5F54CC259B22C400F11F3C /* Account+Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5F54CB259B22C400F11F3C /* Account+Keychain.swift */; }; EE68EEC9252DC4450013B242 /* ChangeDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE68EEC8252DC4450013B242 /* ChangeDetector.swift */; }; EE68EECB252DC4730013B242 /* ExplicitChangeDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE68EECA252DC4720013B242 /* ExplicitChangeDetector.swift */; }; @@ -540,7 +517,6 @@ EE934ACB2B67F8CB008FDB19 /* ZMConversationListTests+OneOnOne.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE934ACA2B67F8CB008FDB19 /* ZMConversationListTests+OneOnOne.swift */; }; EE980FB22834EB3A00CC6B9F /* store2-100-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = EE980FB12834EB3A00CC6B9F /* store2-100-0.wiredatabase */; }; EE98878E28882BFF002340D2 /* MLSServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE98878D28882BFF002340D2 /* MLSServiceTests.swift */; }; - EE997A1425062295008336D2 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE997A1325062295008336D2 /* Logging.swift */; }; EE997A16250629DC008336D2 /* ZMMessage+ProcessingError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE997A15250629DC008336D2 /* ZMMessage+ProcessingError.swift */; }; EE9AD9162696F01700DD5F51 /* LegacyFeatureRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE9AD9152696F01700DD5F51 /* LegacyFeatureRepository.swift */; }; EE9ADC47286F38D1002B2148 /* store2-102-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = EE9ADC46286F38D1002B2148 /* store2-102-0.wiredatabase */; }; @@ -588,11 +564,8 @@ F1B025621E53500400900C65 /* ZMConversationTests+PrepareToSend.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B025601E534CF900900C65 /* ZMConversationTests+PrepareToSend.swift */; }; F1B58928202DCF0C002BB59B /* ZMConversationTests+CreationSystemMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B58926202DCEF9002BB59B /* ZMConversationTests+CreationSystemMessages.swift */; }; F1C867701FA9CCB5001505E8 /* DuplicateMerging.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1C8676F1FA9CCB5001505E8 /* DuplicateMerging.swift */; }; - F1FDF2F721B152BC00E037A1 /* GenericMessage+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FDF2F521B152BC00E037A1 /* GenericMessage+Helper.swift */; }; - F1FDF2F821B152BC00E037A1 /* GenericMessage+Hashing.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FDF2F621B152BC00E037A1 /* GenericMessage+Hashing.swift */; }; F1FDF2FA21B1555A00E037A1 /* ZMClientMessage+Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FDF2F921B1555A00E037A1 /* ZMClientMessage+Location.swift */; }; F1FDF2FE21B1572500E037A1 /* ZMGenericMessageData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FDF2FD21B1572500E037A1 /* ZMGenericMessageData.swift */; }; - F1FDF30021B1580400E037A1 /* GenericMessage+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1FDF2FF21B1580400E037A1 /* GenericMessage+Utils.swift */; }; F90D99A81E02E22900034070 /* AssetCollectionBatchedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F90D99A61E02E22400034070 /* AssetCollectionBatchedTests.swift */; }; F91EAAC61D885D7B0010ACBE /* video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = F91EAAC41D885D720010ACBE /* video.mp4 */; }; F920AE171E38C547001BC14F /* NotificationObservers.swift in Sources */ = {isa = PBXBuildFile; fileRef = F920AE161E38C547001BC14F /* NotificationObservers.swift */; }; @@ -603,21 +576,13 @@ F92C992D1DAFC5AC0034AFDD /* ZMConversationTests+Ephemeral.swift in Sources */ = {isa = PBXBuildFile; fileRef = F92C992B1DAFC58A0034AFDD /* ZMConversationTests+Ephemeral.swift */; }; F93265211D8950F10076AAD6 /* NSManagedObjectContext+FetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93265201D8950F10076AAD6 /* NSManagedObjectContext+FetchRequest.swift */; }; F93265291D89648B0076AAD6 /* ZMAssetClientMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B71F5D1CB2BC85001DB03F /* ZMAssetClientMessageTests.swift */; }; - F9331C831CB4191B00139ECC /* NSPredicate+ZMSearch.h in Headers */ = {isa = PBXBuildFile; fileRef = F9331C811CB4191B00139ECC /* NSPredicate+ZMSearch.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9331C841CB4191B00139ECC /* NSPredicate+ZMSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = F9331C821CB4191B00139ECC /* NSPredicate+ZMSearch.m */; }; - F9331C871CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9331C881CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.m in Sources */ = {isa = PBXBuildFile; fileRef = F9331C861CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.m */; }; F93A30251D6EFB47005CCB1D /* ZMMessageConfirmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93A30231D6EFB47005CCB1D /* ZMMessageConfirmation.swift */; }; F93A302F1D6F2633005CCB1D /* ZMMessageTests+Confirmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93A302E1D6F2633005CCB1D /* ZMMessageTests+Confirmation.swift */; }; F93C4C7D1E24E1B1007E9CEE /* NotificationDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93C4C7C1E24E1B1007E9CEE /* NotificationDispatcher.swift */; }; F93C4C7F1E24F832007E9CEE /* NotificationDispatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93C4C7E1E24F832007E9CEE /* NotificationDispatcherTests.swift */; }; F943BC2D1E88FEC80048A768 /* ChangedIndexes.swift in Sources */ = {isa = PBXBuildFile; fileRef = F943BC2C1E88FEC80048A768 /* ChangedIndexes.swift */; }; F94A208F1CB51AF50059632A /* ManagedObjectValidationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F94A208E1CB51AF50059632A /* ManagedObjectValidationTests.m */; }; - F963E9701D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = F963E96B1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F963E9711D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = F963E96C1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.m */; }; F963E9741D9BF9ED00098AD3 /* ProtosTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F963E9721D9BF9E300098AD3 /* ProtosTests.swift */; }; - F963E9801D9C09E700098AD3 /* ZMMessageTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = F963E97E1D9C09E700098AD3 /* ZMMessageTimer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F963E9811D9C09E700098AD3 /* ZMMessageTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = F963E97F1D9C09E700098AD3 /* ZMMessageTimer.m */; }; F963E9831D9C0DC400098AD3 /* ZMMessageDestructionTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F963E9821D9C0DC400098AD3 /* ZMMessageDestructionTimer.swift */; }; F963E9861D9D485900098AD3 /* ZMClientMessageTests+Ephemeral.swift in Sources */ = {isa = PBXBuildFile; fileRef = F963E9841D9D47D100098AD3 /* ZMClientMessageTests+Ephemeral.swift */; }; F963E9931D9E9D1800098AD3 /* ZMAssetClientMessageTests+Ephemeral.swift in Sources */ = {isa = PBXBuildFile; fileRef = F963E9921D9E9D1800098AD3 /* ZMAssetClientMessageTests+Ephemeral.swift */; }; @@ -654,11 +619,6 @@ F9A706B41CAEE01D00C2F5FE /* ObjectChangeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A706391CAEE01D00C2F5FE /* ObjectChangeInfo.swift */; }; F9A706B61CAEE01D00C2F5FE /* UserClientChangeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A7063B1CAEE01D00C2F5FE /* UserClientChangeInfo.swift */; }; F9A706B71CAEE01D00C2F5FE /* UserChangeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A7063C1CAEE01D00C2F5FE /* UserChangeInfo.swift */; }; - F9A706C31CAEE01D00C2F5FE /* UserImageLocalCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A706491CAEE01D00C2F5FE /* UserImageLocalCache.swift */; }; - F9A706C51CAEE01D00C2F5FE /* ZMFetchRequestBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = F9A7064B1CAEE01D00C2F5FE /* ZMFetchRequestBatch.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9A706C61CAEE01D00C2F5FE /* ZMFetchRequestBatch.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A7064C1CAEE01D00C2F5FE /* ZMFetchRequestBatch.m */; }; - F9A706C81CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h in Headers */ = {isa = PBXBuildFile; fileRef = F9A7064E1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F9A706C91CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A7064F1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.m */; }; F9A706F61CAEE31800C2F5FE /* 1900x1500.jpg in Resources */ = {isa = PBXBuildFile; fileRef = F9A706CA1CAEE30700C2F5FE /* 1900x1500.jpg */; }; F9A706F71CAEE31C00C2F5FE /* animated.gif in Resources */ = {isa = PBXBuildFile; fileRef = F9A706CB1CAEE30700C2F5FE /* animated.gif */; }; F9A706F81CAEE32400C2F5FE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F9A706CD1CAEE30700C2F5FE /* InfoPlist.strings */; }; @@ -685,7 +645,6 @@ F9A7085C1CAEED1B00C2F5FE /* ZMBaseManagedObjectTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A7085B1CAEED1B00C2F5FE /* ZMBaseManagedObjectTest.m */; }; F9A708601CAEEF4700C2F5FE /* MessagingTest+EventFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A7085F1CAEEF4700C2F5FE /* MessagingTest+EventFactory.m */; }; F9A708651CAEF9BD00C2F5FE /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F9A708641CAEF9BD00C2F5FE /* Default-568h@2x.png */; }; - F9AB00271F0CE5520037B437 /* FileManager+FileLocations.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9AB00261F0CE5520037B437 /* FileManager+FileLocations.swift */; }; F9AB002A1F0D2C120037B437 /* FileManager+FileLocationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9AB00281F0D2BE40037B437 /* FileManager+FileLocationTests.swift */; }; F9B0FF321D79D1140098C17C /* ZMClientMessageTests+Unarchiving.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B0FF311D79D1140098C17C /* ZMClientMessageTests+Unarchiving.swift */; }; F9B71F0C1CB264DF001DB03F /* ZMConversationListDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = F9B71F071CB264DF001DB03F /* ZMConversationListDirectory.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -761,9 +720,7 @@ /* Begin PBXFileReference section */ 010093B22D4BA2DB00429015 /* ZMConversationTests_SystemMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMConversationTests_SystemMessages.swift; sourceTree = ""; }; - 010347212ED4566D000676DE /* NSManagedObjectContext+Unpack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Unpack.swift"; sourceTree = ""; }; 0129E7F829A520870065E6DB /* SafeCoreCrypto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeCoreCrypto.swift; sourceTree = ""; }; - 0129E7FA29A520EB0065E6DB /* SafeFileContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafeFileContext.swift; sourceTree = ""; }; 013887A12B9A5C6000323DD0 /* CleanupModels107PreAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CleanupModels107PreAction.swift; sourceTree = ""; }; 013887A32B9A5C6B00323DD0 /* PrimaryKeyGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrimaryKeyGenerator.swift; sourceTree = ""; }; 013887A42B9A5C6B00323DD0 /* PrefillPrimaryKeyAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrefillPrimaryKeyAction.swift; sourceTree = ""; }; @@ -772,12 +729,10 @@ 013887AA2B9A5C8B00323DD0 /* CoreDataMigrationAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationAction.swift; sourceTree = ""; }; 013887AD2B9A5CA800323DD0 /* CoreDataMigrationActionFactoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationActionFactoryTests.swift; sourceTree = ""; }; 01423BC82DB013DF00C49567 /* store2-125-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-125-0.wiredatabase"; sourceTree = ""; }; - 014DD8D22B6D1FE9007ECFD1 /* UUID+SafeLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UUID+SafeLogging.swift"; sourceTree = ""; }; 0153CA8F2B855456000000CA /* store2-113-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-113-0.wiredatabase"; sourceTree = ""; }; 01586D402CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FixDuplicateOneOnOneConversationsAction.swift; sourceTree = ""; }; 01586D432CAED2B200C3BCE1 /* store2-119-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-119-0.wiredatabase"; sourceTree = ""; }; 0158DF222C5A3C6600C7BFFD /* event_4.0.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; path = event_4.0.sqlite; sourceTree = ""; }; - 016D29392C10FB2F00DB969A /* ZMMessageTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMMessageTimer.swift; sourceTree = ""; }; 0176BDD02D515764002C33DE /* store2-122-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-122-0.wiredatabase"; sourceTree = ""; }; 017962952B83FC1400D6C7B6 /* DatabaseMigrationTests+UserUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+UserUniqueness.swift"; sourceTree = ""; }; 017962962B83FC1400D6C7B6 /* DatabaseMigrationTests+TeamUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+TeamUniqueness.swift"; sourceTree = ""; }; @@ -808,12 +763,10 @@ 060D194D2462A9D000623376 /* ZMMessageTests+GenericMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMMessageTests+GenericMessage.swift"; sourceTree = ""; }; 060ED6D02499E97200412C4A /* NSManagedObjectContext+ServerTimeDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+ServerTimeDelta.swift"; sourceTree = ""; }; 0612D240243DC12E008811A7 /* store2-81-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-81-0.wiredatabase"; sourceTree = ""; }; - 0614E96C2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+BaseCompounds.swift"; sourceTree = ""; }; 0617001123E2FBC0005C262D /* GenericMessageTests+LinkMetaData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessageTests+LinkMetaData.swift"; sourceTree = ""; }; 0630E17626E0F3570012E2F9 /* store2-95-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-95-0.wiredatabase"; sourceTree = ""; }; 0630E4B5257F888600C75BFB /* NSManagedObjectContext+AppLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+AppLock.swift"; sourceTree = ""; }; 0630E4C0257FC41300C75BFB /* store2-88-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-88-0.wiredatabase"; sourceTree = ""; }; - 0634C3A824643A400006081D /* ZMUpdateEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMUpdateEvent.swift; sourceTree = ""; }; 063D2927242128D200FA6FEE /* ZMClientMessage+Ephemeral.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+Ephemeral.swift"; sourceTree = ""; }; 063D292924212AFD00FA6FEE /* ZMClientMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMClientMessage.swift; sourceTree = ""; }; 0642A3322445F2B500DCCFCD /* ZMClientMessage+UpdateEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+UpdateEvent.swift"; sourceTree = ""; }; @@ -838,13 +791,11 @@ 069BCC652B30994300DF4EC2 /* E2eIVerificationStatusServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2eIVerificationStatusServiceTests.swift; sourceTree = ""; }; 069D07B72562671D00DBA592 /* FeatureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureTests.swift; sourceTree = ""; }; 06A0E60A281AE65D00E5F822 /* store2-99-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-99-0.wiredatabase"; sourceTree = ""; }; - 06B1C492248F9173007FDA8D /* GenericMessage+Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Debug.swift"; sourceTree = ""; }; 06B99C78242A293500FEAFDE /* ZMClientMessage+Knock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+Knock.swift"; sourceTree = ""; }; 06C6B1AF2745675D0049B54E /* store2-97-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-97-0.wiredatabase"; sourceTree = ""; }; 06D0648D2DDFF2560089EB6D /* CoreCryptoKeyMigrationManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreCryptoKeyMigrationManagerProtocol.swift; sourceTree = ""; }; 06D33FCC2524F65D004B9BC1 /* ZMConversationTests+UnreadMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+UnreadMessages.swift"; sourceTree = ""; }; 06D33FCE2525D368004B9BC1 /* store2-86-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-86-0.wiredatabase"; sourceTree = ""; }; - 06D48734241F930A00881B08 /* GenericMessage+Obfuscation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Obfuscation.swift"; sourceTree = ""; }; 06D48736241FB3F700881B08 /* ZMClientMessage+Obfuscate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+Obfuscate.swift"; sourceTree = ""; }; 06D4B1AA2D1F0731004627EB /* MLSClientManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSClientManagerTests.swift; sourceTree = ""; }; 06E1C834244F1A2300CA4EF2 /* ZMOTRMessage+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMOTRMessage+Helper.swift"; sourceTree = ""; }; @@ -886,7 +837,6 @@ 165124D72189AE90006A3C75 /* ZMAssetClientMessage+Quotes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMAssetClientMessage+Quotes.swift"; sourceTree = ""; }; 16519D53231D6F8200C9D76D /* ZMConversationTests+Deletion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+Deletion.swift"; sourceTree = ""; }; 1651F9BD1D3554C800A9FAE8 /* ZMClientMessageTests+TextMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+TextMessage.swift"; sourceTree = ""; }; - 1657FA9B2D9C432200A7B337 /* CoreCryptoContextProtocolExt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreCryptoContextProtocolExt.swift; sourceTree = ""; }; 165DC51E21491C0400090B7B /* Mention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = ""; }; 165DC52021491D8700090B7B /* ZMClientMessage+TextMessageData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+TextMessageData.swift"; sourceTree = ""; }; 165E0F68217F871400E36D08 /* ZMOTRMessage+ContentHashing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMOTRMessage+ContentHashing.swift"; sourceTree = ""; }; @@ -958,7 +908,6 @@ 5451DE361F604CD500C82E75 /* ZMMoveIndex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZMMoveIndex.swift; sourceTree = ""; }; 54563B751E0161730089B1D7 /* ZMMessage+Categorization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMMessage+Categorization.swift"; sourceTree = ""; }; 54563B791E0189750089B1D7 /* ZMMessageCategorizationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZMMessageCategorizationTests.swift; sourceTree = ""; }; - 546D3DE51CE5D0B100A6047F /* RichAssetFileType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RichAssetFileType.swift; sourceTree = ""; }; 546D3DE81CE5D24C00A6047F /* RichAssetFileTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RichAssetFileTypeTests.swift; sourceTree = ""; }; 5473CC721E14245C00814C03 /* NSManagedObjectContext+Debugging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Debugging.swift"; sourceTree = ""; }; 5473CC741E14268600814C03 /* NSManagedObjectContextDebuggingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSManagedObjectContextDebuggingTests.swift; sourceTree = ""; }; @@ -979,7 +928,6 @@ 54E3EE441F61A53C00A261E3 /* ZMAssetClientMessage+Ephemeral.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMAssetClientMessage+Ephemeral.swift"; sourceTree = ""; }; 54E3EE461F61A78B00A261E3 /* ZMAssetClientMessage+Deletion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMAssetClientMessage+Deletion.swift"; sourceTree = ""; }; 54ED3A9C1F38CB6A0066AD47 /* DatabaseMigrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseMigrationTests.swift; sourceTree = ""; }; - 54EDE67F1CBBF1860044A17E /* PINCache+ZMessaging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PINCache+ZMessaging.swift"; sourceTree = ""; }; 54EDE6811CBBF6260044A17E /* FileAssetCacheTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileAssetCacheTests.swift; sourceTree = ""; }; 54F6CEAA1CE2972200A1276D /* ZMAssetClientMessage+Download.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMAssetClientMessage+Download.swift"; sourceTree = ""; }; 54F84D001F995A1F00ABD7D5 /* DiskDatabaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskDatabaseTests.swift; sourceTree = ""; }; @@ -992,10 +940,7 @@ 591F8A032B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCase.swift; sourceTree = ""; }; 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCaseTests.swift; sourceTree = ""; }; 5947923C2EA7A576006BEC0A /* store2-131-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-131-0.wiredatabase"; sourceTree = ""; }; - 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalization.swift; sourceTree = ""; }; - 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizer.swift; sourceTree = ""; }; 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizerTests.swift; sourceTree = ""; }; - 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyNormalizationResult.swift; sourceTree = ""; }; 5979E8472D478DD20051080F /* store2-121-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-121-0.wiredatabase"; sourceTree = ""; }; 597B70C62B03C6A5006C2121 /* UpdateConversationProtocolAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolAction.swift; sourceTree = ""; }; 5980C7002BE4E17100278363 /* E2EINotifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2EINotifications.swift; sourceTree = ""; }; @@ -1036,7 +981,6 @@ 6326E4732AEBB92D006EEA28 /* ProteusToMLSMigrationStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusToMLSMigrationStorage.swift; sourceTree = ""; }; 63298D992434D04D006B6018 /* GenericMessage+External.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+External.swift"; sourceTree = ""; }; 63298D9B24374094006B6018 /* GenericMessageTests+External.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessageTests+External.swift"; sourceTree = ""; }; - 63298D9D24374489006B6018 /* Dictionary+ObjectForKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+ObjectForKey.swift"; sourceTree = ""; }; 63340BBC241C2BC5004ED87C /* store2-80-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-80-0.wiredatabase"; sourceTree = ""; }; 63370C6B242A510A0072C37F /* ZMOTRMessage+UpdateEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMOTRMessage+UpdateEvent.swift"; sourceTree = ""; }; 63370CBA242CB84A0072C37F /* CompositeMessageItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompositeMessageItemContent.swift; sourceTree = ""; }; @@ -1057,7 +1001,6 @@ 6391A7FB2A6FD7C900832665 /* DatabaseMigrationTests+UserClientUniqueness.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DatabaseMigrationTests+UserClientUniqueness.swift"; sourceTree = ""; }; 6391A7FE2A6FDB9100832665 /* store2-107-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-107-0.wiredatabase"; sourceTree = ""; }; 639971A92B1E301E009DD5CF /* ReplaceSelfMLSKeyPackagesAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplaceSelfMLSKeyPackagesAction.swift; sourceTree = ""; }; - 63AFE2D5244F49A90003F619 /* GenericMessage+MessageCapable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+MessageCapable.swift"; sourceTree = ""; }; 63B1333729A503D000009D84 /* ProteusServiceInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusServiceInterface.swift; sourceTree = ""; }; 63B1333829A503D000009D84 /* ProteusService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusService.swift; sourceTree = ""; }; 63B1333A29A503D000009D84 /* MLSGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLSGroup.swift; sourceTree = ""; }; @@ -1078,7 +1021,6 @@ 63B1335029A503D000009D84 /* MLSGroupStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLSGroupStatus.swift; sourceTree = ""; }; 63B1335329A503D000009D84 /* StaleMLSKeyMaterialDetector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaleMLSKeyMaterialDetector.swift; sourceTree = ""; }; 63B658DD243754E100EF463F /* GenericMessage+UpdateEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GenericMessage+UpdateEvent.swift"; sourceTree = ""; }; - 63B658DF243789DE00EF463F /* GenericMessage+Assets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Assets.swift"; sourceTree = ""; }; 63B74CBC2AE1715000A73006 /* ProteusToMLSMigrationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusToMLSMigrationCoordinator.swift; sourceTree = ""; }; 63BEF5862A2636BC00F482E8 /* MLSConferenceInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSConferenceInfo.swift; sourceTree = ""; }; 63C07014291144F70075D598 /* CoreCryptoConfigProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreCryptoConfigProviderTests.swift; sourceTree = ""; }; @@ -1088,7 +1030,6 @@ 63D41E5224531BAD0076826F /* ZMMessage+Reaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMMessage+Reaction.swift"; sourceTree = ""; }; 63D41E6C245733AC0076826F /* ZMMessageTests+Removal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMMessageTests+Removal.swift"; sourceTree = ""; }; 63D41E6E24573F420076826F /* ZMConversationTests+SelfConversation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+SelfConversation.swift"; sourceTree = ""; }; - 63D41E7024597E420076826F /* GenericMessage+Flags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Flags.swift"; sourceTree = ""; }; 63D9A19D282AA0050074C20C /* NSManagedObjectContext+Federation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Federation.swift"; sourceTree = ""; }; 63DA335D286C9CF000818C3C /* NSManagedObjectContext+MLSService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+MLSService.swift"; sourceTree = ""; }; 63DA33AE28746CC100818C3C /* store2-103-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-103-0.wiredatabase"; sourceTree = ""; }; @@ -1096,11 +1037,9 @@ 63F0780C29F292770031E19D /* FetchSubgroupAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchSubgroupAction.swift; sourceTree = ""; }; 63F0781129F6C59D0031E19D /* MLSSubgroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSSubgroup.swift; sourceTree = ""; }; 63F376D92834FF7200FE1F05 /* NSManagedObjectContextTests+Federation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContextTests+Federation.swift"; sourceTree = ""; }; - 63F65F00246B073900534A69 /* GenericMessage+Content.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Content.swift"; sourceTree = ""; }; 63FACD55291BC598003AB25D /* MLSClientIDTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSClientIDTests.swift; sourceTree = ""; }; 63FCE54728C78D1F00126D9D /* ZMConversationTests+Predicates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+Predicates.swift"; sourceTree = ""; }; 76E000B92DAFED1B00853C45 /* WireCellsMessageAttachmentDraftEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireCellsMessageAttachmentDraftEntity.swift; sourceTree = ""; }; - 7A2778C5285223D90044A73F /* KeychainManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainManager.swift; sourceTree = ""; }; 7A2778C7285329210044A73F /* KeychainManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainManagerTests.swift; sourceTree = ""; }; 7C88C5312182F6150037DD03 /* ZMClientMessageTests+Replies.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+Replies.swift"; sourceTree = ""; }; 7CBC3FC020177C3C008D06E4 /* RasterImages+Protobuf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RasterImages+Protobuf.swift"; sourceTree = ""; }; @@ -1188,7 +1127,6 @@ CEB15E501D7EE53A0048A011 /* ZMClientMessagesTests+Reaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessagesTests+Reaction.swift"; sourceTree = ""; }; D5FA30C42063DC2D00716618 /* BackupMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackupMetadata.swift; sourceTree = ""; }; D5FA30CA2063ECD400716618 /* BackupMetadataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackupMetadataTests.swift; sourceTree = ""; }; - D5FA30CE2063F8EC00716618 /* Version.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Version.swift; sourceTree = ""; }; D5FA30D02063FD3A00716618 /* VersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionTests.swift; sourceTree = ""; }; E4AD4E402E281FB800308EDC /* ResetBrokenMLSConversationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetBrokenMLSConversationDelegate.swift; sourceTree = ""; }; E4E38CE42E2EC99E00E4FFA9 /* MLSServiceInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSServiceInterface.swift; sourceTree = ""; }; @@ -1197,7 +1135,6 @@ E61B3F372BA85923005FF9F8 /* OneOnOneConversationMigrationAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneConversationMigrationAction.swift; sourceTree = ""; }; E61B3F392BA9C9FC005FF9F8 /* MigrateMLSOneOnOneConversationError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateMLSOneOnOneConversationError.swift; sourceTree = ""; }; E631D0462C18551F005D3178 /* CreateMLSGroupUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateMLSGroupUseCase.swift; sourceTree = ""; }; - E66029D12BDA43E10033C524 /* SearchUsersCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUsersCache.swift; sourceTree = ""; }; E662328A2BF4911E002B680A /* MLSGroupVerification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSGroupVerification.swift; sourceTree = ""; }; E66232902BF4C75D002B680A /* MLSGroupVerificationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSGroupVerificationTests.swift; sourceTree = ""; }; E68D9FF02B0F594600EFE04F /* store2-108-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-108-0.wiredatabase"; sourceTree = ""; }; @@ -1236,7 +1173,6 @@ EE002F212878345C0027D63A /* store2-104-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-104-0.wiredatabase"; sourceTree = ""; }; EE032B2F29A62CA600E1DDF3 /* ProteusSessionID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusSessionID.swift; sourceTree = ""; }; EE032B3529A62CD600E1DDF3 /* ProteusServiceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusServiceTests.swift; sourceTree = ""; }; - EE04084D28CA85B2009E4B8D /* Date+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Helpers.swift"; sourceTree = ""; }; EE0DE5032A24D2A10029746C /* DeleteSubgroupAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteSubgroupAction.swift; sourceTree = ""; }; EE174FCD2522756700482A70 /* ZMConversationPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZMConversationPerformanceTests.swift; path = Conversation/ZMConversationPerformanceTests.swift; sourceTree = ""; }; EE19CE1E2AEBE4CB00CB8641 /* SyncMLSOneToOneConversationAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncMLSOneToOneConversationAction.swift; sourceTree = ""; }; @@ -1250,7 +1186,6 @@ EE42938D252C460000E70670 /* Changes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Changes.swift; sourceTree = ""; }; EE42938F252C466500E70670 /* ChangeInfoConsumer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeInfoConsumer.swift; sourceTree = ""; }; EE46B92728A511630063B38D /* ZMClientMessageTests+MLSEncryptedPayloadGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+MLSEncryptedPayloadGenerator.swift"; sourceTree = ""; }; - EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LastUpdateEventIDRepository.swift; sourceTree = ""; }; EE5F54CB259B22C400F11F3C /* Account+Keychain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account+Keychain.swift"; sourceTree = ""; }; EE67F6C2296F05FD001D7C88 /* PINCache.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PINCache.xcframework; path = ../Carthage/Build/PINCache.xcframework; sourceTree = ""; }; EE68EEC8252DC4450013B242 /* ChangeDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeDetector.swift; sourceTree = ""; }; @@ -1273,7 +1208,6 @@ EE934ACA2B67F8CB008FDB19 /* ZMConversationListTests+OneOnOne.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationListTests+OneOnOne.swift"; sourceTree = ""; }; EE980FB12834EB3A00CC6B9F /* store2-100-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-100-0.wiredatabase"; sourceTree = ""; }; EE98878D28882BFF002340D2 /* MLSServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSServiceTests.swift; sourceTree = ""; }; - EE997A1325062295008336D2 /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = ""; }; EE997A15250629DC008336D2 /* ZMMessage+ProcessingError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMMessage+ProcessingError.swift"; sourceTree = ""; }; EE9AD9152696F01700DD5F51 /* LegacyFeatureRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyFeatureRepository.swift; sourceTree = ""; }; EE9ADC46286F38D1002B2148 /* store2-102-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-102-0.wiredatabase"; sourceTree = ""; }; @@ -1325,11 +1259,8 @@ F1B025601E534CF900900C65 /* ZMConversationTests+PrepareToSend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+PrepareToSend.swift"; sourceTree = ""; }; F1B58926202DCEF9002BB59B /* ZMConversationTests+CreationSystemMessages.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+CreationSystemMessages.swift"; sourceTree = ""; }; F1C8676F1FA9CCB5001505E8 /* DuplicateMerging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DuplicateMerging.swift; sourceTree = ""; }; - F1FDF2F521B152BC00E037A1 /* GenericMessage+Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Helper.swift"; sourceTree = ""; }; - F1FDF2F621B152BC00E037A1 /* GenericMessage+Hashing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Hashing.swift"; sourceTree = ""; }; F1FDF2F921B1555A00E037A1 /* ZMClientMessage+Location.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMClientMessage+Location.swift"; sourceTree = ""; }; F1FDF2FD21B1572500E037A1 /* ZMGenericMessageData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMGenericMessageData.swift; sourceTree = ""; }; - F1FDF2FF21B1580400E037A1 /* GenericMessage+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericMessage+Utils.swift"; sourceTree = ""; }; F90D99A61E02E22400034070 /* AssetCollectionBatchedTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetCollectionBatchedTests.swift; sourceTree = ""; }; F91EAAC41D885D720010ACBE /* video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = video.mp4; path = Tests/Resources/video.mp4; sourceTree = SOURCE_ROOT; }; F920AE161E38C547001BC14F /* NotificationObservers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationObservers.swift; sourceTree = ""; }; @@ -1339,21 +1270,13 @@ F92C99271DAE8D060034AFDD /* GenericMessageTests+Obfuscation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GenericMessageTests+Obfuscation.swift"; sourceTree = ""; }; F92C992B1DAFC58A0034AFDD /* ZMConversationTests+Ephemeral.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversationTests+Ephemeral.swift"; sourceTree = ""; }; F93265201D8950F10076AAD6 /* NSManagedObjectContext+FetchRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+FetchRequest.swift"; sourceTree = ""; }; - F9331C811CB4191B00139ECC /* NSPredicate+ZMSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPredicate+ZMSearch.h"; sourceTree = ""; }; - F9331C821CB4191B00139ECC /* NSPredicate+ZMSearch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSPredicate+ZMSearch.m"; sourceTree = ""; }; - F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFetchRequest+ZMRelationshipKeyPaths.h"; sourceTree = ""; }; - F9331C861CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFetchRequest+ZMRelationshipKeyPaths.m"; sourceTree = ""; }; F93A30231D6EFB47005CCB1D /* ZMMessageConfirmation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZMMessageConfirmation.swift; sourceTree = ""; }; F93A302E1D6F2633005CCB1D /* ZMMessageTests+Confirmation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMMessageTests+Confirmation.swift"; sourceTree = ""; }; F93C4C7C1E24E1B1007E9CEE /* NotificationDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationDispatcher.swift; sourceTree = ""; }; F93C4C7E1E24F832007E9CEE /* NotificationDispatcherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationDispatcherTests.swift; sourceTree = ""; }; F943BC2C1E88FEC80048A768 /* ChangedIndexes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangedIndexes.swift; sourceTree = ""; }; F94A208E1CB51AF50059632A /* ManagedObjectValidationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ManagedObjectValidationTests.m; path = Tests/Source/Model/ManagedObjectValidationTests.m; sourceTree = SOURCE_ROOT; }; - F963E96B1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMImageAssetEncryptionKeys.h; sourceTree = ""; }; - F963E96C1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZMImageAssetEncryptionKeys.m; sourceTree = ""; }; F963E9721D9BF9E300098AD3 /* ProtosTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProtosTests.swift; sourceTree = ""; }; - F963E97E1D9C09E700098AD3 /* ZMMessageTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMMessageTimer.h; sourceTree = ""; }; - F963E97F1D9C09E700098AD3 /* ZMMessageTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZMMessageTimer.m; sourceTree = ""; }; F963E9821D9C0DC400098AD3 /* ZMMessageDestructionTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZMMessageDestructionTimer.swift; sourceTree = ""; }; F963E9841D9D47D100098AD3 /* ZMClientMessageTests+Ephemeral.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+Ephemeral.swift"; sourceTree = ""; }; F963E9921D9E9D1800098AD3 /* ZMAssetClientMessageTests+Ephemeral.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMAssetClientMessageTests+Ephemeral.swift"; sourceTree = ""; }; @@ -1392,11 +1315,6 @@ F9A706391CAEE01D00C2F5FE /* ObjectChangeInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectChangeInfo.swift; sourceTree = ""; }; F9A7063B1CAEE01D00C2F5FE /* UserClientChangeInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserClientChangeInfo.swift; sourceTree = ""; }; F9A7063C1CAEE01D00C2F5FE /* UserChangeInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserChangeInfo.swift; sourceTree = ""; }; - F9A706491CAEE01D00C2F5FE /* UserImageLocalCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserImageLocalCache.swift; sourceTree = ""; }; - F9A7064B1CAEE01D00C2F5FE /* ZMFetchRequestBatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMFetchRequestBatch.h; sourceTree = ""; }; - F9A7064C1CAEE01D00C2F5FE /* ZMFetchRequestBatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZMFetchRequestBatch.m; sourceTree = ""; }; - F9A7064E1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ZMUpdateEvent+WireDataModel.h"; sourceTree = ""; }; - F9A7064F1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ZMUpdateEvent+WireDataModel.m"; sourceTree = ""; }; F9A706CA1CAEE30700C2F5FE /* 1900x1500.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = 1900x1500.jpg; path = Tests/Resources/1900x1500.jpg; sourceTree = SOURCE_ROOT; }; F9A706CB1CAEE30700C2F5FE /* animated.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = animated.gif; path = Tests/Resources/animated.gif; sourceTree = SOURCE_ROOT; }; F9A706CE1CAEE30700C2F5FE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = InfoPlist.strings; sourceTree = ""; }; @@ -1432,7 +1350,6 @@ F9A7085E1CAEEF4700C2F5FE /* MessagingTest+EventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MessagingTest+EventFactory.h"; sourceTree = ""; }; F9A7085F1CAEEF4700C2F5FE /* MessagingTest+EventFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = "MessagingTest+EventFactory.m"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; F9A708641CAEF9BD00C2F5FE /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - F9AB00261F0CE5520037B437 /* FileManager+FileLocations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileManager+FileLocations.swift"; sourceTree = ""; }; F9AB00281F0D2BE40037B437 /* FileManager+FileLocationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FileManager+FileLocationTests.swift"; sourceTree = ""; }; F9B0FF311D79D1140098C17C /* ZMClientMessageTests+Unarchiving.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMClientMessageTests+Unarchiving.swift"; sourceTree = ""; }; F9B71F071CB264DF001DB03F /* ZMConversationListDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMConversationListDirectory.h; sourceTree = ""; }; @@ -1506,6 +1423,21 @@ ); target = F9C9A4FB1CAD5DF10039E10C /* WireDataModel */; }; + 5961327B2EB9120E00BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + CoreCryptoContextProtocolExt.swift, + ); + publicHeaders = ( + "NSFetchRequest+ZMRelationshipKeyPaths.h", + "NSPredicate+ZMSearch.h", + Protos/ZMImageAssetEncryptionKeys.h, + ZMFetchRequestBatch.h, + ZMMessageTimer.h, + "ZMUpdateEvent+WireDataModel.h", + ); + target = F9C9A4FB1CAD5DF10039E10C /* WireDataModel */; + }; 596B91862EA795640010C93D /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; publicHeaders = ( @@ -1541,6 +1473,7 @@ 5908C79E2E85729D00882DD1 /* UnknownMessage */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = UnknownMessage; sourceTree = ""; }; 594C4E2D2CCAAB6900F13D03 /* AccountImageSource */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = AccountImageSource; sourceTree = ""; }; 594C4E382CCAAB9B00F13D03 /* AccountImageSource */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = AccountImageSource; sourceTree = ""; }; + 5961324E2EB9120D00BF6B25 /* Utilis */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (5961327B2EB9120E00BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Utilis; sourceTree = ""; }; 596B91642EA795640010C93D /* User */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (596B91862EA795640010C93D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = User; sourceTree = ""; }; 596B91912EA7956C0010C93D /* UserClient */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (596B919C2EA7956C0010C93D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = UserClient; sourceTree = ""; }; 5991D76C2DAD037F00EF63C7 /* Support */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (5991D77C2DAD038000EF63C7 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Support; sourceTree = ""; }; @@ -1578,7 +1511,7 @@ E6707E902BBD683F00469D57 /* PINCache in Frameworks */, 59B48C5C2C89CBBD00EA7999 /* WireFoundation in Frameworks */, EE8DA9702954A03E00F58B79 /* WireImages.framework in Frameworks */, - 59537CDB2CFF8F2B00920B59 /* WireLogging in Frameworks */, + 59537CDB2CFF8F2B00920B59 /* WireLegacyLogging in Frameworks */, EE8DA96A2954A03100F58B79 /* WireTransport.framework in Frameworks */, 01D2B7A32D64A8F50030D28D /* WireCoreCrypto in Frameworks */, ); @@ -1595,7 +1528,7 @@ 59FFAD9D2C822977000C8085 /* WireTesting.framework in Frameworks */, 5902AC752DA92365000A8F7F /* WireFoundationSupport in Frameworks */, 591B6E4E2C8B09CA009F8A7B /* OCMock.xcframework in Frameworks */, - 0176B8812E7AE25B005D448B /* WireLogging in Frameworks */, + 0176B8812E7AE25B005D448B /* WireLegacyLogging in Frameworks */, 5950B0372E2EA1220051B07A /* GenericMessageProtocol in Frameworks */, 5978BFD42E2E6132004778CC /* SwiftProtobuf in Frameworks */, ); @@ -2237,24 +2170,6 @@ path = Confirmation; sourceTree = ""; }; - F963E9671D9ADD5A00098AD3 /* Protos */ = { - isa = PBXGroup; - children = ( - F1FDF2F521B152BC00E037A1 /* GenericMessage+Helper.swift */, - 06B1C492248F9173007FDA8D /* GenericMessage+Debug.swift */, - F1FDF2F621B152BC00E037A1 /* GenericMessage+Hashing.swift */, - 63B658DF243789DE00EF463F /* GenericMessage+Assets.swift */, - F1FDF2FF21B1580400E037A1 /* GenericMessage+Utils.swift */, - 06D48734241F930A00881B08 /* GenericMessage+Obfuscation.swift */, - 63AFE2D5244F49A90003F619 /* GenericMessage+MessageCapable.swift */, - 63D41E7024597E420076826F /* GenericMessage+Flags.swift */, - 63F65F00246B073900534A69 /* GenericMessage+Content.swift */, - F963E96B1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.h */, - F963E96C1D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.m */, - ); - path = Protos; - sourceTree = ""; - }; F963E97D1D9C09DA00098AD3 /* Ephemeral */ = { isa = PBXGroup; children = ( @@ -2504,45 +2419,6 @@ path = Helpers; sourceTree = ""; }; - F9A706421CAEE01D00C2F5FE /* Utilis */ = { - isa = PBXGroup; - children = ( - EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */, - F963E9671D9ADD5A00098AD3 /* Protos */, - F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */, - F9331C861CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.m */, - F9331C811CB4191B00139ECC /* NSPredicate+ZMSearch.h */, - D5FA30CE2063F8EC00716618 /* Version.swift */, - F9331C821CB4191B00139ECC /* NSPredicate+ZMSearch.m */, - F9A706491CAEE01D00C2F5FE /* UserImageLocalCache.swift */, - 014DD8D22B6D1FE9007ECFD1 /* UUID+SafeLogging.swift */, - F9A7064B1CAEE01D00C2F5FE /* ZMFetchRequestBatch.h */, - F9A7064C1CAEE01D00C2F5FE /* ZMFetchRequestBatch.m */, - F9A7064E1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h */, - 0634C3A824643A400006081D /* ZMUpdateEvent.swift */, - F9A7064F1CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.m */, - 54EDE67F1CBBF1860044A17E /* PINCache+ZMessaging.swift */, - 546D3DE51CE5D0B100A6047F /* RichAssetFileType.swift */, - F963E97E1D9C09E700098AD3 /* ZMMessageTimer.h */, - 016D29392C10FB2F00DB969A /* ZMMessageTimer.swift */, - F963E97F1D9C09E700098AD3 /* ZMMessageTimer.m */, - F9AB00261F0CE5520037B437 /* FileManager+FileLocations.swift */, - 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */, - 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */, - 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */, - 63298D9D24374489006B6018 /* Dictionary+ObjectForKey.swift */, - 7A2778C5285223D90044A73F /* KeychainManager.swift */, - EE997A1325062295008336D2 /* Logging.swift */, - EE04084D28CA85B2009E4B8D /* Date+Helpers.swift */, - 0129E7FA29A520EB0065E6DB /* SafeFileContext.swift */, - 0614E96C2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift */, - 1657FA9B2D9C432200A7B337 /* CoreCryptoContextProtocolExt.swift */, - E66029D12BDA43E10033C524 /* SearchUsersCache.swift */, - 010347212ED4566D000676DE /* NSManagedObjectContext+Unpack.swift */, - ); - path = Utilis; - sourceTree = ""; - }; F9A706CC1CAEE30700C2F5FE /* en.lproj */ = { isa = PBXGroup; children = ( @@ -2912,7 +2788,7 @@ F9A705D41CAEE01D00C2F5FE /* Model */, EE7F02202A80D5A700FE5695 /* Repositories */, F9A7061B1CAEE01D00C2F5FE /* Notifications */, - F9A706421CAEE01D00C2F5FE /* Utilis */, + 5961324E2EB9120D00BF6B25 /* Utilis */, F9C9A60C1CAD76A50039E10C /* WireDataModel.h */, F9C9A7371CAE6D890039E10C /* ConversationList */, 599EA3D12C246897009319D4 /* ConversationSearch */, @@ -3131,29 +3007,23 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F9A706C81CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.h in Headers */, - F9331C871CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h in Headers */, F9A706561CAEE01D00C2F5FE /* NSNotification+ManagedObjectContextSave.h in Headers */, 59EC73F72C20B03100E5C036 /* NSManagedObjectContext+executeFetchRequestOrAssert.h in Headers */, F9A706801CAEE01D00C2F5FE /* ZMMessage+Internal.h in Headers */, F9A706501CAEE01D00C2F5FE /* NSManagedObjectContext+tests.h in Headers */, F9C9A6AE1CAD7C7F0039E10C /* ZMUser.h in Headers */, - F963E9701D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.h in Headers */, F9A706981CAEE01D00C2F5FE /* ZMManagedObject+Internal.h in Headers */, F9C9A65F1CAD76A50039E10C /* WireDataModel.h in Headers */, F9C9A6AC1CAD7C7F0039E10C /* ZMEditableUserType.h in Headers */, F9B71F0C1CB264DF001DB03F /* ZMConversationListDirectory.h in Headers */, F9C9A6AA1CAD7C7F0039E10C /* ZMConversation.h in Headers */, F9A706521CAEE01D00C2F5FE /* NSManagedObjectContext+zmessaging.h in Headers */, - F9331C831CB4191B00139ECC /* NSPredicate+ZMSearch.h in Headers */, F9C9A6B01CAD7D1F0039E10C /* ZMManagedObject.h in Headers */, BF3494081EC5A90400B0C314 /* ZMUser+OneOnOne.h in Headers */, F9A706511CAEE01D00C2F5FE /* NSManagedObjectContext+zmessaging-Internal.h in Headers */, F9A706821CAEE01D00C2F5FE /* ZMOTRMessage.h in Headers */, F9A7065A1CAEE01D00C2F5FE /* ZMConnection+Internal.h in Headers */, - F9A706C51CAEE01D00C2F5FE /* ZMFetchRequestBatch.h in Headers */, F9A7065B1CAEE01D00C2F5FE /* ZMConnection.h in Headers */, - F963E9801D9C09E700098AD3 /* ZMMessageTimer.h in Headers */, F9A706791CAEE01D00C2F5FE /* ZMExternalEncryptedDataWithKeys.h in Headers */, F9C9A6AD1CAD7C7F0039E10C /* ZMMessage.h in Headers */, ); @@ -3204,6 +3074,7 @@ 5908C7982E85724300882DD1 /* Teams */, 5908C79E2E85729D00882DD1 /* UnknownMessage */, 594C4E2D2CCAAB6900F13D03 /* AccountImageSource */, + 5961324E2EB9120D00BF6B25 /* Utilis */, 596B91642EA795640010C93D /* User */, 596B91912EA7956C0010C93D /* UserClient */, 59AE1CA22E9D3A1900AF053A /* FeatureConfig */, @@ -3213,7 +3084,7 @@ packageProductDependencies = ( E6707E8F2BBD683F00469D57 /* PINCache */, 59B48C5B2C89CBBD00EA7999 /* WireFoundation */, - 59537CDA2CFF8F2B00920B59 /* WireLogging */, + 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */, CBD35F2B2D09EBB20080DA37 /* WireCrypto */, 01D2B7A22D64A8F50030D28D /* WireCoreCrypto */, 1657FA992D9C2EB800A7B337 /* WireCoreCryptoUniffi */, @@ -3462,7 +3333,6 @@ EE3EFE95253053B1009499E5 /* PotentialChangeDetector.swift in Sources */, 63B74CBD2AE1715000A73006 /* ProteusToMLSMigrationCoordinator.swift in Sources */, 591942B62B6A4B4D0000B390 /* UserObserving.swift in Sources */, - 014DD8D42B6D1FF6007ECFD1 /* UUID+SafeLogging.swift in Sources */, CB3437012DF32846007CFB34 /* MultipartMessageData.swift in Sources */, A90676E7238EAE8B006417AC /* ParticipantRole.swift in Sources */, 165124D82189AE90006A3C75 /* ZMAssetClientMessage+Quotes.swift in Sources */, @@ -3506,8 +3376,6 @@ 6308F8A62A273CB70072A177 /* FetchMLSConversationGroupInfoAction.swift in Sources */, 63B1335929A503D100009D84 /* MLSGroupID.swift in Sources */, F963E9831D9C0DC400098AD3 /* ZMMessageDestructionTimer.swift in Sources */, - 63AFE2D6244F49A90003F619 /* GenericMessage+MessageCapable.swift in Sources */, - F9A706C91CAEE01D00C2F5FE /* ZMUpdateEvent+WireDataModel.m in Sources */, E6A5BBA62B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift in Sources */, 591F8A042B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift in Sources */, EE997A16250629DC008336D2 /* ZMMessage+ProcessingError.swift in Sources */, @@ -3517,14 +3385,12 @@ 63370CBB242CB84A0072C37F /* CompositeMessageItemContent.swift in Sources */, E6E504432BC542C5004948E7 /* LAContextStorage.swift in Sources */, CE58A3FF1CD3B3580037B626 /* ConversationMessage.swift in Sources */, - 0634C3A924643A400006081D /* ZMUpdateEvent.swift in Sources */, 160B3BB124EFD64E0026D355 /* ExtendedSecureUnarchiveFromData.swift in Sources */, 599EA3D72C247A6B009319D4 /* FilterableConversation.swift in Sources */, BF85CF5F1D227A78006EDB97 /* LocationData.swift in Sources */, F9DBA5221E28EB4000BE23C0 /* SideEffectSources.swift in Sources */, 1672A614234499B500380537 /* LabelChangeInfo.swift in Sources */, 06E1C835244F1A2300CA4EF2 /* ZMOTRMessage+Helper.swift in Sources */, - 06B1C493248F9173007FDA8D /* GenericMessage+Debug.swift in Sources */, 013887A22B9A5C6000323DD0 /* CleanupModels107PreAction.swift in Sources */, 6313CF2F2B6A8CDB00B41A33 /* CRLsDistributionPoints.swift in Sources */, F9A7065C1CAEE01D00C2F5FE /* ZMConnection.m in Sources */, @@ -3536,18 +3402,14 @@ EE42938C252C443000E70670 /* ManagedObjectObserverToken.swift in Sources */, 161E056A2667C4D100DADC3D /* AccountDeletedObserver.swift in Sources */, F9A706B61CAEE01D00C2F5FE /* UserClientChangeInfo.swift in Sources */, - 016D293A2C10FB2F00DB969A /* ZMMessageTimer.swift in Sources */, 013887AB2B9A5C8B00323DD0 /* CoreDataMigrationActionFactory.swift in Sources */, 5986A08D2C6B710E00299181 /* TextMessageData.swift in Sources */, 066328602428D01C005BB3BE /* ZMClientMessage+GenericMessage.swift in Sources */, 882B83592E82F0F9008A50CA /* StaleCoreCryptoKeyTracker.swift in Sources */, EE0DE5042A24D2A10029746C /* DeleteSubgroupAction.swift in Sources */, - EE04084E28CA85B2009E4B8D /* Date+Helpers.swift in Sources */, 01482E8A2B10ED0800F3B2CB /* MLSSubgroup.swift in Sources */, E6E504352BC542C5004948E7 /* DatabaseEARKeyDescription.swift in Sources */, E6E504362BC542C5004948E7 /* EARKeyEncryptor.swift in Sources */, - 63F65F01246B073900534A69 /* GenericMessage+Content.swift in Sources */, - 63B658E0243789DE00EF463F /* GenericMessage+Assets.swift in Sources */, 164EB6F3230D987A001BBD4A /* ZMMessage+DataRetention.swift in Sources */, 1693155525A329FE00709F15 /* NSManagedObjectContext+UpdateRequest.swift in Sources */, 63370CBD242CBA0A0072C37F /* CompositeMessageData.swift in Sources */, @@ -3558,14 +3420,11 @@ BF8F3A831E4B61C70079E9E7 /* TextSearchQuery.swift in Sources */, 5E771F382080BB0000575629 /* PBMessage+Validation.swift in Sources */, 16313D621D227DC1001B2AB3 /* LinkPreview+ProtocolBuffer.swift in Sources */, - F1FDF2F721B152BC00E037A1 /* GenericMessage+Helper.swift in Sources */, 16030DC521AEE25500F8032E /* ZMOTRMessage+Confirmations.swift in Sources */, D5FA30C52063DC2D00716618 /* BackupMetadata.swift in Sources */, EEB930B52ABD5A9B00FB35B2 /* FetchSupportedProtocolsAction.swift in Sources */, BF8361DA1F0A3C41009AE5AC /* NSSecureCoding+Swift.swift in Sources */, 16CDEBFB2209D13B00E74A41 /* ZMMessage+Quotes.swift in Sources */, - EE997A1425062295008336D2 /* Logging.swift in Sources */, - F9331C841CB4191B00139ECC /* NSPredicate+ZMSearch.m in Sources */, BFCD502D21511D58008CD845 /* DraftMessage.swift in Sources */, 63B1336B29A503D100009D84 /* MLSGroupStatus.swift in Sources */, EE3EFE9725305A84009499E5 /* ModifiedObjects+Mergeable.swift in Sources */, @@ -3578,13 +3437,9 @@ 54E3EE471F61A78B00A261E3 /* ZMAssetClientMessage+Deletion.swift in Sources */, 63B1335529A503D100009D84 /* ProteusService.swift in Sources */, EEDA9C152513A1DA003A5B27 /* ZMClientMessage+EncryptionAtRest.swift in Sources */, - 546D3DE61CE5D0B100A6047F /* RichAssetFileType.swift in Sources */, 069BCC582B30945500DF4EC2 /* E2EIService.swift in Sources */, EE42938E252C460000E70670 /* Changes.swift in Sources */, - E66029D22BDA43E10033C524 /* SearchUsersCache.swift in Sources */, - D5FA30CF2063F8EC00716618 /* Version.swift in Sources */, F9DBA5201E28EA8B00BE23C0 /* DependencyKeyStore.swift in Sources */, - EE5316422A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift in Sources */, EE74E4DE2A37B28C00B63E6E /* SubconversationGroupIDRepository.swift in Sources */, 544E8C111E2F76B400F9B8B8 /* NSManagedObjectContext+UserInfoMerge.swift in Sources */, 0649D1C524F6A542001DDC78 /* NSManagedObjectContext+ZMKeyValueStore.swift in Sources */, @@ -3595,7 +3450,6 @@ 54CD460A1DEDA55C00BA3429 /* AddressBookEntry.swift in Sources */, BFFBFD931D59E3F00079773E /* ConversationMessage+Deletion.swift in Sources */, 168D7BFD26F365ED00789960 /* EntityAction.swift in Sources */, - F1FDF30021B1580400E037A1 /* GenericMessage+Utils.swift in Sources */, F12BD0B01E4DCEC40012ADBA /* ZMMessage+Insert.swift in Sources */, 7CBC3FC120177C3C008D06E4 /* RasterImages+Protobuf.swift in Sources */, 63B1336329A503D100009D84 /* SyncStatusProtocol.swift in Sources */, @@ -3639,17 +3493,13 @@ 16058B2C2BDA9D83003C82C2 /* MLSSignatureAlgorithm.swift in Sources */, E662328B2BF4911E002B680A /* MLSGroupVerification.swift in Sources */, 16BBA2002AFD130F00CDF38A /* CoreCryptoProvider.swift in Sources */, - 54EDE6801CBBF1860044A17E /* PINCache+ZMessaging.swift in Sources */, 06E8AAB4242BAA6A008929B1 /* SignatureStatus.swift in Sources */, 01BDA31A2C59210400675DCB /* CoreDataMigrationVersion.swift in Sources */, 013887AC2B9A5C8B00323DD0 /* CoreDataMigrationAction.swift in Sources */, 068DCC5729BB816300F7E4F1 /* ZMOTRMessage+FailedToSendReason.swift in Sources */, - F963E9811D9C09E700098AD3 /* ZMMessageTimer.m in Sources */, 4058AAA22AA76BFA0013DE71 /* ReactionData.swift in Sources */, 6326E4762AEBB946006EEA28 /* ProteusToMLSMigrationStorage.swift in Sources */, - 0129E7FB29A520EB0065E6DB /* SafeFileContext.swift in Sources */, 63370CC4242CFA860072C37F /* ZMAssetClientMessage+UpdateEvent.swift in Sources */, - F9A706C61CAEE01D00C2F5FE /* ZMFetchRequestBatch.m in Sources */, 166DCDB82555886F004F4F59 /* CoreDataStack+Migration.swift in Sources */, 54363A011D7876200048FD7D /* ZMClientMessage+Encryption.swift in Sources */, 8704676B21513DE900C628D7 /* ZMOTRMessage+Unarchive.swift in Sources */, @@ -3675,13 +3525,10 @@ CB181C7E2D3F8D8400A80AB4 /* OneOnOneSource.swift in Sources */, EEF09CA02B1DB0C600D729A1 /* OneOnOneProtocolSelector.swift in Sources */, 163C92AA2630A80400F8DC14 /* NSManagedObjectContext+SelfUser.swift in Sources */, - 63298D9E24374489006B6018 /* Dictionary+ObjectForKey.swift in Sources */, A99B8A72268221A6006B4D29 /* ZMImageMessage.swift in Sources */, 541E4F951CBD182100D82D69 /* FileAssetCache.swift in Sources */, 5904070A2C258C810009542C /* ConversationList.swift in Sources */, - 0614E96D2A863EED007BB1F6 /* NSPredicate+BaseCompounds.swift in Sources */, 0663285E2428CEC3005BB3BE /* ZMClientMessage+Deletion.swift in Sources */, - 5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */, 1600D93C267A80D700970F99 /* ZMManagedObject+Fetching.swift in Sources */, 63B1336429A503D100009D84 /* UploadSelfMLSKeyPackagesAction.swift in Sources */, 165124D62188CF66006A3C75 /* ZMClientMessage+Editing.swift in Sources */, @@ -3692,7 +3539,6 @@ EE5F54CC259B22C400F11F3C /* Account+Keychain.swift in Sources */, 639971AA2B1E301E009DD5CF /* ReplaceSelfMLSKeyPackagesAction.swift in Sources */, F93C4C7D1E24E1B1007E9CEE /* NotificationDispatcher.swift in Sources */, - 06D48735241F930A00881B08 /* GenericMessage+Obfuscation.swift in Sources */, E4E38CE52E2EC99E00E4FFA9 /* MLSServiceInterface.swift in Sources */, 01BDA3172C59210400675DCB /* CoreDataMessagingMigratorProtocol.swift in Sources */, 069BCC5C2B30945500DF4EC2 /* E2EIVerificationStatusService.swift in Sources */, @@ -3714,7 +3560,6 @@ 63370CC9242E3B990072C37F /* ZMMessage+Conversation.swift in Sources */, 63B1335729A503D100009D84 /* MLSActionsProvider.swift in Sources */, EEC794F42A384421008E1A3B /* MLSDecryptionService.swift in Sources */, - 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */, 1672A6282344F10700380537 /* FolderList.swift in Sources */, 54E3EE3F1F6169A800A261E3 /* ZMAssetClientMessage+FileMessageData.swift in Sources */, 599EA3D02C246886009319D4 /* FilterConversationsUseCase.swift in Sources */, @@ -3723,7 +3568,6 @@ EF1F4F542301634500E4872C /* ZMSystemMessage+ChildMessages.swift in Sources */, EE3F97562C2B130800668DF1 /* StoredUpdateEventEnvelope.swift in Sources */, F943BC2D1E88FEC80048A768 /* ChangedIndexes.swift in Sources */, - 7A2778C6285223D90044A73F /* KeychainManager.swift in Sources */, 63BEF5872A2636BC00F482E8 /* MLSConferenceInfo.swift in Sources */, EEC794F62A384464008E1A3B /* MLSEncryptionService.swift in Sources */, F9A706A31CAEE01D00C2F5FE /* ConversationListChangeInfo.swift in Sources */, @@ -3741,7 +3585,6 @@ 6308F8A42A273C680072A177 /* FetchMLSSubconversationGroupInfoAction.swift in Sources */, 8838CFA42EC4CB1B00495012 /* NSManagedObjectContext+AccountDirectory.swift in Sources */, 87D9CCE91F27606200AA4388 /* NSManagedObjectContext+TearDown.swift in Sources */, - F963E9711D9ADD5A00098AD3 /* ZMImageAssetEncryptionKeys.m in Sources */, 0604F7C8265184B70016A71E /* ZMSystemMessage+ParticipantsRemovedReason.swift in Sources */, 01586D422CAED03900C3BCE1 /* FixDuplicateOneOnOneConversationsAction.swift in Sources */, 63B1336829A503D100009D84 /* CountSelfMLSKeyPackagesAction.swift in Sources */, @@ -3755,14 +3598,11 @@ F9A706B71CAEE01D00C2F5FE /* UserChangeInfo.swift in Sources */, EE68EEC9252DC4450013B242 /* ChangeDetector.swift in Sources */, 63B1335629A503D100009D84 /* MLSGroup.swift in Sources */, - F9AB00271F0CE5520037B437 /* FileManager+FileLocations.swift in Sources */, F9A7067F1CAEE01D00C2F5FE /* ZMImageMessage.m in Sources */, - 63D41E7124597E420076826F /* GenericMessage+Flags.swift in Sources */, 5473CC731E14245C00814C03 /* NSManagedObjectContext+Debugging.swift in Sources */, BF46662A1DCB71B0007463FF /* V3Asset.swift in Sources */, CBF4F17F2D36935300C9638B /* ConnectionValidator.swift in Sources */, F9A706991CAEE01D00C2F5FE /* ZMManagedObject.m in Sources */, - F1FDF2F821B152BC00E037A1 /* GenericMessage+Hashing.swift in Sources */, BF491CE41F063EDB0055EE44 /* Account.swift in Sources */, 01482E8B2B10EEB000F3B2CB /* FetchSubgroupAction.swift in Sources */, 0642A3332445F2B600DCCFCD /* ZMClientMessage+UpdateEvent.swift in Sources */, @@ -3779,22 +3619,18 @@ 060C06612B73D9D400B484C6 /* E2EIActivationRepository.swift in Sources */, 63B1335429A503D100009D84 /* ProteusServiceInterface.swift in Sources */, 167BCC96260DC3F100E9D7E3 /* CoreDataStack+ClearStorage.swift in Sources */, - F9331C881CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.m in Sources */, 063D292A24212AFD00FA6FEE /* ZMClientMessage.swift in Sources */, CB1BF6FC2C8AF6A5001EC670 /* ExpirationReason+Description.swift in Sources */, EE9B9F5929964F6A00A257BC /* NSManagedObjectContext+CoreCrypto.swift in Sources */, - 010347222ED4566D000676DE /* NSManagedObjectContext+Unpack.swift in Sources */, 599EA3D52C246955009319D4 /* MutableConversationContainer.swift in Sources */, 017B55792CFFB560005FFBD4 /* NSManagedObjectContext+SyncResources.swift in Sources */, 5986A08F2C6B744300299181 /* TextMessage.swift in Sources */, 54E3EE431F6194A400A261E3 /* ZMAssetClientMessage+GenericMessage.swift in Sources */, 01BDA31B2C59210400675DCB /* CoreDataMigrator.swift in Sources */, - F9A706C31CAEE01D00C2F5FE /* UserImageLocalCache.swift in Sources */, 87C125F71EF94EE800D28DC1 /* ZMManagedObject+Grouping.swift in Sources */, F9A706B21CAEE01D00C2F5FE /* NewUnreadMessageChangeInfos.swift in Sources */, 06F1E4BF2D19886200D0D07A /* MLSClientManager.swift in Sources */, 013887A72B9A5C6B00323DD0 /* PrefillPrimaryKeyAction.swift in Sources */, - 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4452,9 +4288,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 0176B8802E7AE25B005D448B /* WireLogging */ = { + 0176B8802E7AE25B005D448B /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 01D2B7A22D64A8F50030D28D /* WireCoreCrypto */ = { isa = XCSwiftPackageProductDependency; @@ -4487,9 +4323,9 @@ package = 5950B0332E2EA1070051B07A /* XCRemoteSwiftPackageReference "generic-message-proto" */; productName = GenericMessageProtocol; }; - 59537CDA2CFF8F2B00920B59 /* WireLogging */ = { + 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 5978BFD32E2E6132004778CC /* SwiftProtobuf */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index d35138b815f..dd3255a0dd6 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -7,6 +7,34 @@ buildImplicitDependencies = "YES" buildArchitectures = "Automatic"> + + + + + + + + + + + + diff --git a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift new file mode 100644 index 00000000000..e36f4f22892 --- /dev/null +++ b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift @@ -0,0 +1,22 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift new file mode 100644 index 00000000000..962ee6e9acd --- /dev/null +++ b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias Flow = WireLegacyLogging.Flow +typealias WireLogger = WireLegacyLogging.WireLogger +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias LogConvertible = WireLegacyLogging.LogConvertible diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj index 21e14dac336..0df73cb665a 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 0106AC952C9CA4F30022E2CF /* ProteusMessagePayloadBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0106AC942C9CA4F30022E2CF /* ProteusMessagePayloadBuilderTests.swift */; }; 0106AC982C9CBCE40022E2CF /* MessageInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0106AC962C9CB7F90022E2CF /* MessageInfo.swift */; }; 01F5AED02CAD892000B01069 /* ProteusMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F5AECF2CAD892000B01069 /* ProteusMessageTests.swift */; }; - 06025666248E616C00E060E1 /* ZMSimpleListRequestPaginator.m in Sources */ = {isa = PBXBuildFile; fileRef = 06025665248E616C00E060E1 /* ZMSimpleListRequestPaginator.m */; }; 0605DB902511622100443219 /* ZMLocalNotificationTests_UnreadCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0605DB8F2511622100443219 /* ZMLocalNotificationTests_UnreadCount.swift */; }; 060ED6D62499F41000412C4A /* PushNotificationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 060ED6D52499F41000412C4A /* PushNotificationStatus.swift */; }; 061389F42B178EBE0053B7B5 /* E2eIAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 061389F32B178EBE0053B7B5 /* E2eIAPI.swift */; }; @@ -21,7 +20,6 @@ 0640BF6F2B0F6B78008866E4 /* E2EIEnrollment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0640BF6E2B0F6B78008866E4 /* E2EIEnrollment.swift */; }; 06474D4B24AF6858002C695D /* EventDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06474D4A24AF6858002C695D /* EventDecoder.swift */; }; 06474D5E24B30C79002C695D /* PushNotificationStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06474D5C24B30C75002C695D /* PushNotificationStatusTests.swift */; }; - 06474D6624B3227E002C695D /* ZMSimpleListRequestPaginatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 06474D6524B3227E002C695D /* ZMSimpleListRequestPaginatorTests.m */; }; 064824982B10E32C00115329 /* EnrollE2EICertificateUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064824972B10E32C00115329 /* EnrollE2EICertificateUseCase.swift */; }; 0648FC1227851661006519D1 /* audio.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 0648FC1027851623006519D1 /* audio.m4a */; }; 0649D12224F5C5EF001DDC78 /* ZMLocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D12124F5C5EF001DDC78 /* ZMLocalNotification.swift */; }; @@ -32,12 +30,10 @@ 0649D14924F63C51001DDC78 /* NotificationSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D14824F63C51001DDC78 /* NotificationSound.swift */; }; 0649D14B24F63C8F001DDC78 /* NotificationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D14A24F63C8F001DDC78 /* NotificationAction.swift */; }; 0649D14D24F63D3E001DDC78 /* LocalNotificationType+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D14C24F63D3E001DDC78 /* LocalNotificationType+Localization.swift */; }; - 0649D14F24F63DCC001DDC78 /* ZMSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D14E24F63DCC001DDC78 /* ZMSound.swift */; }; 0649D15424F64335001DDC78 /* Push.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 0649D15024F64335001DDC78 /* Push.stringsdict */; }; 0649D15524F64335001DDC78 /* Push.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0649D15224F64335001DDC78 /* Push.strings */; }; 0649D19B24F66E9E001DDC78 /* ZMLocalNotification+Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D19A24F66E9E001DDC78 /* ZMLocalNotification+Events.swift */; }; 0649D19F24F6717C001DDC78 /* ZMLocalNotificationSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D19E24F6717C001DDC78 /* ZMLocalNotificationSet.swift */; }; - 0649D1A624F673E7001DDC78 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0649D1A524F673E7001DDC78 /* Logging.swift */; }; 066A3D822CDE6EFC0089C5C2 /* FetchBackendMLSPublicKeysRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 066A3D812CDE6EE80089C5C2 /* FetchBackendMLSPublicKeysRequestStrategy.swift */; }; 0671976E2AE951F400D96598 /* AcmeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0671976D2AE951F400D96598 /* AcmeAPI.swift */; }; 0671979A2AFBE9FD00D96598 /* AcmeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 067197992AFBE9FD00D96598 /* AcmeResponse.swift */; }; @@ -59,8 +55,6 @@ 06A9FDD628B3702700B3C730 /* UpdateAccessRolesActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A9FDD528B3702700B3C730 /* UpdateAccessRolesActionHandlerTests.swift */; }; 06ADE9F72BCE825D008BA0B3 /* UserClientAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06ADE9F62BCE825D008BA0B3 /* UserClientAPI.swift */; }; 06ADEA002BD15255008BA0B3 /* UserClientRequestFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06ADE9FF2BD15255008BA0B3 /* UserClientRequestFactory.swift */; }; - 06C394B6248E6FDA00AE736A /* ZMSimpleListRequestPaginator.h in Headers */ = {isa = PBXBuildFile; fileRef = 06025667248E617D00E060E1 /* ZMSimpleListRequestPaginator.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 06C394B7248E6FDE00AE736A /* ZMSimpleListRequestPaginator+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 06025669248E61BF00E060E1 /* ZMSimpleListRequestPaginator+Internal.h */; }; 06CDDE9F282E9CC200F9360F /* RemovePushTokenAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CDDE9E282E9CC200F9360F /* RemovePushTokenAction.swift */; }; 06CDDEA1282E9E7F00F9360F /* RemovePushTokenActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CDDEA0282E9E7F00F9360F /* RemovePushTokenActionHandler.swift */; }; 06CDDEA3282E9E9800F9360F /* RemovePushTokenActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CDDEA2282E9E9800F9360F /* RemovePushTokenActionHandlerTests.swift */; }; @@ -144,7 +138,6 @@ 166A22912577C06B00EF313D /* ResetSessionRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166A22902577C06B00EF313D /* ResetSessionRequestStrategy.swift */; }; 16751E8524CF72970099AE09 /* DeliveryReceiptRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16751E8424CF72970099AE09 /* DeliveryReceiptRequestStrategy.swift */; }; 16751EBB24D1BDA00099AE09 /* DeliveryReceiptRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16751EBA24D1BDA00099AE09 /* DeliveryReceiptRequestStrategyTests.swift */; }; - 167BCBC426087F8900E9D7E3 /* ZMTBaseTests+CoreDataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167BCBC326087F8900E9D7E3 /* ZMTBaseTests+CoreDataStack.swift */; }; 1682462F257A1FB7002AF17B /* KeyPathObjectSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1682462E257A1FB7002AF17B /* KeyPathObjectSync.swift */; }; 16824631257A23E8002AF17B /* KeyPathObjectSyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16824630257A23E8002AF17B /* KeyPathObjectSyncTests.swift */; }; 16824633257A2B47002AF17B /* ResetSessionRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16824632257A2B47002AF17B /* ResetSessionRequestStrategyTests.swift */; }; @@ -192,8 +185,8 @@ 591B6E422C8B09B6009F8A7B /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; }; 59271BED2B90D2140019B726 /* ClientRegistrationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BEC2B90D2140019B726 /* ClientRegistrationDelegate.swift */; }; 59271BF02B90D2510019B726 /* MockOTREntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BEE2B90D24A0019B726 /* MockOTREntity.swift */; }; - 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLogging */; }; - 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLogging */; }; + 59537D852CFF9D1600920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLegacyLogging */; }; + 59537D872CFF9DF600920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLegacyLogging */; }; 597B70C92B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */; }; 597B70CC2B03CC83006C2121 /* UpdateConversationProtocolActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */; }; 598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042F2C89C67E00B64D71 /* WireFoundation */; }; @@ -215,7 +208,6 @@ 630D41BA2B07D9F400633867 /* MLSConversationParticipantsServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630D41B92B07D9F400633867 /* MLSConversationParticipantsServiceTests.swift */; }; 630D41BC2B07DA3E00633867 /* ProteusConversationParticipantsServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630D41BB2B07DA3E00633867 /* ProteusConversationParticipantsServiceTests.swift */; }; 6313CF252B67C13400B41A33 /* CertificateRevocationListAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6313CF242B67C13400B41A33 /* CertificateRevocationListAPI.swift */; }; - 633B396A2891890600208124 /* ZMUpdateEvent+Decryption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633B39692891890500208124 /* ZMUpdateEvent+Decryption.swift */; }; 63457C062B2C6F4200AFFEF3 /* ReplaceSelfMLSKeyPackagesActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63457C052B2C6F4200AFFEF3 /* ReplaceSelfMLSKeyPackagesActionHandlerTests.swift */; }; 63457C082B2CA8E300AFFEF3 /* E2EIKeyPackageRotatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63457C072B2CA8E300AFFEF3 /* E2EIKeyPackageRotatorTests.swift */; }; 6360A2132B0B722700A5D5FB /* MLSClientIDsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6360A2112B0B721F00A5D5FB /* MLSClientIDsProvider.swift */; }; @@ -226,7 +218,6 @@ 639971B42B2779A9009DD5CF /* E2EIKeyPackageRotator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 639971B32B2779A9009DD5CF /* E2EIKeyPackageRotator.swift */; }; 63CC83B12859D488008549AD /* ClaimMLSKeyPackageActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83B02859D488008549AD /* ClaimMLSKeyPackageActionHandler.swift */; }; 63CC83B3285A1E59008549AD /* ClaimMLSKeyPackageActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83B2285A1E59008549AD /* ClaimMLSKeyPackageActionHandlerTests.swift */; }; - 63CC83B9285B4845008549AD /* String+Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83B8285B4845008549AD /* String+Empty.swift */; }; 63CC83E2285C9C6C008549AD /* UploadSelfMLSKeyPackagesActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83DF285C9C6C008549AD /* UploadSelfMLSKeyPackagesActionHandler.swift */; }; 63CC83E5285C9C72008549AD /* UploadSelfMLSKeyPackagesActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83E0285C9C6C008549AD /* UploadSelfMLSKeyPackagesActionHandlerTests.swift */; }; 63CC83F2285CB96A008549AD /* ActionHandlerTestBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CC83F1285CB96A008549AD /* ActionHandlerTestBase.swift */; }; @@ -244,7 +235,6 @@ 8792F55721AD944100795027 /* UserPropertyRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8792F55621AD944100795027 /* UserPropertyRequestStrategy.swift */; }; 87F7288521AFF37D000ED371 /* UserPropertyRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87F7288421AFF37D000ED371 /* UserPropertyRequestStrategyTests.swift */; }; A90C56E62685C20E00F1007B /* ZMImagePreprocessingTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90C56E52685C20E00F1007B /* ZMImagePreprocessingTrackerTests.swift */; }; - BF1F52C61ECC74E5002FB553 /* Array+RequestGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1F52C51ECC74E5002FB553 /* Array+RequestGenerator.swift */; }; BF7D9BE11D8C351900949267 /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; }; BFF9446620F5F79F00531BC3 /* ImageV2DownloadRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF9446520F5F79F00531BC3 /* ImageV2DownloadRequestStrategyTests.swift */; }; C93B11482D95621A000F6573 /* Payload+UpdateConversationPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = C93B11472D95621A000F6573 /* Payload+UpdateConversationPermission.swift */; }; @@ -254,10 +244,6 @@ CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEA58F192B71179D006DEE32 /* WireRequestStrategySupport.framework */; }; CBC41A302EB50DBE000769CE /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; }; CBF2BD5F2C5BD468002BCBDD /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF2BD5E2C5BD468002BCBDD /* TestSetup.swift */; }; - D33B57B12A56BDCA0078A4F9 /* FederationTerminationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D33B57B02A56BDCA0078A4F9 /* FederationTerminationManager.swift */; }; - D3DA067C2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3DA067B2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift */; }; - D5D65A062073C8F800D7F3C3 /* AssetRequestFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5D65A052073C8F800D7F3C3 /* AssetRequestFactoryTests.swift */; }; - D5D65A072074C23D00D7F3C3 /* AssetRequestFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F963E8D91D955D4600098AD3 /* AssetRequestFactory.swift */; }; E60CBEC32B45CCBF00958C10 /* EventPayloadDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = E60CBEC22B45CCBF00958C10 /* EventPayloadDecoder.swift */; }; E60E82A42B837B7A00F8DA5C /* FeatureConfigsPayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = E60E82A32B837B7A00F8DA5C /* FeatureConfigsPayload.swift */; }; E60E82A62B837C7E00F8DA5C /* FeatureConfigsPayloadProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E60E82A52B837C7E00F8DA5C /* FeatureConfigsPayloadProcessor.swift */; }; @@ -291,9 +277,6 @@ E69A02222B85096000126FF6 /* ProteusToMLSMigrationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69A02202B85095F00126FF6 /* ProteusToMLSMigrationState.swift */; }; E69A022A2B85EDC400126FF6 /* SelfSupportedProtocolsRequestBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E69A02292B85EDC400126FF6 /* SelfSupportedProtocolsRequestBuilderTests.swift */; }; E6BBCF112C32C52600BD0259 /* HttpClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BBCF102C32C52600BD0259 /* HttpClient.swift */; }; - E6BBCF132C32C55700BD0259 /* HttpClientImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BBCF122C32C55700BD0259 /* HttpClientImpl.swift */; }; - E6BBCF152C32D78F00BD0259 /* UserClient+QualifiedID.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BBCF142C32D78F00BD0259 /* UserClient+QualifiedID.swift */; }; - E6BBCF172C32EBA600BD0259 /* MessageLogAttributesBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BBCF162C32EBA600BD0259 /* MessageLogAttributesBuilder.swift */; }; E6BBCF1D2C33E1ED00BD0259 /* MessageLogAttributesBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BBCF1C2C33E1ED00BD0259 /* MessageLogAttributesBuilderTests.swift */; }; E6E0CE872B70D2C60004ED88 /* SyncPhase.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E0CE862B70D2C60004ED88 /* SyncPhase.swift */; }; E6E0CE892B70DDAB0004ED88 /* SynchronizationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6E0CE882B70DDAB0004ED88 /* SynchronizationState.swift */; }; @@ -361,7 +344,6 @@ EEDE7DB128EAEEC3007DC6A3 /* ConversationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEDE7DB028EAEEC3007DC6A3 /* ConversationService.swift */; }; EEE0EDB12858906500BBEE29 /* MLSRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE0EDB02858906500BBEE29 /* MLSRequestStrategy.swift */; }; EEE0EE0728591E9C00BBEE29 /* AssetDownloadRequestFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE0EE0628591E9C00BBEE29 /* AssetDownloadRequestFactoryTests.swift */; }; - EEE46E5428C5EE48005F48D7 /* ZMTransportResponse+ErrorInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE46E5328C5EE48005F48D7 /* ZMTransportResponse+ErrorInfo.swift */; }; EEE95CD72A4330D900E136CB /* LeaveSubconversationActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE95CD62A4330D900E136CB /* LeaveSubconversationActionHandler.swift */; }; EEE95CD92A43324F00E136CB /* LeaveSubconversationActionHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE95CD82A43324F00E136CB /* LeaveSubconversationActionHandlerTests.swift */; }; EEFB2DFE2ACD530F0094F877 /* PrekeyPayloadProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEFB2DFD2ACD530F0094F877 /* PrekeyPayloadProcessor.swift */; }; @@ -387,12 +369,6 @@ F18401D02073BE0800E9F4CC /* PushMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = F184018F2073BE0800E9F4CC /* PushMessageHandler.swift */; }; F18401D12073BE0800E9F4CC /* ApplicationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401902073BE0800E9F4CC /* ApplicationStatus.swift */; }; F18401D22073BE0800E9F4CC /* OTREntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401912073BE0800E9F4CC /* OTREntity.swift */; }; - F18401D32073BE0800E9F4CC /* ZMMessage+Dependency.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401932073BE0800E9F4CC /* ZMMessage+Dependency.swift */; }; - F18401D42073BE0800E9F4CC /* MessageExpirationTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */; }; - F18401D62073BE0800E9F4CC /* ZMStrategyConfigurationOption.h in Headers */ = {isa = PBXBuildFile; fileRef = F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F18401D82073BE0800E9F4CC /* ZMConversation+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401982073BE0800E9F4CC /* ZMConversation+Notifications.swift */; }; - F18401DB2073C25300E9F4CC /* EventDecoderDecryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401952073BE0800E9F4CC /* EventDecoderDecryptionTests.swift */; }; - F18401DC2073C25300E9F4CC /* MessageExpirationTimerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */; }; F18401E02073C25900E9F4CC /* ClientMessageRequestFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401542073BE0800E9F4CC /* ClientMessageRequestFactoryTests.swift */; }; F18401E12073C25900E9F4CC /* OTREntityTests+Dependency.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401552073BE0800E9F4CC /* OTREntityTests+Dependency.swift */; }; F18401E52073C26200E9F4CC /* FetchingClientRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F184015E2073BE0800E9F4CC /* FetchingClientRequestStrategyTests.swift */; }; @@ -472,9 +448,6 @@ 0106AC942C9CA4F30022E2CF /* ProteusMessagePayloadBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusMessagePayloadBuilderTests.swift; sourceTree = ""; }; 0106AC962C9CB7F90022E2CF /* MessageInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageInfo.swift; sourceTree = ""; }; 01F5AECF2CAD892000B01069 /* ProteusMessageTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusMessageTests.swift; sourceTree = ""; }; - 06025665248E616C00E060E1 /* ZMSimpleListRequestPaginator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZMSimpleListRequestPaginator.m; sourceTree = ""; }; - 06025667248E617D00E060E1 /* ZMSimpleListRequestPaginator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMSimpleListRequestPaginator.h; sourceTree = ""; }; - 06025669248E61BF00E060E1 /* ZMSimpleListRequestPaginator+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ZMSimpleListRequestPaginator+Internal.h"; sourceTree = ""; }; 0605DB8F2511622100443219 /* ZMLocalNotificationTests_UnreadCount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMLocalNotificationTests_UnreadCount.swift; sourceTree = ""; }; 060ED6D52499F41000412C4A /* PushNotificationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushNotificationStatus.swift; sourceTree = ""; }; 061389F32B178EBE0053B7B5 /* E2eIAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2eIAPI.swift; sourceTree = ""; }; @@ -482,7 +455,6 @@ 0640BF6E2B0F6B78008866E4 /* E2EIEnrollment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2EIEnrollment.swift; sourceTree = ""; }; 06474D4A24AF6858002C695D /* EventDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDecoder.swift; sourceTree = ""; }; 06474D5C24B30C75002C695D /* PushNotificationStatusTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushNotificationStatusTests.swift; sourceTree = ""; }; - 06474D6524B3227E002C695D /* ZMSimpleListRequestPaginatorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZMSimpleListRequestPaginatorTests.m; sourceTree = ""; }; 06474DA524B4B1EA002C695D /* EventDecoderTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDecoderTest.swift; sourceTree = ""; }; 06474DA724B4BB01002C695D /* StoreUpdateEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreUpdateEventTests.swift; sourceTree = ""; }; 064824972B10E32C00115329 /* EnrollE2EICertificateUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnrollE2EICertificateUseCase.swift; sourceTree = ""; }; @@ -495,7 +467,6 @@ 0649D14824F63C51001DDC78 /* NotificationSound.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSound.swift; sourceTree = ""; }; 0649D14A24F63C8F001DDC78 /* NotificationAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationAction.swift; sourceTree = ""; }; 0649D14C24F63D3E001DDC78 /* LocalNotificationType+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LocalNotificationType+Localization.swift"; sourceTree = ""; }; - 0649D14E24F63DCC001DDC78 /* ZMSound.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMSound.swift; sourceTree = ""; }; 0649D15124F64335001DDC78 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = Base; path = Base.lproj/Push.stringsdict; sourceTree = ""; }; 0649D15324F64335001DDC78 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Push.strings; sourceTree = ""; }; 0649D15824F644A9001DDC78 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Push.strings; sourceTree = ""; }; @@ -538,7 +509,6 @@ 0649D17D24F645E8001DDC78 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = lt; path = lt.lproj/Push.stringsdict; sourceTree = ""; }; 0649D19A24F66E9E001DDC78 /* ZMLocalNotification+Events.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMLocalNotification+Events.swift"; sourceTree = ""; }; 0649D19E24F6717C001DDC78 /* ZMLocalNotificationSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMLocalNotificationSet.swift; sourceTree = ""; }; - 0649D1A524F673E7001DDC78 /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = ""; }; 066A3D812CDE6EE80089C5C2 /* FetchBackendMLSPublicKeysRequestStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchBackendMLSPublicKeysRequestStrategy.swift; sourceTree = ""; }; 0671976D2AE951F400D96598 /* AcmeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcmeAPI.swift; sourceTree = ""; }; 067197992AFBE9FD00D96598 /* AcmeResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcmeResponse.swift; sourceTree = ""; }; @@ -661,7 +631,6 @@ 166A22902577C06B00EF313D /* ResetSessionRequestStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetSessionRequestStrategy.swift; sourceTree = ""; }; 16751E8424CF72970099AE09 /* DeliveryReceiptRequestStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeliveryReceiptRequestStrategy.swift; sourceTree = ""; }; 16751EBA24D1BDA00099AE09 /* DeliveryReceiptRequestStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeliveryReceiptRequestStrategyTests.swift; sourceTree = ""; }; - 167BCBC326087F8900E9D7E3 /* ZMTBaseTests+CoreDataStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMTBaseTests+CoreDataStack.swift"; sourceTree = ""; }; 1682462E257A1FB7002AF17B /* KeyPathObjectSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathObjectSync.swift; sourceTree = ""; }; 16824630257A23E8002AF17B /* KeyPathObjectSyncTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathObjectSyncTests.swift; sourceTree = ""; }; 16824632257A2B47002AF17B /* ResetSessionRequestStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetSessionRequestStrategyTests.swift; sourceTree = ""; }; @@ -722,7 +691,6 @@ 630D41B92B07D9F400633867 /* MLSConversationParticipantsServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSConversationParticipantsServiceTests.swift; sourceTree = ""; }; 630D41BB2B07DA3E00633867 /* ProteusConversationParticipantsServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusConversationParticipantsServiceTests.swift; sourceTree = ""; }; 6313CF242B67C13400B41A33 /* CertificateRevocationListAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertificateRevocationListAPI.swift; sourceTree = ""; }; - 633B39692891890500208124 /* ZMUpdateEvent+Decryption.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUpdateEvent+Decryption.swift"; sourceTree = ""; }; 63457C052B2C6F4200AFFEF3 /* ReplaceSelfMLSKeyPackagesActionHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplaceSelfMLSKeyPackagesActionHandlerTests.swift; sourceTree = ""; }; 63457C072B2CA8E300AFFEF3 /* E2EIKeyPackageRotatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2EIKeyPackageRotatorTests.swift; sourceTree = ""; }; 6360A2112B0B721F00A5D5FB /* MLSClientIDsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSClientIDsProvider.swift; sourceTree = ""; }; @@ -733,7 +701,6 @@ 639971B32B2779A9009DD5CF /* E2EIKeyPackageRotator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2EIKeyPackageRotator.swift; sourceTree = ""; }; 63CC83B02859D488008549AD /* ClaimMLSKeyPackageActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClaimMLSKeyPackageActionHandler.swift; sourceTree = ""; }; 63CC83B2285A1E59008549AD /* ClaimMLSKeyPackageActionHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClaimMLSKeyPackageActionHandlerTests.swift; sourceTree = ""; }; - 63CC83B8285B4845008549AD /* String+Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Empty.swift"; sourceTree = ""; }; 63CC83DF285C9C6C008549AD /* UploadSelfMLSKeyPackagesActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UploadSelfMLSKeyPackagesActionHandler.swift; sourceTree = ""; }; 63CC83E0285C9C6C008549AD /* UploadSelfMLSKeyPackagesActionHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UploadSelfMLSKeyPackagesActionHandlerTests.swift; sourceTree = ""; }; 63CC83F1285CB96A008549AD /* ActionHandlerTestBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionHandlerTestBase.swift; sourceTree = ""; }; @@ -752,16 +719,12 @@ 87F7288421AFF37D000ED371 /* UserPropertyRequestStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertyRequestStrategyTests.swift; sourceTree = ""; }; A90C56E52685C20E00F1007B /* ZMImagePreprocessingTrackerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZMImagePreprocessingTrackerTests.swift; sourceTree = ""; }; A90C56EB2685C23400F1007B /* ZMImagePreprocessingTrackerTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMImagePreprocessingTrackerTests.h; sourceTree = ""; }; - BF1F52C51ECC74E5002FB553 /* Array+RequestGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+RequestGenerator.swift"; sourceTree = ""; }; BFF9446520F5F79F00531BC3 /* ImageV2DownloadRequestStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageV2DownloadRequestStrategyTests.swift; sourceTree = ""; }; C93B11472D95621A000F6573 /* Payload+UpdateConversationPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Payload+UpdateConversationPermission.swift"; sourceTree = ""; }; C9B8EC2A2E5C5C6900183723 /* Payload+CellsState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Payload+CellsState.swift"; sourceTree = ""; }; CB5120522C6FD69F000C8FEC /* WireTransportSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransportSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CB5A461C2D940BA600D469F1 /* Payload+ConversationGroupType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Payload+ConversationGroupType.swift"; sourceTree = ""; }; CBF2BD5E2C5BD468002BCBDD /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = ""; }; - D33B57B02A56BDCA0078A4F9 /* FederationTerminationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationTerminationManager.swift; sourceTree = ""; }; - D3DA067B2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationTerminationManagerTest.swift; sourceTree = ""; }; - D5D65A052073C8F800D7F3C3 /* AssetRequestFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetRequestFactoryTests.swift; sourceTree = ""; }; E60CBEC22B45CCBF00958C10 /* EventPayloadDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventPayloadDecoder.swift; sourceTree = ""; }; E60E82A32B837B7A00F8DA5C /* FeatureConfigsPayload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigsPayload.swift; sourceTree = ""; }; E60E82A52B837C7E00F8DA5C /* FeatureConfigsPayloadProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigsPayloadProcessor.swift; sourceTree = ""; }; @@ -796,9 +759,6 @@ E69A02202B85095F00126FF6 /* ProteusToMLSMigrationState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusToMLSMigrationState.swift; sourceTree = ""; }; E69A02292B85EDC400126FF6 /* SelfSupportedProtocolsRequestBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSupportedProtocolsRequestBuilderTests.swift; sourceTree = ""; }; E6BBCF102C32C52600BD0259 /* HttpClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpClient.swift; sourceTree = ""; }; - E6BBCF122C32C55700BD0259 /* HttpClientImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpClientImpl.swift; sourceTree = ""; }; - E6BBCF142C32D78F00BD0259 /* UserClient+QualifiedID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserClient+QualifiedID.swift"; sourceTree = ""; }; - E6BBCF162C32EBA600BD0259 /* MessageLogAttributesBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLogAttributesBuilder.swift; sourceTree = ""; }; E6BBCF1C2C33E1ED00BD0259 /* MessageLogAttributesBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLogAttributesBuilderTests.swift; sourceTree = ""; }; E6E0CE862B70D2C60004ED88 /* SyncPhase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncPhase.swift; sourceTree = ""; }; E6E0CE882B70DDAB0004ED88 /* SynchronizationState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SynchronizationState.swift; sourceTree = ""; }; @@ -869,7 +829,6 @@ EEDE7DB028EAEEC3007DC6A3 /* ConversationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationService.swift; sourceTree = ""; }; EEE0EDB02858906500BBEE29 /* MLSRequestStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSRequestStrategy.swift; sourceTree = ""; }; EEE0EE0628591E9C00BBEE29 /* AssetDownloadRequestFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetDownloadRequestFactoryTests.swift; sourceTree = ""; }; - EEE46E5328C5EE48005F48D7 /* ZMTransportResponse+ErrorInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMTransportResponse+ErrorInfo.swift"; sourceTree = ""; }; EEE95CD62A4330D900E136CB /* LeaveSubconversationActionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeaveSubconversationActionHandler.swift; sourceTree = ""; }; EEE95CD82A43324F00E136CB /* LeaveSubconversationActionHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeaveSubconversationActionHandlerTests.swift; sourceTree = ""; }; EEFB2DFD2ACD530F0094F877 /* PrekeyPayloadProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrekeyPayloadProcessor.swift; sourceTree = ""; }; @@ -908,12 +867,6 @@ F184018F2073BE0800E9F4CC /* PushMessageHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushMessageHandler.swift; sourceTree = ""; }; F18401902073BE0800E9F4CC /* ApplicationStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationStatus.swift; sourceTree = ""; }; F18401912073BE0800E9F4CC /* OTREntity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTREntity.swift; sourceTree = ""; }; - F18401932073BE0800E9F4CC /* ZMMessage+Dependency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMMessage+Dependency.swift"; sourceTree = ""; }; - F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageExpirationTimer.swift; sourceTree = ""; }; - F18401952073BE0800E9F4CC /* EventDecoderDecryptionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDecoderDecryptionTests.swift; sourceTree = ""; }; - F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMStrategyConfigurationOption.h; sourceTree = ""; }; - F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageExpirationTimerTests.swift; sourceTree = ""; }; - F18401982073BE0800E9F4CC /* ZMConversation+Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversation+Notifications.swift"; sourceTree = ""; }; F18401F62073C2E500E9F4CC /* MessagingTestBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessagingTestBase.swift; sourceTree = ""; }; F18401F72073C2E600E9F4CC /* RequestStrategyTestBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestStrategyTestBase.swift; sourceTree = ""; }; F18401F82073C2E600E9F4CC /* ProteusClientSimulator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusClientSimulator.swift; sourceTree = ""; }; @@ -934,10 +887,37 @@ F1E47FE9207E0B72008D4299 /* project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = project.xcconfig; sourceTree = ""; }; F1E47FEB207E0B72008D4299 /* tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = tests.xcconfig; sourceTree = ""; }; F1E47FED207E0B72008D4299 /* project-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "project-debug.xcconfig"; sourceTree = ""; }; - F963E8D91D955D4600098AD3 /* AssetRequestFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetRequestFactory.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 596132B92EB912A800BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + AssetRequestFactoryTests.swift, + EventDecoderDecryptionTests.swift, + FederationTerminationManagerTest.swift, + MessageExpirationTimerTests.swift, + ZMSimpleListRequestPaginatorTests.m, + "ZMTBaseTests+CoreDataStack.swift", + ); + publicHeaders = ( + ZMSimpleListRequestPaginator.h, + ZMStrategyConfigurationOption.h, + ); + target = 166901691D707509000FE4AF /* WireRequestStrategy */; + }; + 596132BA2EB912A800BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + AssetRequestFactoryTests.swift, + EventDecoderDecryptionTests.swift, + FederationTerminationManagerTest.swift, + MessageExpirationTimerTests.swift, + ZMSimpleListRequestPaginatorTests.m, + "ZMTBaseTests+CoreDataStack.swift", + ); + target = 166901731D707509000FE4AF /* WireRequestStrategyTests */; + }; 5993EA782DAD088500F08A0E /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( @@ -960,6 +940,7 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ 018F577F2D887DA1007105B2 /* APIs */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = APIs; sourceTree = ""; }; + 596132982EB912A800BF6B25 /* Helpers */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (596132B92EB912A800BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 596132BA2EB912A800BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helpers; sourceTree = ""; }; 5993EA732DAD088500F08A0E /* Support */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (5993EA782DAD088500F08A0E /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Support; sourceTree = ""; }; 59D264282CF7225A0005317F /* TestPlans */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59D264292CF722680005317F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = TestPlans; sourceTree = ""; }; CB2D09132D2BEB54006E05B8 /* Calling */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Calling; sourceTree = ""; }; @@ -972,7 +953,7 @@ buildActionMask = 2147483647; files = ( 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */, - 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */, + 59537D852CFF9D1600920B59 /* WireLegacyLogging in Frameworks */, 591B6E3B2C8B09AA009F8A7B /* WireDataModel.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -986,7 +967,7 @@ 598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */, 59D398D22D5525DB001C9C5F /* WireTestingPackage in Frameworks */, 598E870D2BF4E08100FC5438 /* WireUtilitiesSupport.framework in Frameworks */, - 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */, + 59537D872CFF9DF600920B59 /* WireLegacyLogging in Frameworks */, CB5120532C6FD69F000C8FEC /* WireTransportSupport.framework in Frameworks */, 591B6E3D2C8B09AE009F8A7B /* WireDataModelSupport.framework in Frameworks */, ); @@ -1343,7 +1324,7 @@ 067197632AE9502C00D96598 /* E2EIdentity */, 1623F8D62AE7FB5F004F0319 /* APIs */, 168D7CA326FB0CCF00789960 /* Entity Actions */, - F963E8D81D955D4600098AD3 /* Helpers */, + 596132982EB912A800BF6B25 /* Helpers */, 16229481221EBB8000A98679 /* Image Preprocessing */, 1623F8D12AE66F0A004F0319 /* Message Sending */, 06ADE9FE2BD1521A008BA0B3 /* User Client */, @@ -2091,37 +2072,6 @@ path = "zmc-config"; sourceTree = ""; }; - F963E8D81D955D4600098AD3 /* Helpers */ = { - isa = PBXGroup; - children = ( - F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */, - F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */, - F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */, - F18401932073BE0800E9F4CC /* ZMMessage+Dependency.swift */, - 0649D14E24F63DCC001DDC78 /* ZMSound.swift */, - 0649D1A524F673E7001DDC78 /* Logging.swift */, - F18401952073BE0800E9F4CC /* EventDecoderDecryptionTests.swift */, - F18401982073BE0800E9F4CC /* ZMConversation+Notifications.swift */, - BF1F52C51ECC74E5002FB553 /* Array+RequestGenerator.swift */, - F963E8D91D955D4600098AD3 /* AssetRequestFactory.swift */, - D5D65A052073C8F800D7F3C3 /* AssetRequestFactoryTests.swift */, - 06025665248E616C00E060E1 /* ZMSimpleListRequestPaginator.m */, - 06025667248E617D00E060E1 /* ZMSimpleListRequestPaginator.h */, - 06025669248E61BF00E060E1 /* ZMSimpleListRequestPaginator+Internal.h */, - 06474D6524B3227E002C695D /* ZMSimpleListRequestPaginatorTests.m */, - 167BCBC326087F8900E9D7E3 /* ZMTBaseTests+CoreDataStack.swift */, - 63CC83B8285B4845008549AD /* String+Empty.swift */, - 633B39692891890500208124 /* ZMUpdateEvent+Decryption.swift */, - EEE46E5328C5EE48005F48D7 /* ZMTransportResponse+ErrorInfo.swift */, - D33B57B02A56BDCA0078A4F9 /* FederationTerminationManager.swift */, - D3DA067B2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift */, - E6BBCF162C32EBA600BD0259 /* MessageLogAttributesBuilder.swift */, - E6BBCF122C32C55700BD0259 /* HttpClientImpl.swift */, - E6BBCF142C32D78F00BD0259 /* UserClient+QualifiedID.swift */, - ); - path = Helpers; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -2141,12 +2091,10 @@ 1621D22E1D75AC36007108C2 /* ZMChangeTrackerBootstrap.h in Headers */, 166901EF1D7081C7000FE4AF /* ZMUpstreamInsertedObjectSync.h in Headers */, F18401B32073BE0800E9F4CC /* ZMAbstractRequestStrategy.h in Headers */, - 06C394B7248E6FDE00AE736A /* ZMSimpleListRequestPaginator+Internal.h in Headers */, 166901F11D7081C7000FE4AF /* ZMUpstreamModifiedObjectSync.h in Headers */, 166901F41D7081C7000FE4AF /* ZMUpstreamRequest.h in Headers */, 166901D31D7081C7000FE4AF /* ZMDownstreamObjectSync.h in Headers */, F18402132073C56C00E9F4CC /* RequestStrategy.h in Headers */, - F18401D62073BE0800E9F4CC /* ZMStrategyConfigurationOption.h in Headers */, 1669016E1D707509000FE4AF /* WireRequestStrategy.h in Headers */, 166901D81D7081C7000FE4AF /* ZMLocallyInsertedObjectSet.h in Headers */, 1621D2301D75AC36007108C2 /* ZMChangeTrackerBootstrap+Testing.h in Headers */, @@ -2159,7 +2107,6 @@ 16229486221EBB8100A98679 /* ZMImagePreprocessingTracker.h in Headers */, 166901D51D7081C7000FE4AF /* ZMDownstreamObjectSyncWithWhitelist.h in Headers */, F184020F2073C30000E9F4CC /* Bridging-Header.h in Headers */, - 06C394B6248E6FDA00AE736A /* ZMSimpleListRequestPaginator.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2188,12 +2135,13 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( + 596132982EB912A800BF6B25 /* Helpers */, CB2D09132D2BEB54006E05B8 /* Calling */, ); name = WireRequestStrategy; packageProductDependencies = ( 598D04322C89C6CF00B64D71 /* WireFoundation */, - 59537D842CFF9D1600920B59 /* WireLogging */, + 59537D842CFF9D1600920B59 /* WireLegacyLogging */, ); productName = WireRequestStrategy; productReference = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; @@ -2222,7 +2170,7 @@ name = WireRequestStrategyTests; packageProductDependencies = ( 598D042F2C89C67E00B64D71 /* WireFoundation */, - 59537D862CFF9DF600920B59 /* WireLogging */, + 59537D862CFF9DF600920B59 /* WireLegacyLogging */, 59D398D12D5525DB001C9C5F /* WireTestingPackage */, ); productName = WireRequestStrategyTests; @@ -2423,7 +2371,6 @@ 06CF5DFA27FC900F00822FAB /* ZMLocalNotification+Calling.swift in Sources */, 8792F55721AD944100795027 /* UserPropertyRequestStrategy.swift in Sources */, EE3245FC2821D41000F2A84A /* VoIPPushHelper.swift in Sources */, - D33B57B12A56BDCA0078A4F9 /* FederationTerminationManager.swift in Sources */, 16367F2626FDB4720028AF8B /* ConnectionRequestStrategy.swift in Sources */, 0106AC8E2C99A4DC0022E2CF /* MessageInfoExtractor.swift in Sources */, 0640BF6F2B0F6B78008866E4 /* E2EIEnrollment.swift in Sources */, @@ -2453,7 +2400,6 @@ E629E3CA2B470AE600D526AD /* Payload+UpdateConversationAccess.swift in Sources */, 161E055026655E4500DADC3D /* UserProfileRequestStrategy.swift in Sources */, 0671976E2AE951F400D96598 /* AcmeAPI.swift in Sources */, - F18401D42073BE0800E9F4CC /* MessageExpirationTimer.swift in Sources */, CB5A461D2D940BB700D469F1 /* Payload+ConversationGroupType.swift in Sources */, 1622946B221C18BE00A98679 /* AssetV3UploadRequestStrategy.swift in Sources */, 1662ADB322B0E8B300D84071 /* VerifyLegalHoldRequestStrategy.swift in Sources */, @@ -2484,10 +2430,8 @@ E60E82A62B837C7E00F8DA5C /* FeatureConfigsPayloadProcessor.swift in Sources */, 060ED6D62499F41000412C4A /* PushNotificationStatus.swift in Sources */, EEFB2DFE2ACD530F0094F877 /* PrekeyPayloadProcessor.swift in Sources */, - E6BBCF132C32C55700BD0259 /* HttpClientImpl.swift in Sources */, E629E3C02B47051D00D526AD /* Payload+UpdateConversationMemberJoin.swift in Sources */, 1623F8D32AE66F28004F0319 /* MessageSender.swift in Sources */, - F18401D82073BE0800E9F4CC /* ZMConversation+Notifications.swift in Sources */, E629E3B52B4703E100D526AD /* Payload+ConversationAddMember.swift in Sources */, 1623F8DE2AE945E2004F0319 /* MessageAPI.swift in Sources */, E629E3C82B470AB600D526AD /* Payload+UpdateConversationMessageTimer.swift in Sources */, @@ -2500,7 +2444,6 @@ 63DA339F286DF6ED00818C3C /* MLSEventProcessor.swift in Sources */, 06A1966E2A7BEAE300B43BA5 /* TerminateFederationRequestStrategy.swift in Sources */, 1682462F257A1FB7002AF17B /* KeyPathObjectSync.swift in Sources */, - BF1F52C61ECC74E5002FB553 /* Array+RequestGenerator.swift in Sources */, 0693115024F79E2500D14DF5 /* UserNotificationCenterMock.swift in Sources */, EE47346C29A39E8A00E6C04E /* EventDecoder+Proteus.swift in Sources */, 06CDDE9F282E9CC200F9360F /* RemovePushTokenAction.swift in Sources */, @@ -2509,14 +2452,11 @@ E629E3C22B47054400D526AD /* Payload+UpdateConversationConnectionRequest.swift in Sources */, 6360A2132B0B722700A5D5FB /* MLSClientIDsProvider.swift in Sources */, 166901E01D7081C7000FE4AF /* ZMRemoteIdentifierObjectSync.m in Sources */, - 633B396A2891890600208124 /* ZMUpdateEvent+Decryption.swift in Sources */, 06474D4B24AF6858002C695D /* EventDecoder.swift in Sources */, 064824982B10E32C00115329 /* EnrollE2EICertificateUseCase.swift in Sources */, E629E3BC2B4704B200D526AD /* Payload+ConversationEvent.swift in Sources */, E629E3CE2B470B7900D526AD /* Payload+UpdateConversationMLSMessageAdd.swift in Sources */, - 06025666248E616C00E060E1 /* ZMSimpleListRequestPaginator.m in Sources */, F18401A42073BE0800E9F4CC /* GenericMessageEntity.swift in Sources */, - E6BBCF152C32D78F00BD0259 /* UserClient+QualifiedID.swift in Sources */, 1621D2751D7715EA007108C2 /* ZMObjectSyncStrategy.m in Sources */, 166901E21D7081C7000FE4AF /* ZMRequestGenerator.m in Sources */, 639971B42B2779A9009DD5CF /* E2EIKeyPackageRotator.swift in Sources */, @@ -2553,7 +2493,6 @@ F18401D12073BE0800E9F4CC /* ApplicationStatus.swift in Sources */, 0649D14D24F63D3E001DDC78 /* LocalNotificationType+Localization.swift in Sources */, 1623F8E02AEAAF0E004F0319 /* MessageDependencyResolver.swift in Sources */, - E6BBCF172C32EBA600BD0259 /* MessageLogAttributesBuilder.swift in Sources */, EEB5DE0728377635009B4741 /* GetFeatureConfigsActionHandler.swift in Sources */, E9E2AA5E2B163A56008CC2DF /* SyncUsersActionHandler.swift in Sources */, E629E3A72B47020C00D526AD /* Payload+QualifiedConversationList.swift in Sources */, @@ -2561,8 +2500,6 @@ 16A4891A2685CECD001F9127 /* ProteusMessage.swift in Sources */, 6308F8A82A273D1E0072A177 /* BaseFetchMLSGroupInfoActionHandler.swift in Sources */, E9A96E7C2B88D22400914FDD /* PushSupportedProtocolsActionHandler.swift in Sources */, - F18401D32073BE0800E9F4CC /* ZMMessage+Dependency.swift in Sources */, - D5D65A072074C23D00D7F3C3 /* AssetRequestFactory.swift in Sources */, E9EEC3FC2BCFC6B10064BE6A /* SetAllowGuestsAndServicesActionHandler.swift in Sources */, 168D7CA526FB0CFD00789960 /* ActionHandler.swift in Sources */, C9B8EC2B2E5C5C6900183723 /* Payload+CellsState.swift in Sources */, @@ -2582,7 +2519,6 @@ 06A9FDD428B3701000B3C730 /* UpdateAccessRolesActionHandler.swift in Sources */, EE90C2AC282EA1D200474379 /* GetPushTokensAction.swift in Sources */, F18401B02073BE0800E9F4CC /* AbstractRequestStrategy.swift in Sources */, - 0649D14F24F63DCC001DDC78 /* ZMSound.swift in Sources */, E629E3B72B47041700D526AD /* Payload+ConversationUpdateRole.swift in Sources */, F18401C22073BE0800E9F4CC /* AssetV2DownloadRequestStrategy.swift in Sources */, EEAC16D4281AE5F700B7A34D /* CallEventContent.swift in Sources */, @@ -2596,8 +2532,6 @@ 0649D19F24F6717C001DDC78 /* ZMLocalNotificationSet.swift in Sources */, E6BBCF112C32C52600BD0259 /* HttpClient.swift in Sources */, 1622946D221C56E500A98679 /* AssetsPreprocessor.swift in Sources */, - 0649D1A624F673E7001DDC78 /* Logging.swift in Sources */, - EEE46E5428C5EE48005F48D7 /* ZMTransportResponse+ErrorInfo.swift in Sources */, EE8DC53728C0EFA700AC4E3D /* FetchUserClientsActionHandler.swift in Sources */, 16229487221EBB8100A98679 /* ZMImagePreprocessingTracker.m in Sources */, E60CBEC32B45CCBF00958C10 /* EventPayloadDecoder.swift in Sources */, @@ -2622,7 +2556,6 @@ 166901DD1D7081C7000FE4AF /* ZMLocallyModifiedObjectSyncStatus.m in Sources */, E629E3BE2B4704E900D526AD /* Payload+UpdateConversationMemberLeave.swift in Sources */, F18401BB2073BE0800E9F4CC /* LinkPreviewAssetDownloadRequestStrategy.swift in Sources */, - 63CC83B9285B4845008549AD /* String+Empty.swift in Sources */, E6E0CE872B70D2C60004ED88 /* SyncPhase.swift in Sources */, 16751E8524CF72970099AE09 /* DeliveryReceiptRequestStrategy.swift in Sources */, EE8807912AC4080A00278E3C /* ConnectionPayloadProcessor.swift in Sources */, @@ -2665,12 +2598,10 @@ 597B70CC2B03CC83006C2121 /* UpdateConversationProtocolActionHandlerTests.swift in Sources */, 1621D2621D75C745007108C2 /* ZMDownstreamObjectSyncWithWhitelistTests.m in Sources */, 1621D2291D75AB2D007108C2 /* MockEntity2.m in Sources */, - F18401DB2073C25300E9F4CC /* EventDecoderDecryptionTests.swift in Sources */, 0106AC902C9B00A30022E2CF /* MessageInfoExtractorTests.swift in Sources */, E99D18EB2B177F3500751183 /* SyncUsersActionHandlerTests.swift in Sources */, EEB930B92ABD6FCB00FB35B2 /* FetchSupportedProtocolsActionHandlerTests.swift in Sources */, E69A022A2B85EDC400126FF6 /* SelfSupportedProtocolsRequestBuilderTests.swift in Sources */, - D5D65A062073C8F800D7F3C3 /* AssetRequestFactoryTests.swift in Sources */, 638941F02AF50EB10051ABFD /* MockLocalConversationRemovalUseCase.swift in Sources */, 1621D2281D75AB2D007108C2 /* MockEntity.m in Sources */, F18401EC2073C26700E9F4CC /* AssetV3PreviewDownloadRequestStrategyTests.swift in Sources */, @@ -2710,7 +2641,6 @@ 1662ADD122B14CBA00D84071 /* VerifyLegalHoldRequestStrategyTests.swift in Sources */, F18402002073C2EA00E9F4CC /* MockObjects.swift in Sources */, 16BA786D2AFE712B006D8CCF /* StoreUpdateEventTests.swift in Sources */, - F18401DC2073C25300E9F4CC /* MessageExpirationTimerTests.swift in Sources */, F19561F9202A13B4005347C0 /* ZMChangeTrackerBootstrapTests.m in Sources */, 63457C062B2C6F4200AFFEF3 /* ReplaceSelfMLSKeyPackagesActionHandlerTests.swift in Sources */, 0605DB902511622100443219 /* ZMLocalNotificationTests_UnreadCount.swift in Sources */, @@ -2733,7 +2663,6 @@ 168D7BBC26F330DE00789960 /* MessagingTest+Payloads.swift in Sources */, 1621D26D1D75C806007108C2 /* NSManagedObjectContext+TestHelpers.m in Sources */, 0693115724F7B1A200D14DF5 /* ZMLocalNotificationTests_Message.swift in Sources */, - 06474D6624B3227E002C695D /* ZMSimpleListRequestPaginatorTests.m in Sources */, F14B7AEC222009C200458624 /* UserRichProfileRequestStrategyTests.swift in Sources */, 0693114B24F79A0500D14DF5 /* ZMLocalNotificationTests_Event.swift in Sources */, 01F5AED02CAD892000B01069 /* ProteusMessageTests.swift in Sources */, @@ -2766,7 +2695,6 @@ 16E70F5B270DCCB900718E5D /* UpdateConnectionActionHandlerTests.swift in Sources */, 16E5F71826EF4DBF00F35FBA /* ConversationRequestStrategyTests.swift in Sources */, E6E59B082B56D04500E90D36 /* StubPayloadConversation.swift in Sources */, - D3DA067C2A5D9EF700BA9CEB /* FederationTerminationManagerTest.swift in Sources */, 6308F8B22A2740C30072A177 /* FetchMLSSubconversationGroupInfoActionHandlerTests.swift in Sources */, EEDBD0AB2A7B83B100F3956F /* SelfUserRequestStrategyTests.swift in Sources */, 1621D2671D75C776007108C2 /* ZMRemoteIdentifierObjectSyncTests.m in Sources */, @@ -2774,7 +2702,6 @@ 16751EBB24D1BDA00099AE09 /* DeliveryReceiptRequestStrategyTests.swift in Sources */, 0106AC952C9CA4F30022E2CF /* ProteusMessagePayloadBuilderTests.swift in Sources */, 16CC0833268DC32D00C0613C /* LinkPreviewUpdateRequestStrategyTests.swift in Sources */, - 167BCBC426087F8900E9D7E3 /* ZMTBaseTests+CoreDataStack.swift in Sources */, EE7F02292A835FBA00FE5695 /* CreateGroupConversationActionHandlerTests.swift in Sources */, F18401F12073C26C00E9F4CC /* AssetV3DownloadRequestStrategyTests.swift in Sources */, 16B5B42B2705E163001A3216 /* ConnectionRequestStrategyTests.swift in Sources */, @@ -3198,13 +3125,13 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 59537D842CFF9D1600920B59 /* WireLogging */ = { + 59537D842CFF9D1600920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; - 59537D862CFF9DF600920B59 /* WireLogging */ = { + 59537D862CFF9DF600920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 598D042F2C89C67E00B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios-share-engine/Sources/WireLegacyLogging.swift b/wire-ios-share-engine/Sources/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios-share-engine/Sources/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj index c6b701796b0..76e83a176f7 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -9,21 +9,13 @@ /* Begin PBXBuildFile section */ 06DE04672DE5233100D79D99 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 06DE04662DE5233100D79D99 /* WireFoundation */; }; 1606AD122DC5136000C95115 /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1606AD112DC5136000C95115 /* WireDomain.framework */; }; - 165C55F62551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165C55F52551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift */; }; 166DCD9E2552969B004F4F59 /* SharingSessionTests+EncryptionAtRest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166DCD9D2552969B004F4F59 /* SharingSessionTests+EncryptionAtRest.swift */; }; - 34C5BFA32E57658C00C0FF34 /* PushMessageHandlerDummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFA22E57658C00C0FF34 /* PushMessageHandlerDummy.swift */; }; - 34C5BFA52E5765EF00C0FF34 /* ClientRegistrationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFA42E5765EF00C0FF34 /* ClientRegistrationStatus.swift */; }; - 34C5BFA72E57660500C0FF34 /* AuthenticationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFA62E57660500C0FF34 /* AuthenticationStatus.swift */; }; - 34C5BFA92E57662200C0FF34 /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFA82E57662200C0FF34 /* ApplicationStatusDirectory.swift */; }; - 34C5BFAB2E57663C00C0FF34 /* SyncStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFAA2E57663C00C0FF34 /* SyncStatus.swift */; }; - 34C5BFAF2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFAE2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift */; }; - 34C5BFB42E5767F800C0FF34 /* SharingSessionLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5BFB32E5767F800C0FF34 /* SharingSessionLoader.swift */; }; 34DC44AF2E01C1F1004D5DD5 /* WireNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = 34DC44AE2E01C1F1004D5DD5 /* WireNetwork */; }; 5470D3F31D76E1B000FDE440 /* WireShareEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5470D3E81D76E1B000FDE440 /* WireShareEngine.framework */; }; 591B6E322C8B098C009F8A7B /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE668BC12954B82900D939E7 /* WireRequestStrategy.framework */; }; 591B6E352C8B0991009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6E504512BC58ACD004948E7 /* WireDataModelSupport.framework */; }; 591B6E382C8B0995009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE67F6F8296F094C001D7C88 /* WireMockTransport.framework */; }; - 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8A2CFF9F8F00920B59 /* WireLogging */; }; + 59537D8B2CFF9F8F00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8A2CFF9F8F00920B59 /* WireLegacyLogging */; }; BFA18BD41D806050005C281B /* BaseSharingSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */; }; CB79791D2C748580006FBA58 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB79791C2C748580006FBA58 /* TestSetup.swift */; }; CBC41A3A2EB50FBA000769CE /* WireShareEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5470D3E81D76E1B000FDE440 /* WireShareEngine.framework */; }; @@ -33,17 +25,6 @@ EE9AEC962BD159A900F7853F /* WireShareEngine.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC952BD159A900F7853F /* WireShareEngine.docc */; }; F125E9B51E28DB06006583A2 /* SharingSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F125E9B41E28DB06006583A2 /* SharingSessionTests.swift */; }; F154EE0B1F44826400CB8184 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F154EE0A1F44826400CB8184 /* AppDelegate.swift */; }; - F1DABFA21E9B8B6100AD2324 /* AuthenticationStatusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF971E9B8B6100AD2324 /* AuthenticationStatusProvider.swift */; }; - F1DABFA31E9B8B6100AD2324 /* Conversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF981E9B8B6100AD2324 /* Conversation.swift */; }; - F1DABFA41E9B8B6100AD2324 /* OperationLoop.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF991E9B8B6100AD2324 /* OperationLoop.swift */; }; - F1DABFA51E9B8B6100AD2324 /* Sendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF9A1E9B8B6100AD2324 /* Sendable.swift */; }; - F1DABFA61E9B8B6100AD2324 /* SendableBatchObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF9B1E9B8B6100AD2324 /* SendableBatchObserver.swift */; }; - F1DABFA71E9B8B6100AD2324 /* SharingSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF9C1E9B8B6100AD2324 /* SharingSession.swift */; }; - F1DABFA81E9B8B6100AD2324 /* SharingTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF9D1E9B8B6100AD2324 /* SharingTarget.swift */; }; - F1DABFA91E9B8B6100AD2324 /* StrategyFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABF9E1E9B8B6100AD2324 /* StrategyFactory.swift */; }; - F1DABFAA1E9B8B6100AD2324 /* WireShareEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = F1DABF9F1E9B8B6100AD2324 /* WireShareEngine.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F1DABFAB1E9B8B6100AD2324 /* ZMConversation+Conversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABFA01E9B8B6100AD2324 /* ZMConversation+Conversation.swift */; }; - F1DABFAC1E9B8B6100AD2324 /* ZMMessage+Sendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DABFA11E9B8B6100AD2324 /* ZMMessage+Sendable.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -72,15 +53,7 @@ /* Begin PBXFileReference section */ 1606AD112DC5136000C95115 /* WireDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 165C55F52551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SharingSession+EncryptionAtRest.swift"; sourceTree = ""; }; 166DCD9D2552969B004F4F59 /* SharingSessionTests+EncryptionAtRest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SharingSessionTests+EncryptionAtRest.swift"; sourceTree = ""; }; - 34C5BFA22E57658C00C0FF34 /* PushMessageHandlerDummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushMessageHandlerDummy.swift; sourceTree = ""; }; - 34C5BFA42E5765EF00C0FF34 /* ClientRegistrationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientRegistrationStatus.swift; sourceTree = ""; }; - 34C5BFA62E57660500C0FF34 /* AuthenticationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStatus.swift; sourceTree = ""; }; - 34C5BFA82E57662200C0FF34 /* ApplicationStatusDirectory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationStatusDirectory.swift; sourceTree = ""; }; - 34C5BFAA2E57663C00C0FF34 /* SyncStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncStatus.swift; sourceTree = ""; }; - 34C5BFAE2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BackendEnvironmentProvider+CookieStorage.swift"; sourceTree = ""; }; - 34C5BFB32E5767F800C0FF34 /* SharingSessionLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingSessionLoader.swift; sourceTree = ""; }; 5470D3E81D76E1B000FDE440 /* WireShareEngine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireShareEngine.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5470D3F21D76E1B000FDE440 /* WireShareEngineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireShareEngineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 5470D3F91D76E1B000FDE440 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -107,20 +80,16 @@ F154EE081F44826400CB8184 /* WireShareEngineTestHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WireShareEngineTestHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; F154EE0A1F44826400CB8184 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; F154EE161F44826400CB8184 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - F1DABF971E9B8B6100AD2324 /* AuthenticationStatusProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationStatusProvider.swift; sourceTree = ""; }; - F1DABF981E9B8B6100AD2324 /* Conversation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Conversation.swift; sourceTree = ""; }; - F1DABF991E9B8B6100AD2324 /* OperationLoop.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OperationLoop.swift; sourceTree = ""; }; - F1DABF9A1E9B8B6100AD2324 /* Sendable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sendable.swift; sourceTree = ""; }; - F1DABF9B1E9B8B6100AD2324 /* SendableBatchObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendableBatchObserver.swift; sourceTree = ""; }; - F1DABF9C1E9B8B6100AD2324 /* SharingSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingSession.swift; sourceTree = ""; }; - F1DABF9D1E9B8B6100AD2324 /* SharingTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingTarget.swift; sourceTree = ""; }; - F1DABF9E1E9B8B6100AD2324 /* StrategyFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StrategyFactory.swift; sourceTree = ""; }; - F1DABF9F1E9B8B6100AD2324 /* WireShareEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WireShareEngine.h; sourceTree = ""; }; - F1DABFA01E9B8B6100AD2324 /* ZMConversation+Conversation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMConversation+Conversation.swift"; sourceTree = ""; }; - F1DABFA11E9B8B6100AD2324 /* ZMMessage+Sendable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMMessage+Sendable.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 596132E62EB912F100BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + publicHeaders = ( + WireShareEngine.h, + ); + target = 5470D3E71D76E1B000FDE440 /* WireShareEngine */; + }; 59D264242CF722020005317F /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( @@ -131,6 +100,7 @@ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ + 596132D12EB912F100BF6B25 /* Sources */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (596132E62EB912F100BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Sources; sourceTree = ""; }; 59D264222CF721F70005317F /* Tests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59D264242CF722020005317F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Tests; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ @@ -143,7 +113,7 @@ 1606AD122DC5136000C95115 /* WireDomain.framework in Frameworks */, 34DC44AF2E01C1F1004D5DD5 /* WireNetwork in Frameworks */, 591B6E322C8B098C009F8A7B /* WireRequestStrategy.framework in Frameworks */, - 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */, + 59537D8B2CFF9F8F00920B59 /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -173,7 +143,7 @@ isa = PBXGroup; children = ( EE9AEC952BD159A900F7853F /* WireShareEngine.docc */, - F1DABF961E9B8B6100AD2324 /* Sources */, + 596132D12EB912F100BF6B25 /* Sources */, 59D264222CF721F70005317F /* Tests */, 5470D3F61D76E1B000FDE440 /* WireShareEngineTests */, 5470D4021D76E2A400FDE440 /* Resources */, @@ -265,32 +235,6 @@ path = WireShareEngineTestHost; sourceTree = ""; }; - F1DABF961E9B8B6100AD2324 /* Sources */ = { - isa = PBXGroup; - children = ( - 34C5BFAE2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift */, - 34C5BFAA2E57663C00C0FF34 /* SyncStatus.swift */, - 34C5BFA82E57662200C0FF34 /* ApplicationStatusDirectory.swift */, - 34C5BFA62E57660500C0FF34 /* AuthenticationStatus.swift */, - 34C5BFA42E5765EF00C0FF34 /* ClientRegistrationStatus.swift */, - 34C5BFA22E57658C00C0FF34 /* PushMessageHandlerDummy.swift */, - F1DABF971E9B8B6100AD2324 /* AuthenticationStatusProvider.swift */, - F1DABF981E9B8B6100AD2324 /* Conversation.swift */, - F1DABF991E9B8B6100AD2324 /* OperationLoop.swift */, - F1DABF9A1E9B8B6100AD2324 /* Sendable.swift */, - F1DABF9B1E9B8B6100AD2324 /* SendableBatchObserver.swift */, - F1DABF9C1E9B8B6100AD2324 /* SharingSession.swift */, - 34C5BFB32E5767F800C0FF34 /* SharingSessionLoader.swift */, - 165C55F52551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift */, - F1DABF9D1E9B8B6100AD2324 /* SharingTarget.swift */, - F1DABF9E1E9B8B6100AD2324 /* StrategyFactory.swift */, - F1DABF9F1E9B8B6100AD2324 /* WireShareEngine.h */, - F1DABFA01E9B8B6100AD2324 /* ZMConversation+Conversation.swift */, - F1DABFA11E9B8B6100AD2324 /* ZMMessage+Sendable.swift */, - ); - path = Sources; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -298,7 +242,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F1DABFAA1E9B8B6100AD2324 /* WireShareEngine.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -319,6 +262,7 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( + 596132D12EB912F100BF6B25 /* Sources */, 59D264222CF721F70005317F /* Tests */, ); name = WireShareEngine; @@ -440,25 +384,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34C5BFAB2E57663C00C0FF34 /* SyncStatus.swift in Sources */, - 34C5BFA92E57662200C0FF34 /* ApplicationStatusDirectory.swift in Sources */, - F1DABFA31E9B8B6100AD2324 /* Conversation.swift in Sources */, - 34C5BFA52E5765EF00C0FF34 /* ClientRegistrationStatus.swift in Sources */, - F1DABFAB1E9B8B6100AD2324 /* ZMConversation+Conversation.swift in Sources */, - 165C55F62551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift in Sources */, EE9AEC962BD159A900F7853F /* WireShareEngine.docc in Sources */, - 34C5BFAF2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift in Sources */, - F1DABFA21E9B8B6100AD2324 /* AuthenticationStatusProvider.swift in Sources */, - 34C5BFA32E57658C00C0FF34 /* PushMessageHandlerDummy.swift in Sources */, - F1DABFA41E9B8B6100AD2324 /* OperationLoop.swift in Sources */, - F1DABFA91E9B8B6100AD2324 /* StrategyFactory.swift in Sources */, - F1DABFA81E9B8B6100AD2324 /* SharingTarget.swift in Sources */, - 34C5BFA72E57660500C0FF34 /* AuthenticationStatus.swift in Sources */, - F1DABFAC1E9B8B6100AD2324 /* ZMMessage+Sendable.swift in Sources */, - F1DABFA61E9B8B6100AD2324 /* SendableBatchObserver.swift in Sources */, - F1DABFA51E9B8B6100AD2324 /* Sendable.swift in Sources */, - 34C5BFB42E5767F800C0FF34 /* SharingSessionLoader.swift in Sources */, - F1DABFA71E9B8B6100AD2324 /* SharingSession.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -655,9 +581,9 @@ isa = XCSwiftPackageProductDependency; productName = WireNetwork; }; - 59537D8A2CFF9F8F00920B59 /* WireLogging */ = { + 59537D8A2CFF9F8F00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; /* End XCSwiftPackageProductDependency section */ }; diff --git a/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift b/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift index ec7cbaf9e06..59bb65cf51a 100644 --- a/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift +++ b/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLogging +import WireLegacyLogging final class QuickSyncObserver: QuickSyncObserverInterface { diff --git a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift new file mode 100644 index 00000000000..676b0da3ad5 --- /dev/null +++ b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift @@ -0,0 +1,23 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +public import WireLegacyLogging + +public typealias LogFilesProviding = WireLegacyLogging.LogFilesProviding + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift b/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift new file mode 100644 index 00000000000..58ed24879ac --- /dev/null +++ b/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLoggingSupport + +typealias LogFilesProvidingMock = WireLegacyLoggingSupport.LogFilesProvidingMock diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index 5d61fc29c43..c7297b973b4 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -36,7 +36,7 @@ 06DE14CF24B85CA0006CB6B3 /* ZMClientRegistrationStatusDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 06DE14CE24B85BD0006CB6B3 /* ZMClientRegistrationStatusDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 06E0979C2A261E5D00B38C4A /* ZMUserSession+RecurringAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E0979B2A261E5D00B38C4A /* ZMUserSession+RecurringAction.swift */; }; 06E097A02A264F0300B38C4A /* ZMUserSessionTests+RecurringActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E0979F2A264F0300B38C4A /* ZMUserSessionTests+RecurringActions.swift */; }; - 06E47CF02E16E3A70096FEEA /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 06E47CEF2E16E3A70096FEEA /* WireLogging */; }; + 06E47CF02E16E3A70096FEEA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 06E47CEF2E16E3A70096FEEA /* WireLegacyLogging */; }; 06E47CF12E16E3AE0096FEEA /* WireSyncEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549815931A43232400A7CE2E /* WireSyncEngine.framework */; }; 06F98D602437916B007E914A /* SignatureRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06F98D5E24379143007E914A /* SignatureRequestStrategyTests.swift */; }; 06FBF22F2CFD850700DA13EC /* UserSession+Federation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06FBF22E2CFD84FC00DA13EC /* UserSession+Federation.swift */; }; @@ -71,8 +71,6 @@ 162A81D6202B5BC600F6200C /* SessionManagerAVSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162A81D5202B5BC600F6200C /* SessionManagerAVSTests.swift */; }; 162DEE111F87B9800034C8F9 /* ZMUserSession+Calling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 162DEE101F87B9800034C8F9 /* ZMUserSession+Calling.swift */; }; 1636EAFF23F6FCCC00CD9527 /* MockPresentationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1636EAFE23F6FCCC00CD9527 /* MockPresentationDelegate.swift */; }; - 163FB9942052EA4C00E74F83 /* OperationLoopNewRequestObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 163FB9922052EA4600E74F83 /* OperationLoopNewRequestObserver.swift */; }; - 1645ECF82448A0A3007A82D6 /* Decodable+JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1645ECF72448A0A3007A82D6 /* Decodable+JSON.swift */; }; 164A55D820F4FE4A00AE62A6 /* SearchUserImageStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F95706581DE5F6D40087442C /* SearchUserImageStrategyTests.swift */; }; 164B8C211E254AD00060AB26 /* WireCallCenterV3Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165D3A1A1E1D43870052E654 /* WireCallCenterV3Mock.swift */; }; 164C29A31ECF437E0026562A /* SearchRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 164C29A21ECF437E0026562A /* SearchRequestTests.swift */; }; @@ -130,13 +128,11 @@ 168CF42F2007BCD9009FCB89 /* TeamInvitationStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 168CF42E2007BCD9009FCB89 /* TeamInvitationStatusTests.swift */; }; 1693151125836E5800709F15 /* EventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1693151025836E5800709F15 /* EventProcessor.swift */; }; 169BA1F825ECF8F700374343 /* MockAppLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA1F725ECF8F700374343 /* MockAppLock.swift */; }; - 169BA1FF25ED0DAD00374343 /* ZMUserSession+Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA1FE25ED0DAD00374343 /* ZMUserSession+Messages.swift */; }; 169BA23D25EF6E2A00374343 /* MockRegistrationStatusDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA23C25EF6E2A00374343 /* MockRegistrationStatusDelegate.swift */; }; 169BA24125EF6F6700374343 /* ZMConversation+Testing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA24025EF6F6700374343 /* ZMConversation+Testing.swift */; }; 169BA24C25EF753100374343 /* MockReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA24B25EF753100374343 /* MockReachability.swift */; }; 169BA25225EF778E00374343 /* TestUserProfileUpdateObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BA25125EF778E00374343 /* TestUserProfileUpdateObserver.swift */; }; 169BC10F22BD17FF0003159B /* LegalHoldRequestStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169BC10E22BD17FF0003159B /* LegalHoldRequestStrategyTests.swift */; }; - 169E303320D29C670012C219 /* PushRegistryMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 169E303120D29C200012C219 /* PushRegistryMock.swift */; }; 16A702D01E92998100B8410D /* ApplicationStatusDirectoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16A702CF1E92998100B8410D /* ApplicationStatusDirectoryTests.swift */; }; 16A764611F3E0B0B00564F21 /* CallKitManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16A764601F3E0B0B00564F21 /* CallKitManager.swift */; }; 16AD86B81F7292EB00E4C797 /* TypingChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16AD86B71F7292EB00E4C797 /* TypingChange.swift */; }; @@ -189,15 +185,12 @@ 542DFEE61DDCA452000F5B95 /* UserProfileUpdateStatusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 542DFEE51DDCA452000F5B95 /* UserProfileUpdateStatusTests.swift */; }; 543095931DE76B170065367F /* random1.txt in Resources */ = {isa = PBXBuildFile; fileRef = 543095921DE76B170065367F /* random1.txt */; }; 543095951DE76B270065367F /* random2.txt in Resources */ = {isa = PBXBuildFile; fileRef = 543095941DE76B270065367F /* random2.txt */; }; - 5430E9251BAA0D9F00395E05 /* WireSyncEngineLogs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5430E9231BAA0D9F00395E05 /* WireSyncEngineLogs.h */; }; - 543ED0011D79E0EE00A9CDF3 /* ApplicationMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 543ED0001D79E0EE00A9CDF3 /* ApplicationMock.swift */; }; 544BA11A1A433DE400D3B852 /* WireSyncEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 542049EF196AB84B000D8A94 /* WireSyncEngine.h */; settings = {ATTRIBUTES = (Public, ); }; }; 544BA1271A433DE400D3B852 /* NSError+ZMUserSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E05F247192A4F8900F22D80 /* NSError+ZMUserSession.h */; settings = {ATTRIBUTES = (Public, ); }; }; 544BA1571A43424F00D3B852 /* WireSyncEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 549815931A43232400A7CE2E /* WireSyncEngine.framework */; }; 544F8FF31DDCD34600D1AB04 /* UserProfileUpdateNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 544F8FF21DDCD34600D1AB04 /* UserProfileUpdateNotifications.swift */; }; 5458273E2541C3A9002B8F83 /* PresentationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5458273D2541C3A9002B8F83 /* PresentationDelegate.swift */; }; 5458AF841F7021B800E45977 /* PreLoginAuthenticationNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5458AF831F7021B800E45977 /* PreLoginAuthenticationNotification.swift */; }; - 546392721D79D5210094EC66 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546392711D79D5210094EC66 /* Application.swift */; }; 5463C897193F3C74006799DE /* ZMTimingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5463C890193F38A6006799DE /* ZMTimingTests.m */; }; 5467F1C61E0AE421008C1745 /* KeyValueStore+AccessToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5467F1C51E0AE421008C1745 /* KeyValueStore+AccessToken.swift */; }; 546F815C1E685F6E00775059 /* LocalNotificationDispatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 546F815A1E685F1A00775059 /* LocalNotificationDispatcherTests.swift */; }; @@ -249,7 +242,7 @@ 5946F37E2D53DC550039C059 /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 5946F37D2D53DC550039C059 /* WireTestingPackage */; }; 594C0FCE2D541643003D8183 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 594C0FCD2D541643003D8183 /* WireDomainPackage */; }; 594EAA002EA23E73009BC0EB /* WireUtilitiesPackageSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */; }; - 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D882CFF9E7700920B59 /* WireLogging */; }; + 59537D892CFF9E7700920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D882CFF9E7700920B59 /* WireLegacyLogging */; }; 596A19EA2E9E523100E190AE /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 596A19E92E9E523100E190AE /* ZIPFoundation */; }; 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */; }; 597B70C32B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */; }; @@ -257,8 +250,9 @@ 59919E092DACFEED00EF63C7 /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59919E082DACFEED00EF63C7 /* WireFoundationSupport */; }; 5996E8922C19CB28007A52F0 /* WireSystemSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E87012BF4DE9600FC5438 /* WireSystemSupport.framework */; }; 5996E8952C19CB36007A52F0 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */; }; - 59BB29252E29527500C49DB6 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BB29242E29527500C49DB6 /* WireLoggingSupport */; }; + 59BB29252E29527500C49DB6 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */; }; 59C8F6522DF1BE17005AAC9D /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59C8F6512DF1BE17005AAC9D /* WireFoundation */; }; + 59D8C3962EB9189200B8E622 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59D8C3952EB9189200B8E622 /* WireLoggingSupport */; }; 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */; }; 59E6A9142B4EE5CF00DBCC6B /* RecurringAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59E6A9132B4EE5CF00DBCC6B /* RecurringAction.swift */; }; 59E6A9162B4EE5D500DBCC6B /* RecurringActionServiceInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59E6A9152B4EE5D500DBCC6B /* RecurringActionServiceInterface.swift */; }; @@ -267,7 +261,6 @@ 5E0EB1F72100A14A00B5DC2B /* CompanyLoginRequesterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E0EB1F52100A13200B5DC2B /* CompanyLoginRequesterTests.swift */; }; 5E0EB1F92100A46F00B5DC2B /* MockCompanyLoginRequesterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E0EB1F82100A46F00B5DC2B /* MockCompanyLoginRequesterDelegate.swift */; }; 5E2C354D21A806A80034F1EE /* MockBackgroundActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E2C354C21A806A80034F1EE /* MockBackgroundActivityManager.swift */; }; - 5E6716912174CA6700522E61 /* MockUser+LoginCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */; }; 5E8BB8992147CD3F00EEA64B /* AVSBridging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8BB8982147CD3F00EEA64B /* AVSBridging.swift */; }; 5E8BB89C2147CE1600EEA64B /* AVSCallMember.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8BB89B2147CE1600EEA64B /* AVSCallMember.swift */; }; 5E8BB89E2147E9DF00EEA64B /* AVSWrapper+Handlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8BB89D2147E9DF00EEA64B /* AVSWrapper+Handlers.swift */; }; @@ -275,7 +268,6 @@ 5E8BB8A22147F89000EEA64B /* CallCenterSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8BB8A12147F89000EEA64B /* CallCenterSupport.swift */; }; 5E8BB8A52149130800EEA64B /* AVSBridgingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8BB8A3214912D100EEA64B /* AVSBridgingTests.swift */; }; 5E8EE1F720FDC6B900DB1F9B /* CompanyLoginRequestDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8EE1F620FDC6B900DB1F9B /* CompanyLoginRequestDetector.swift */; }; - 5E8EE1FA20FDC7D700DB1F9B /* Pasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8EE1F920FDC7D700DB1F9B /* Pasteboard.swift */; }; 5E8EE1FC20FDCCE200DB1F9B /* CompanyLoginRequestDetectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E8EE1FB20FDCCE200DB1F9B /* CompanyLoginRequestDetectorTests.swift */; }; 5E9D326F2109C1740032FB06 /* CompanyLoginErrorCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E9D326E2109C1740032FB06 /* CompanyLoginErrorCode.swift */; }; 5E9D32712109C54B0032FB06 /* CompanyLoginActionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E9D32702109C54B0032FB06 /* CompanyLoginActionTests.swift */; }; @@ -338,13 +330,10 @@ 874A16922052BEC5001C6760 /* UserExpirationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874A16912052BEC5001C6760 /* UserExpirationObserver.swift */; }; 874A16942052C64B001C6760 /* UserExpirationObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874A16932052C64B001C6760 /* UserExpirationObserverTests.swift */; }; 874A174A205812B6001C6760 /* ZMUserSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874A1749205812B6001C6760 /* ZMUserSessionTests.swift */; }; - 874F142D1C16FD9700C15118 /* Device.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874F142C1C16FD9700C15118 /* Device.swift */; }; 8751DA061F66BFA6000D308B /* ZMUserSession+Push.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8751DA051F66BFA6000D308B /* ZMUserSession+Push.swift */; }; 8754B84A1F73C25400EC02AD /* ConversationListChangeInfo+UserSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8754B8491F73C25400EC02AD /* ConversationListChangeInfo+UserSession.swift */; }; 8754B84C1F73C38900EC02AD /* MessageChangeInfo+UserSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8754B84B1F73C38900EC02AD /* MessageChangeInfo+UserSession.swift */; }; 8766853C1F2A1AA00031081B /* UnauthenticatedSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8766853A1F2A1A860031081B /* UnauthenticatedSessionTests.swift */; }; - 879634401F7BEA4700FC79BA /* DispatchQueue+SerialAsync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8796343F1F7BEA4700FC79BA /* DispatchQueue+SerialAsync.swift */; }; - 879634421F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 879634411F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift */; }; 8798607B1C3D48A400218A3E /* DeleteAccountRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8798607A1C3D48A400218A3E /* DeleteAccountRequestStrategy.swift */; }; 87AEA67D1EFBF46600C94BF3 /* DiskDatabaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87AEA67B1EFBD27700C94BF3 /* DiskDatabaseTest.swift */; }; 87B30C5C1FA756220054DFB1 /* FlowManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B30C5B1FA756220054DFB1 /* FlowManagerTests.swift */; }; @@ -405,7 +394,6 @@ E6C6C6B72B87745F007585DF /* TeamMembersDownloadRequestStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C6C6B22B877404007585DF /* TeamMembersDownloadRequestStrategy.swift */; }; E6C983EE2B986ABA00D55177 /* ZMUserSession+UserSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C983ED2B986ABA00D55177 /* ZMUserSession+UserSession.swift */; }; E6F31B502C19B42E005DFA0C /* ZMUserSession+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F31B4F2C19B42E005DFA0C /* ZMUserSession+Notifications.swift */; }; - E91180E12CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91180E02CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift */; }; E955D3DF2C36CFFF0090BEAB /* ConversationType+ZMConversationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = E955D3DE2C36CFFF0090BEAB /* ConversationType+ZMConversationType.swift */; }; E998FE8E2C184C9800EAA672 /* UserCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = E998FE8D2C184C9800EAA672 /* UserCredentials.swift */; }; E9ACAED12CBE43C2000E13B5 /* ZMUserSession+WireCallStateObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9ACAED02CBE43C2000E13B5 /* ZMUserSession+WireCallStateObserver.swift */; }; @@ -415,7 +403,6 @@ E9F403172C5BD26C00F81366 /* SessionManager+AnalyticsUseCases.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F403162C5BD26C00F81366 /* SessionManager+AnalyticsUseCases.swift */; }; EE01E0371F90DD67001AA33C /* audio.m4a in Resources */ = {isa = PBXBuildFile; fileRef = EE01E0361F90DABC001AA33C /* audio.m4a */; }; EE01E0391F90FEC1001AA33C /* ZMLocalNotificationTests_ExpiredMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE01E0381F90FEC1001AA33C /* ZMLocalNotificationTests_ExpiredMessage.swift */; }; - EE0CAEAF2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0CAEAE2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift */; }; EE1108F923D1F945005DC663 /* TypingUsersTimeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE1108F823D1F945005DC663 /* TypingUsersTimeout.swift */; }; EE1108FB23D2087F005DC663 /* Typing.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE1108FA23D2087F005DC663 /* Typing.swift */; }; EE13BD8B2BC948FC006561F8 /* ZMUserSession+APIAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE13BD8A2BC948FC006561F8 /* ZMUserSession+APIAdapter.swift */; }; @@ -429,7 +416,6 @@ EE2DE5E429250CC400F42F4C /* CallKitCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE2DE5E329250CC400F42F4C /* CallKitCall.swift */; }; EE2DE5E8292519EC00F42F4C /* CallKitCallRegister.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE2DE5E7292519EC00F42F4C /* CallKitCallRegister.swift */; }; EE2DE5EA2926377C00F42F4C /* CallObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE2DE5E92926377C00F42F4C /* CallObserver.swift */; }; - EE2DE5EC29263C5100F42F4C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE2DE5EB29263C5100F42F4C /* Logger.swift */; }; EE38DDEE280437E500D4983D /* BlacklistReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE38DDED280437E500D4983D /* BlacklistReason.swift */; }; EE3BA1802CA6DC8C009D182C /* UnauthenticatedSessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3BA17F2CA6DC8C009D182C /* UnauthenticatedSessionDelegate.swift */; }; EE3E43F62BF62BB9001A43A1 /* LegacySupportedProtocolsServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3E43F52BF62BB9001A43A1 /* LegacySupportedProtocolsServiceTests.swift */; }; @@ -481,7 +467,6 @@ F148F6691FBAF55800BD6909 /* TeamRegistrationStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F148F6681FBAF55800BD6909 /* TeamRegistrationStrategyTests.swift */; }; F148F66B1FBAFAF600BD6909 /* RegistrationStatusTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F148F66A1FBAFAF600BD6909 /* RegistrationStatusTestHelper.swift */; }; F16558D1225F3F2A00EA2F2A /* SessionManager+SwitchBackend.swift in Sources */ = {isa = PBXBuildFile; fileRef = F16558D0225F3F2A00EA2F2A /* SessionManager+SwitchBackend.swift */; }; - F16C8BC42040715800677D31 /* ZMUpdateEvent+Testing.swift in Sources */ = {isa = PBXBuildFile; fileRef = F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */; }; F170AF211E78013A0033DC33 /* UserImageAssetUpdateStrategyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F170AF1F1E7800CF0033DC33 /* UserImageAssetUpdateStrategyTests.swift */; }; F19E55A022B3A2C5005C792D /* UNNotification+SafeLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = F19E559F22B3A2C5005C792D /* UNNotification+SafeLogging.swift */; }; F19E55A222B3A3FA005C792D /* UNNotificationResponse+SafeLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = F19E55A122B3A3FA005C792D /* UNNotificationResponse+SafeLogging.swift */; }; @@ -650,8 +635,6 @@ 162A81D5202B5BC600F6200C /* SessionManagerAVSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionManagerAVSTests.swift; sourceTree = ""; }; 162DEE101F87B9800034C8F9 /* ZMUserSession+Calling.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+Calling.swift"; sourceTree = ""; }; 1636EAFE23F6FCCC00CD9527 /* MockPresentationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPresentationDelegate.swift; sourceTree = ""; }; - 163FB9922052EA4600E74F83 /* OperationLoopNewRequestObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperationLoopNewRequestObserver.swift; sourceTree = ""; }; - 1645ECF72448A0A3007A82D6 /* Decodable+JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Decodable+JSON.swift"; sourceTree = ""; }; 164C29A21ECF437E0026562A /* SearchRequestTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchRequestTests.swift; sourceTree = ""; }; 164C29A41ECF47D80026562A /* SearchDirectoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchDirectoryTests.swift; sourceTree = ""; }; 164C29A61ED2D7B00026562A /* SearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchResult.swift; sourceTree = ""; }; @@ -706,13 +689,11 @@ 1693151E2588CF9500709F15 /* EventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventProcessorTests.swift; sourceTree = ""; }; 169BA1D625ECDBA300374343 /* IntegrationTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "IntegrationTests-Info.plist"; sourceTree = ""; }; 169BA1F725ECF8F700374343 /* MockAppLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAppLock.swift; sourceTree = ""; }; - 169BA1FE25ED0DAD00374343 /* ZMUserSession+Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+Messages.swift"; sourceTree = ""; }; 169BA23C25EF6E2A00374343 /* MockRegistrationStatusDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRegistrationStatusDelegate.swift; sourceTree = ""; }; 169BA24025EF6F6700374343 /* ZMConversation+Testing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversation+Testing.swift"; sourceTree = ""; }; 169BA24B25EF753100374343 /* MockReachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockReachability.swift; sourceTree = ""; }; 169BA25125EF778E00374343 /* TestUserProfileUpdateObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestUserProfileUpdateObserver.swift; sourceTree = ""; }; 169BC10E22BD17FF0003159B /* LegalHoldRequestStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegalHoldRequestStrategyTests.swift; sourceTree = ""; }; - 169E303120D29C200012C219 /* PushRegistryMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRegistryMock.swift; sourceTree = ""; }; 16A702CF1E92998100B8410D /* ApplicationStatusDirectoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationStatusDirectoryTests.swift; sourceTree = ""; }; 16A764601F3E0B0B00564F21 /* CallKitManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallKitManager.swift; sourceTree = ""; }; 16AD86B71F7292EB00E4C797 /* TypingChange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypingChange.swift; sourceTree = ""; }; @@ -774,12 +755,9 @@ 542DFEE51DDCA452000F5B95 /* UserProfileUpdateStatusTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserProfileUpdateStatusTests.swift; sourceTree = ""; }; 543095921DE76B170065367F /* random1.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = random1.txt; sourceTree = ""; }; 543095941DE76B270065367F /* random2.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = random2.txt; sourceTree = ""; }; - 5430E9231BAA0D9F00395E05 /* WireSyncEngineLogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WireSyncEngineLogs.h; sourceTree = ""; }; - 543ED0001D79E0EE00A9CDF3 /* ApplicationMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApplicationMock.swift; sourceTree = ""; }; 544F8FF21DDCD34600D1AB04 /* UserProfileUpdateNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserProfileUpdateNotifications.swift; sourceTree = ""; }; 5458273D2541C3A9002B8F83 /* PresentationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationDelegate.swift; sourceTree = ""; }; 5458AF831F7021B800E45977 /* PreLoginAuthenticationNotification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreLoginAuthenticationNotification.swift; sourceTree = ""; }; - 546392711D79D5210094EC66 /* Application.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; 5463C88F193F38A6006799DE /* ZMTimingTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZMTimingTests.h; sourceTree = ""; }; 5463C890193F38A6006799DE /* ZMTimingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZMTimingTests.m; sourceTree = ""; }; 5467F1C51E0AE421008C1745 /* KeyValueStore+AccessToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "KeyValueStore+AccessToken.swift"; sourceTree = ""; }; @@ -837,7 +815,6 @@ 5E0EB1F52100A13200B5DC2B /* CompanyLoginRequesterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLoginRequesterTests.swift; sourceTree = ""; }; 5E0EB1F82100A46F00B5DC2B /* MockCompanyLoginRequesterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCompanyLoginRequesterDelegate.swift; sourceTree = ""; }; 5E2C354C21A806A80034F1EE /* MockBackgroundActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockBackgroundActivityManager.swift; sourceTree = ""; }; - 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MockUser+LoginCredentials.swift"; sourceTree = ""; }; 5E8BB8982147CD3F00EEA64B /* AVSBridging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVSBridging.swift; sourceTree = ""; }; 5E8BB89B2147CE1600EEA64B /* AVSCallMember.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVSCallMember.swift; sourceTree = ""; }; 5E8BB89D2147E9DF00EEA64B /* AVSWrapper+Handlers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVSWrapper+Handlers.swift"; sourceTree = ""; }; @@ -845,7 +822,6 @@ 5E8BB8A12147F89000EEA64B /* CallCenterSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallCenterSupport.swift; sourceTree = ""; }; 5E8BB8A3214912D100EEA64B /* AVSBridgingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVSBridgingTests.swift; sourceTree = ""; }; 5E8EE1F620FDC6B900DB1F9B /* CompanyLoginRequestDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLoginRequestDetector.swift; sourceTree = ""; }; - 5E8EE1F920FDC7D700DB1F9B /* Pasteboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pasteboard.swift; sourceTree = ""; }; 5E8EE1FB20FDCCE200DB1F9B /* CompanyLoginRequestDetectorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLoginRequestDetectorTests.swift; sourceTree = ""; }; 5E9D326E2109C1740032FB06 /* CompanyLoginErrorCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLoginErrorCode.swift; sourceTree = ""; }; 5E9D32702109C54B0032FB06 /* CompanyLoginActionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLoginActionTests.swift; sourceTree = ""; }; @@ -914,13 +890,10 @@ 874A16912052BEC5001C6760 /* UserExpirationObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserExpirationObserver.swift; sourceTree = ""; }; 874A16932052C64B001C6760 /* UserExpirationObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserExpirationObserverTests.swift; sourceTree = ""; }; 874A1749205812B6001C6760 /* ZMUserSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMUserSessionTests.swift; sourceTree = ""; }; - 874F142C1C16FD9700C15118 /* Device.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Device.swift; sourceTree = ""; }; 8751DA051F66BFA6000D308B /* ZMUserSession+Push.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+Push.swift"; sourceTree = ""; }; 8754B8491F73C25400EC02AD /* ConversationListChangeInfo+UserSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationListChangeInfo+UserSession.swift"; sourceTree = ""; }; 8754B84B1F73C38900EC02AD /* MessageChangeInfo+UserSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MessageChangeInfo+UserSession.swift"; sourceTree = ""; }; 8766853A1F2A1A860031081B /* UnauthenticatedSessionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnauthenticatedSessionTests.swift; sourceTree = ""; }; - 8796343F1F7BEA4700FC79BA /* DispatchQueue+SerialAsync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DispatchQueue+SerialAsync.swift"; sourceTree = ""; }; - 879634411F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DispatchQueueSerialAsyncTests.swift; sourceTree = ""; }; 8798607A1C3D48A400218A3E /* DeleteAccountRequestStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeleteAccountRequestStrategy.swift; sourceTree = ""; }; 87AEA67B1EFBD27700C94BF3 /* DiskDatabaseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiskDatabaseTest.swift; sourceTree = ""; }; 87B30C5B1FA756220054DFB1 /* FlowManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowManagerTests.swift; sourceTree = ""; }; @@ -1019,7 +992,6 @@ E6C6C6B42B87741D007585DF /* TeamMembersDownloadRequestStrategyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamMembersDownloadRequestStrategyTests.swift; sourceTree = ""; }; E6C983ED2B986ABA00D55177 /* ZMUserSession+UserSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+UserSession.swift"; sourceTree = ""; }; E6F31B4F2C19B42E005DFA0C /* ZMUserSession+Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+Notifications.swift"; sourceTree = ""; }; - E91180E02CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMConversationMessage+SelfUserReactions.swift"; sourceTree = ""; }; E955D3DE2C36CFFF0090BEAB /* ConversationType+ZMConversationType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ConversationType+ZMConversationType.swift"; sourceTree = ""; }; E998FE8D2C184C9800EAA672 /* UserCredentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserCredentials.swift; sourceTree = ""; }; E9ACAED02CBE43C2000E13B5 /* ZMUserSession+WireCallStateObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+WireCallStateObserver.swift"; sourceTree = ""; }; @@ -1030,7 +1002,6 @@ EBD7B55754FDA4E74F1006FD /* ZMOperationLoopTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZMOperationLoopTests.h; sourceTree = ""; }; EE01E0361F90DABC001AA33C /* audio.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = audio.m4a; sourceTree = ""; }; EE01E0381F90FEC1001AA33C /* ZMLocalNotificationTests_ExpiredMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMLocalNotificationTests_ExpiredMessage.swift; sourceTree = ""; }; - EE0CAEAE2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+MinTLSVersion.swift"; sourceTree = ""; }; EE1108F823D1F945005DC663 /* TypingUsersTimeout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypingUsersTimeout.swift; sourceTree = ""; }; EE1108FA23D2087F005DC663 /* Typing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Typing.swift; sourceTree = ""; }; EE13BD8A2BC948FC006561F8 /* ZMUserSession+APIAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+APIAdapter.swift"; sourceTree = ""; }; @@ -1044,7 +1015,6 @@ EE2DE5E329250CC400F42F4C /* CallKitCall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallKitCall.swift; sourceTree = ""; }; EE2DE5E7292519EC00F42F4C /* CallKitCallRegister.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallKitCallRegister.swift; sourceTree = ""; }; EE2DE5E92926377C00F42F4C /* CallObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallObserver.swift; sourceTree = ""; }; - EE2DE5EB29263C5100F42F4C /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; EE38DDED280437E500D4983D /* BlacklistReason.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlacklistReason.swift; sourceTree = ""; }; EE3BA17F2CA6DC8C009D182C /* UnauthenticatedSessionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnauthenticatedSessionDelegate.swift; sourceTree = ""; }; EE3E43F52BF62BB9001A43A1 /* LegacySupportedProtocolsServiceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacySupportedProtocolsServiceTests.swift; sourceTree = ""; }; @@ -1103,7 +1073,6 @@ F148F6681FBAF55800BD6909 /* TeamRegistrationStrategyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamRegistrationStrategyTests.swift; sourceTree = ""; }; F148F66A1FBAFAF600BD6909 /* RegistrationStatusTestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationStatusTestHelper.swift; sourceTree = ""; }; F16558D0225F3F2A00EA2F2A /* SessionManager+SwitchBackend.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionManager+SwitchBackend.swift"; sourceTree = ""; }; - F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ZMUpdateEvent+Testing.swift"; sourceTree = ""; }; F170AF1F1E7800CF0033DC33 /* UserImageAssetUpdateStrategyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserImageAssetUpdateStrategyTests.swift; sourceTree = ""; }; F19E559F22B3A2C5005C792D /* UNNotification+SafeLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotification+SafeLogging.swift"; sourceTree = ""; }; F19E55A122B3A3FA005C792D /* UNNotificationResponse+SafeLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotificationResponse+SafeLogging.swift"; sourceTree = ""; }; @@ -1203,12 +1172,14 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ 0177AABF2F151E5A00303844 /* ZMUserSession */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = ZMUserSession; sourceTree = ""; }; 591E5E252D28084200284F11 /* WireCallCenterNotifications */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireCallCenterNotifications; sourceTree = ""; }; + 596133112EB913D000BF6B25 /* Utility */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Utility; sourceTree = ""; }; 598410982D3EC1980062D022 /* Use cases */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "Use cases"; sourceTree = ""; }; 5993EA532DAD078300F08A0E /* Support */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (5993EA5B2DAD078300F08A0E /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Support; sourceTree = ""; }; 59A9D3C62E86BB49002FCE03 /* AppVersionMigrations */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = AppVersionMigrations; sourceTree = ""; }; 59C60D1A2D00672300CAC544 /* Transcoders */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Transcoders; sourceTree = ""; }; 59D0583B2D158D0D00B687F2 /* Analytics */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Analytics; sourceTree = ""; }; 59D264272CF722430005317F /* TestsPlans */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestsPlans; sourceTree = ""; }; + 59D8C3A12EB918D500B8E622 /* Utility */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Utility; sourceTree = ""; }; 59DBECA72D3965570069C64C /* Use cases */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "Use cases"; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ @@ -1220,7 +1191,7 @@ 342DDD882E66B41300A94CCF /* WireNetwork in Frameworks */, 06E47CF12E16E3AE0096FEEA /* WireSyncEngine.framework in Frameworks */, 59C8F6522DF1BE17005AAC9D /* WireFoundation in Frameworks */, - 06E47CF02E16E3A70096FEEA /* WireLogging in Frameworks */, + 06E47CF02E16E3A70096FEEA /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1252,7 +1223,8 @@ 54F4DC5A1A4438B300FDB6EA /* WireSyncEngine.framework in Frameworks */, 59919E092DACFEED00EF63C7 /* WireFoundationSupport in Frameworks */, 59358C902DF1A01300C32162 /* WireAnalyticsSupport in Frameworks */, - 59BB29252E29527500C49DB6 /* WireLoggingSupport in Frameworks */, + 59BB29252E29527500C49DB6 /* WireLegacyLoggingSupport in Frameworks */, + 59D8C3962EB9189200B8E622 /* WireLoggingSupport in Frameworks */, EE4E6A262B714490007C476D /* WireRequestStrategySupport.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1269,7 +1241,7 @@ 34DC44B12E01C1FC004D5DD5 /* WireNetwork in Frameworks */, 598D04362C89C6FB00B64D71 /* WireFoundation in Frameworks */, EE67F6C8296F0622001D7C88 /* libPhoneNumberiOS.xcframework in Frameworks */, - 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */, + 59537D892CFF9E7700920B59 /* WireLegacyLogging in Frameworks */, 594C0FCE2D541643003D8183 /* WireDomainPackage in Frameworks */, 59358C8C2DF19ED700C32162 /* WireAnalytics in Frameworks */, 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */, @@ -1623,7 +1595,7 @@ 59D0583B2D158D0D00B687F2 /* Analytics */, 060C06662B7619C600B484C6 /* E2EI */, EFF9403C2240FE12004F3115 /* DeepLink */, - A9EADFFF19DBF20A00FD386C /* Utility */, + 596133112EB913D000BF6B25 /* Utility */, A926F1E0196C12ED0045BB47 /* Registration */, A957B4B91962FB610060EE03 /* Notifications */, 54BAF1BB19212EBA008042FB /* UserSession */, @@ -1662,7 +1634,7 @@ 169BA1F625ECF8C300374343 /* Mocks */, 09C77C3C1BA2E38D00E2163F /* E2EE */, 54C2F6751A6FA988003D09D9 /* Notifications */, - A9EAE00A19DBF24100FD386C /* Utility */, + 59D8C3A12EB918D500B8E622 /* Utility */, 54CEC9BB19AB34CE006817BB /* Registration */, 5474C7EB1921303400185A3A /* UserSession */, F159F4121F1E310C001B7D80 /* SessionManager */, @@ -2132,36 +2104,6 @@ path = Search; sourceTree = ""; }; - A9EADFFF19DBF20A00FD386C /* Utility */ = { - isa = PBXGroup; - children = ( - 5430E9231BAA0D9F00395E05 /* WireSyncEngineLogs.h */, - 546392711D79D5210094EC66 /* Application.swift */, - 1645ECF72448A0A3007A82D6 /* Decodable+JSON.swift */, - 874F142C1C16FD9700C15118 /* Device.swift */, - 8796343F1F7BEA4700FC79BA /* DispatchQueue+SerialAsync.swift */, - EE2DE5EB29263C5100F42F4C /* Logger.swift */, - 5E8EE1F920FDC7D700DB1F9B /* Pasteboard.swift */, - EE0CAEAE2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift */, - E91180E02CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift */, - ); - path = Utility; - sourceTree = ""; - }; - A9EAE00A19DBF24100FD386C /* Utility */ = { - isa = PBXGroup; - children = ( - 543ED0001D79E0EE00A9CDF3 /* ApplicationMock.swift */, - 879634411F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift */, - F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */, - 163FB9922052EA4600E74F83 /* OperationLoopNewRequestObserver.swift */, - 169E303120D29C200012C219 /* PushRegistryMock.swift */, - 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */, - 169BA1FE25ED0DAD00374343 /* ZMUserSession+Messages.swift */, - ); - path = Utility; - sourceTree = ""; - }; BF44A3521C71D60100C6928E /* DB Fixture 1.27 */ = { isa = PBXGroup; children = ( @@ -2414,7 +2356,6 @@ 872A2EFE2004B86D00900B22 /* ZMSyncStrategy.h in Headers */, 166E47D1255EC03E00C161C8 /* ZMSelfStrategy.h in Headers */, F19F1D311EFBCBD300275E27 /* ZMLoginTranscoder.h in Headers */, - 5430E9251BAA0D9F00395E05 /* WireSyncEngineLogs.h in Headers */, 06DE14CF24B85CA0006CB6B3 /* ZMClientRegistrationStatusDelegate.h in Headers */, 09531F161AE960E300B8556A /* ZMLoginCodeRequestTranscoder.h in Headers */, 544BA1271A433DE400D3B852 /* NSError+ZMUserSession.h in Headers */, @@ -2452,7 +2393,7 @@ name = WireSyncEngineSupport; packageProductDependencies = ( 59C8F6512DF1BE17005AAC9D /* WireFoundation */, - 06E47CEF2E16E3A70096FEEA /* WireLogging */, + 06E47CEF2E16E3A70096FEEA /* WireLegacyLogging */, 342DDD872E66B41300A94CCF /* WireNetwork */, ); productName = WireSyncEngineSupport; @@ -2496,6 +2437,7 @@ 0177AABF2F151E5A00303844 /* ZMUserSession */, 598410982D3EC1980062D022 /* Use cases */, 59C60D1A2D00672300CAC544 /* Transcoders */, + 59D8C3A12EB918D500B8E622 /* Utility */, ); name = UnitTests; packageProductDependencies = ( @@ -2504,8 +2446,9 @@ 59919E082DACFEED00EF63C7 /* WireFoundationSupport */, 59358C8F2DF1A01300C32162 /* WireAnalyticsSupport */, 34F8CA972E02BFEB000FE4E0 /* WireNetwork */, - 59BB29242E29527500C49DB6 /* WireLoggingSupport */, + 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */, 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */, + 59D8C3952EB9189200B8E622 /* WireLoggingSupport */, ); productName = "WireSyncEngine-iOS-Tests"; productReference = 3E1860C3191A649D000FE027 /* UnitTests.xctest */; @@ -2526,6 +2469,7 @@ ); fileSystemSynchronizedGroups = ( 591E5E252D28084200284F11 /* WireCallCenterNotifications */, + 596133112EB913D000BF6B25 /* Utility */, 59A9D3C62E86BB49002FCE03 /* AppVersionMigrations */, 59D0583B2D158D0D00B687F2 /* Analytics */, 59DBECA72D3965570069C64C /* Use cases */, @@ -2533,7 +2477,7 @@ name = "WireSyncEngine-ios"; packageProductDependencies = ( 598D04352C89C6FB00B64D71 /* WireFoundation */, - 59537D882CFF9E7700920B59 /* WireLogging */, + 59537D882CFF9E7700920B59 /* WireLegacyLogging */, CBD35F292D09EBA50080DA37 /* WireCrypto */, 594C0FCD2D541643003D8183 /* WireDomainPackage */, 01C774282D9EF01400A2FF07 /* WireAVS */, @@ -2744,16 +2688,13 @@ 54A170691B300717001B41A5 /* ProxiedRequestStrategyTests.swift in Sources */, 1660AA111ECE3C1C0056D403 /* SearchTaskTests.swift in Sources */, 873B893E20445F4400FBE254 /* ZMConversationAccessModeTests.swift in Sources */, - 543ED0011D79E0EE00A9CDF3 /* ApplicationMock.swift in Sources */, 160C314A1E82AC170012E4BC /* OperationStatusTests.swift in Sources */, - 169E303320D29C670012C219 /* PushRegistryMock.swift in Sources */, 1671F7532B6A835300C2D8A3 /* ZMClientRegistrationStatusTests.swift in Sources */, 3E05F252192A4FBD00F22D80 /* UserSessionErrorTests.m in Sources */, 06ADE9EA2BC02B65008BA0B3 /* CertificateRevocationListsCheckerTests.swift in Sources */, F148F6691FBAF55800BD6909 /* TeamRegistrationStrategyTests.swift in Sources */, EE3E43F92BF62BF6001A43A1 /* SelfSupportedProtocolsRequestStrategyTests.swift in Sources */, E6C6C6B62B877429007585DF /* TeamMembersDownloadRequestStrategyTests.swift in Sources */, - 879634421F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift in Sources */, 54AB428E1DF5C5B400381F2C /* TopConversationsDirectoryTests.swift in Sources */, EE9CDE9227DA05D100C4DAC8 /* APIVersionResolverTests.swift in Sources */, 015DE3A72DB29CE000DC34E8 /* SessionManagerEncryptionAtRestMigrationTests.swift in Sources */, @@ -2792,7 +2733,6 @@ 5474C80C1921309400185A3A /* MessagingTestTests.m in Sources */, EE1DEBB723D5B62C0087EE1F /* TypingUsersTests.swift in Sources */, 540A0BA51954859E00FB7D61 /* ZMSyncStrategyTests.m in Sources */, - 5E6716912174CA6700522E61 /* MockUser+LoginCredentials.swift in Sources */, F92CA9651F153622007D8570 /* CacheFileRelocatorTests.swift in Sources */, F9B71F4C1CB2B841001DB03F /* NSManagedObjectContext+TestHelpers.m in Sources */, F991CE151CB55512004D8465 /* ZMConversation+Testing.m in Sources */, @@ -2823,7 +2763,6 @@ 160C31411E6DDFC30012E4BC /* VoiceChannelV3Tests.swift in Sources */, F9ABE8561EFD56BF00D83214 /* TeamDownloadRequestStrategyTests.swift in Sources */, 87D2555921D6275800D03789 /* BuildTypeTests.swift in Sources */, - 169BA1FF25ED0DAD00374343 /* ZMUserSession+Messages.swift in Sources */, 166E47D3255EF0BE00C161C8 /* MockStrategyDirectory.swift in Sources */, EE95DECD247C0049001EA010 /* SessionManagerConfigurationTests.swift in Sources */, A938BDCA23A7966700D4C208 /* ConversationRoleDownstreamRequestStrategyTests.swift in Sources */, @@ -2853,14 +2792,12 @@ 161ACB4323F6EE4800ABFF33 /* CompanyLoginURLActionProcessorTests.swift in Sources */, 5474C80A1921309400185A3A /* MessagingTest.m in Sources */, 872C99531DB525A1006A3BDE /* CallKitManagerTests.swift in Sources */, - F16C8BC42040715800677D31 /* ZMUpdateEvent+Testing.swift in Sources */, 160195611E30C9CF00ACBFAC /* LocalNotificationDispatcherCallingTests.swift in Sources */, 6391A8012A7A529000832665 /* MLSConferenceStaleParticipantsRemoverTests.swift in Sources */, 164A55D820F4FE4A00AE62A6 /* SearchUserImageStrategyTests.swift in Sources */, 09B730961B3045E400A5CCC9 /* ProxiedRequestStatusTests.swift in Sources */, F148F66B1FBAFAF600BD6909 /* RegistrationStatusTestHelper.swift in Sources */, EFC828221FB356CE00E27E21 /* RegistrationStatusTests.swift in Sources */, - 163FB9942052EA4C00E74F83 /* OperationLoopNewRequestObserver.swift in Sources */, F9B171F81C0F00E700E6EEC6 /* ClientUpdateStatusTests.swift in Sources */, EECE27C6294362F100419A8B /* MockPushTokenService.swift in Sources */, 167BCB942603CC5B00E9D7E3 /* EventProcessorTests.swift in Sources */, @@ -2981,7 +2918,6 @@ 5458273E2541C3A9002B8F83 /* PresentationDelegate.swift in Sources */, A9B53AAA24E12E240066FCC6 /* ZMAccountDeletedReason.swift in Sources */, 54E2C1E01E682DC400536569 /* LocalNotificationDispatcher.swift in Sources */, - 879634401F7BEA4700FC79BA /* DispatchQueue+SerialAsync.swift in Sources */, F93A75F21C1F219800252586 /* ConversationStatusStrategy.swift in Sources */, 632A582025CC43DA00F0C4BD /* CallParticipantsListKind.swift in Sources */, 0678D9922C2C53D3000DF6E3 /* CRLURLBuilder.swift in Sources */, @@ -3023,7 +2959,6 @@ 1672A64523473EA100380537 /* LabelDownstreamRequestStrategy.swift in Sources */, E623B6382BD688D400F91B37 /* Caches.swift in Sources */, E6BB79542C36B36E003B821B /* NetworkState.swift in Sources */, - 546392721D79D5210094EC66 /* Application.swift in Sources */, EFC8281C1FB343B600E27E21 /* RegistationCredentialVerificationStrategy.swift in Sources */, 874A16902052BE5E001C6760 /* ZMUserSession+OpenConversation.swift in Sources */, EE1DEBC423D5F1970087EE1F /* Conversation+TypingUsers.swift in Sources */, @@ -3036,7 +2971,6 @@ 549816351A432BC800A7CE2E /* ZMLoginTranscoder.m in Sources */, 5E8BB89C2147CE1600EEA64B /* AVSCallMember.swift in Sources */, 166D18A4230EBFFA001288CD /* MediaManager.swift in Sources */, - 874F142D1C16FD9700C15118 /* Device.swift in Sources */, F19E55A422B3A740005C792D /* PKPushPayload+SafeLogging.swift in Sources */, EE1108F923D1F945005DC663 /* TypingUsersTimeout.swift in Sources */, 16C4BDA020A309CD00BCDB17 /* CallParticipantSnapshot.swift in Sources */, @@ -3044,7 +2978,6 @@ 16ED865F23E3145C00CB1766 /* ZMUserSession+Clients.swift in Sources */, 0640C26D26EA0B5C0057AF80 /* NSManagedObjectContext+Packaging.swift in Sources */, F1C51FE71FB49660009C2269 /* RegistrationStatus.swift in Sources */, - 5E8EE1FA20FDC7D700DB1F9B /* Pasteboard.swift in Sources */, 874A16922052BEC5001C6760 /* UserExpirationObserver.swift in Sources */, 8751DA061F66BFA6000D308B /* ZMUserSession+Push.swift in Sources */, EEEA75FA1F8A6142006D1070 /* ZMLocalNotification+ExpiredMessages.swift in Sources */, @@ -3053,7 +2986,6 @@ 54FF64291F73D00C00787EF2 /* NSManagedObjectContext+AuthenticationStatus.swift in Sources */, A9C02605266F5B4B002E542B /* ZMClientRegistrationStatus.swift in Sources */, BF735CFA1E70003D003BC61F /* SystemMessageCallObserver.swift in Sources */, - 1645ECF82448A0A3007A82D6 /* Decodable+JSON.swift in Sources */, 63F1DF21294B69B20061565E /* AccessTokenMigration.swift in Sources */, 165D3A211E1D43870052E654 /* VoiceChannelV3.swift in Sources */, F19F4F3A1E5F1AE400F4D8FF /* UserProfileImageUpdateStatus.swift in Sources */, @@ -3077,7 +3009,6 @@ E662328F2BF4BDB0002B680A /* ZMUserSession+CertificateRevocationLists.swift in Sources */, 547E5B581DDB4B800038D936 /* UserProfileUpdateStatus.swift in Sources */, EEEA75FC1F8A6142006D1070 /* ZMLocalNotification+Calling.swift in Sources */, - EE2DE5EC29263C5100F42F4C /* Logger.swift in Sources */, F19F1D331EFBE3FE00275E27 /* UnauthenticatedOperationLoop.swift in Sources */, 16030DC921B01B7500F8032E /* Conversation+ReadReceiptMode.swift in Sources */, F19F4F4F1E6575F700F4D8FF /* UserProfileImageOwner.swift in Sources */, @@ -3140,8 +3071,6 @@ 1660AA0D1ECDB0250056D403 /* SearchTask.swift in Sources */, E9AD0A362C2AF9B300CA88DF /* AnalyticsServiceConfiguration.swift in Sources */, 06FBF22F2CFD850700DA13EC /* UserSession+Federation.swift in Sources */, - E91180E12CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift in Sources */, - EE0CAEAF2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift in Sources */, E998FE8E2C184C9800EAA672 /* UserCredentials.swift in Sources */, 165BB94C2004D6490077EFD5 /* SessionManager+UserActivity.swift in Sources */, 165D3A151E1D3EF30052E654 /* WireCallCenterV3.swift in Sources */, @@ -3657,9 +3586,9 @@ isa = XCSwiftPackageProductDependency; productName = WireAVS; }; - 06E47CEF2E16E3A70096FEEA /* WireLogging */ = { + 06E47CEF2E16E3A70096FEEA /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 342DDD872E66B41300A94CCF /* WireNetwork */ = { isa = XCSwiftPackageProductDependency; @@ -3697,9 +3626,9 @@ isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackageSupport; }; - 59537D882CFF9E7700920B59 /* WireLogging */ = { + 59537D882CFF9E7700920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 596A19E92E9E523100E190AE /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; @@ -3718,14 +3647,18 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundationSupport; }; - 59BB29242E29527500C49DB6 /* WireLoggingSupport */ = { + 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */ = { isa = XCSwiftPackageProductDependency; - productName = WireLoggingSupport; + productName = WireLegacyLoggingSupport; }; 59C8F6512DF1BE17005AAC9D /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; + 59D8C3952EB9189200B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; CBD35F292D09EBA50080DA37 /* WireCrypto */ = { isa = XCSwiftPackageProductDependency; productName = WireCrypto; diff --git a/wire-ios-system/Source/Logging/WireLegacyLogging.swift b/wire-ios-system/Source/Logging/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios-system/Source/Logging/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj index 1c67450f2f2..e671c569208 100644 --- a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj +++ b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 013334BC2C204AB0002D97DB /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 013334BB2C204AB0002D97DB /* CocoaLumberjackSwift */; }; 591B6E8C2C8B0A37009F8A7B /* WireSystem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ECC35191AD436750089FD4B /* WireSystem.framework */; }; 591B6E8F2C8B0A3A009F8A7B /* WireSystem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ECC35191AD436750089FD4B /* WireSystem.framework */; }; - 5953781C2CFF42E900920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 5953781B2CFF42E900920B59 /* WireLogging */; }; + 5953781C2CFF42E900920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 5953781B2CFF42E900920B59 /* WireLegacyLogging */; }; 596A19E72E9E4F8700E190AE /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 596A19E62E9E4F8700E190AE /* ZIPFoundation */; }; 598E86ED2BF4DD3100FC5438 /* WireSystemSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E86D82BF4DB3700FC5438 /* WireSystemSupport.framework */; }; EE9AEC842BD1585500F7853F /* WireSystem.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC832BD1585500F7853F /* WireSystem.docc */; }; @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5953781C2CFF42E900920B59 /* WireLogging in Frameworks */, + 5953781C2CFF42E900920B59 /* WireLegacyLogging in Frameworks */, 013334BC2C204AB0002D97DB /* CocoaLumberjackSwift in Frameworks */, 596A19E72E9E4F8700E190AE /* ZIPFoundation in Frameworks */, ); @@ -190,7 +190,7 @@ name = WireSystem; packageProductDependencies = ( 013334BB2C204AB0002D97DB /* CocoaLumberjackSwift */, - 5953781B2CFF42E900920B59 /* WireLogging */, + 5953781B2CFF42E900920B59 /* WireLegacyLogging */, 596A19E62E9E4F8700E190AE /* ZIPFoundation */, ); productName = SyncEngineSystem; @@ -697,9 +697,9 @@ package = 013334BA2C204AB0002D97DB /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; productName = CocoaLumberjackSwift; }; - 5953781B2CFF42E900920B59 /* WireLogging */ = { + 5953781B2CFF42E900920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 596A19E62E9E4F8700E190AE /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios-transport/Source/Logging/WireLegacyLogging.swift b/wire-ios-transport/Source/Logging/WireLegacyLogging.swift new file mode 100644 index 00000000000..43afaedb5c8 --- /dev/null +++ b/wire-ios-transport/Source/Logging/WireLegacyLogging.swift @@ -0,0 +1,22 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger +typealias LogAttributes = WireLegacyLogging.LogAttributes diff --git a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj index d494ca7e21b..2b1de67ef3c 100644 --- a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj +++ b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 591B6E662C8B09F7009F8A7B /* WireTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E88BCA71B1F35DF00232589 /* WireTransport.framework */; }; 591B6E692C8B09FB009F8A7B /* WireTesting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE67F6ED296F074C001D7C88 /* WireTesting.framework */; }; 591B6E6C2C8B09FE009F8A7B /* WireTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E88BCA71B1F35DF00232589 /* WireTransport.framework */; }; - 59537CD92CFF7ED800920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CD82CFF7ED800920B59 /* WireLogging */; }; + 59537CD92CFF7ED800920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CD82CFF7ED800920B59 /* WireLegacyLogging */; }; 59FE6ACC2DA90CBA00DB461C /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59FE6ACB2DA90CBA00DB461C /* WireFoundation */; }; 59FE6ACE2DA90CC100DB461C /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59FE6ACD2DA90CC100DB461C /* WireFoundationSupport */; }; BF3A7A6C1D8C04550034FF40 /* WireTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E88BCA71B1F35DF00232589 /* WireTransport.framework */; }; @@ -161,7 +161,7 @@ files = ( 59FE6ACC2DA90CBA00DB461C /* WireFoundation in Frameworks */, 591B6E632C8B09F3009F8A7B /* WireUtilities.framework in Frameworks */, - 59537CD92CFF7ED800920B59 /* WireLogging in Frameworks */, + 59537CD92CFF7ED800920B59 /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -286,7 +286,7 @@ ); name = "WireTransport-ios"; packageProductDependencies = ( - 59537CD82CFF7ED800920B59 /* WireLogging */, + 59537CD82CFF7ED800920B59 /* WireLegacyLogging */, 59FE6ACB2DA90CBA00DB461C /* WireFoundation */, ); productName = Transport; @@ -810,9 +810,9 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 59537CD82CFF7ED800920B59 /* WireLogging */ = { + 59537CD82CFF7ED800920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 59FE6ACB2DA90CBA00DB461C /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios-utilities/Source/WireLegacyLogging.swift b/wire-ios-utilities/Source/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios-utilities/Source/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj b/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj index 49dd4c8a158..d4260155d7d 100644 --- a/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj +++ b/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 591B6E7C2C8B0A1E009F8A7B /* WireUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E88BD381B1F3EA300232589 /* WireUtilities.framework */; }; 591B6E7E2C8B0A23009F8A7B /* WireTesting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE98A0AD296EFBE60055E981 /* WireTesting.framework */; }; 591B6E812C8B0A27009F8A7B /* WireUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E88BD381B1F3EA300232589 /* WireUtilities.framework */; }; - 59537CD72CFF7E1400920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CD62CFF7E1400920B59 /* WireLogging */; }; + 59537CD72CFF7E1400920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CD62CFF7E1400920B59 /* WireLegacyLogging */; }; 59B48C5A2C89CB1F00EA7999 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B48C592C89CB1F00EA7999 /* WireFoundation */; }; 59D5E1212DA7D0AD004FD772 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E86B32BF4D64000FC5438 /* WireUtilitiesSupport.framework */; }; EE9AEC882BD158BC00F7853F /* WireUtilities.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC872BD158BC00F7853F /* WireUtilities.docc */; }; @@ -132,7 +132,7 @@ buildActionMask = 2147483647; files = ( 591B6E7A2C8B0A1B009F8A7B /* WireSystem.framework in Frameworks */, - 59537CD72CFF7E1400920B59 /* WireLogging in Frameworks */, + 59537CD72CFF7E1400920B59 /* WireLegacyLogging in Frameworks */, 59B48C5A2C89CB1F00EA7999 /* WireFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -256,7 +256,7 @@ name = WireUtilities; packageProductDependencies = ( 59B48C592C89CB1F00EA7999 /* WireFoundation */, - 59537CD62CFF7E1400920B59 /* WireLogging */, + 59537CD62CFF7E1400920B59 /* WireLegacyLogging */, ); productName = WireUtilities; productReference = 3E88BD381B1F3EA300232589 /* WireUtilities.framework */; @@ -807,9 +807,9 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 59537CD62CFF7E1400920B59 /* WireLogging */ = { + 59537CD62CFF7E1400920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 59B48C592C89CB1F00EA7999 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift b/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift b/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios/Wire-iOS Tests/Helpers/WireLegacyLoggingSupport.swift b/wire-ios/Wire-iOS Tests/Helpers/WireLegacyLoggingSupport.swift new file mode 100644 index 00000000000..58ed24879ac --- /dev/null +++ b/wire-ios/Wire-iOS Tests/Helpers/WireLegacyLoggingSupport.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLoggingSupport + +typealias LogFilesProvidingMock = WireLegacyLoggingSupport.LogFilesProvidingMock diff --git a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj index c9fe44e31ac..2d4c873fcdf 100644 --- a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj +++ b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj @@ -72,18 +72,18 @@ 592ED06E2C1C7D0700FE1F4E /* WireReusableUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 592ED06D2C1C7D0700FE1F4E /* WireReusableUIComponents */; }; 594341D72D08611700A6C0B5 /* WireCountly in Frameworks */ = {isa = PBXBuildFile; productRef = 594341D62D08611700A6C0B5 /* WireCountly */; }; 5945D02A2C219F7200D039E3 /* WireDesign in Frameworks */ = {isa = PBXBuildFile; productRef = 5945D0292C219F7200D039E3 /* WireDesign */; }; - 59537D8F2CFFA05600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8E2CFFA05600920B59 /* WireLogging */; }; - 59537D912CFFA0BA00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D902CFFA0BA00920B59 /* WireLogging */; }; - 59537D932CFFA0DA00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D922CFFA0DA00920B59 /* WireLogging */; }; - 59537D952CFFA11A00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D942CFFA11A00920B59 /* WireLogging */; }; + 59537D8F2CFFA05600920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8E2CFFA05600920B59 /* WireLegacyLogging */; }; + 59537D912CFFA0BA00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D902CFFA0BA00920B59 /* WireLegacyLogging */; }; + 59537D932CFFA0DA00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D922CFFA0DA00920B59 /* WireLegacyLogging */; }; + 59537D952CFFA11A00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D942CFFA11A00920B59 /* WireLegacyLogging */; }; 59592D1F2D4B9527005EDF16 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 590DCA092C971AFF002D0A2C /* WireFoundation */; }; - 59592D202D4B9527005EDF16 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59191A642D0051C7001AB388 /* WireLogging */; }; + 59592D202D4B9527005EDF16 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59191A642D0051C7001AB388 /* WireLegacyLogging */; }; 595BE7A42E32367F00ED9088 /* WireAnalyticsSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */; }; 595BE7A62E32368500ED9088 /* WireAnalyticsSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 595BE7A52E32368500ED9088 /* WireAnalyticsSupport */; }; 595C49692CA995E900F8F881 /* WireSettingsUI in Frameworks */ = {isa = PBXBuildFile; productRef = 595C49682CA995E900F8F881 /* WireSettingsUI */; }; 59703B282DD4A42000B45773 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59703B272DD4A42000B45773 /* ZIPFoundation */; }; 5972B0DB2E9EABC8005E6417 /* WireUtilitiesPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 5972B0DA2E9EABC8005E6417 /* WireUtilitiesPackage */; }; - 5977ED1F2D26747900F5C78E /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 5977ED1E2D26747900F5C78E /* WireLogging */; }; + 5977ED1F2D26747900F5C78E /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 5977ED1E2D26747900F5C78E /* WireLegacyLogging */; }; 597D9BEF2DA7DA7B000031DE /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 597D9BEE2DA7DA7B000031DE /* WireUtilitiesSupport.framework */; }; 598E86D12BF4D97800FC5438 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E86D02BF4D97800FC5438 /* WireUtilitiesSupport.framework */; }; 598E86F72BF4DD5C00FC5438 /* WireSystemSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E86F62BF4DD5C00FC5438 /* WireSystemSupport.framework */; }; @@ -100,10 +100,12 @@ 59B99FAA2C89DE8600201827 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B99FA92C89DE8600201827 /* WireFoundation */; }; 59BAEAFC2DBF483400B54AC4 /* WireBackup in Frameworks */ = {isa = PBXBuildFile; productRef = 59BAEAFB2DBF483400B54AC4 /* WireBackup */; }; 59C4FBF12C45B7130037030B /* WireShareEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE33C48C296485FA00C058D1 /* WireShareEngine.framework */; }; - 59C951C22E2B67E3002C0A3E /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59C951C12E2B67E3002C0A3E /* WireLoggingSupport */; }; - 59C951C42E2B67E8002C0A3E /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59C951C32E2B67E8002C0A3E /* WireLoggingSupport */; }; + 59C951C22E2B67E3002C0A3E /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59C951C12E2B67E3002C0A3E /* WireLegacyLoggingSupport */; }; + 59C951C42E2B67E8002C0A3E /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59C951C32E2B67E8002C0A3E /* WireLegacyLoggingSupport */; }; 59CDB3F62C4EA08F0049D1AB /* WireReusableUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 59CDB3F52C4EA08F0049D1AB /* WireReusableUIComponents */; }; 59D038272C85D31E009FE583 /* WireMainNavigationUI in Frameworks */ = {isa = PBXBuildFile; productRef = 59D038262C85D31E009FE583 /* WireMainNavigationUI */; }; + 59D8C38F2EB9159E00B8E622 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59D8C38E2EB9159E00B8E622 /* WireLoggingSupport */; }; + 59D8C3912EB915A500B8E622 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59D8C3902EB915A500B8E622 /* WireLoggingSupport */; }; 76ACF8A22D4215E2001F48A1 /* WireViewsDebugUI in Frameworks */ = {isa = PBXBuildFile; productRef = 76ACF8A12D4215E2001F48A1 /* WireViewsDebugUI */; }; 76D15E712CEFAE8A0059215D /* WireIndividualToTeamMigrationUI in Frameworks */ = {isa = PBXBuildFile; productRef = 76D15E702CEFAE8A0059215D /* WireIndividualToTeamMigrationUI */; }; 76ED41EC2E053E3200A286F4 /* WireNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = 76ED41EB2E053E3200A286F4 /* WireNetwork */; }; @@ -490,6 +492,7 @@ isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Logger.swift, + WireLegacyLogging.swift, ); target = BACB88501AF7C48900DDCDB0 /* Wire-iOS-Tests */; }; @@ -699,6 +702,7 @@ GroupParticipantsDetailViewControllerSnapshotTests.swift, Helpers/MockSystemSaveFilePresenter.swift, Helpers/SaveFileManagerTests.swift, + Helpers/WireLegacyLoggingSupport.swift, "Helpers/XCTestCase+Extensions.swift", IconLabelButtonTests.swift, ImageCache/DecodeImageOperationTests.swift, @@ -917,7 +921,7 @@ 346C75612E74727000800769 /* WireFoundation in Frameworks */, 591B6E212C8B096C009F8A7B /* WireCommonComponents.framework in Frameworks */, 3431F08B2E795BD0007BA692 /* WireNetwork in Frameworks */, - 59537D912CFFA0BA00920B59 /* WireLogging in Frameworks */, + 59537D912CFFA0BA00920B59 /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -930,7 +934,7 @@ 591B6E192C8B0960009F8A7B /* WireCommonComponents.framework in Frameworks */, 59C4FBF12C45B7130037030B /* WireShareEngine.framework in Frameworks */, 346C755F2E74726600800769 /* WireFoundation in Frameworks */, - 59537D932CFFA0DA00920B59 /* WireLogging in Frameworks */, + 59537D932CFFA0DA00920B59 /* WireLegacyLogging in Frameworks */, 59CDB3F62C4EA08F0049D1AB /* WireReusableUIComponents in Frameworks */, 5945D02A2C219F7200D039E3 /* WireDesign in Frameworks */, ); @@ -973,7 +977,7 @@ 407831AD2AC4636F005C2978 /* DifferenceKit in Frameworks */, EEE25B4429719C950008B894 /* WireSystem.framework in Frameworks */, 76ACF8A22D4215E2001F48A1 /* WireViewsDebugUI in Frameworks */, - 59537D952CFFA11A00920B59 /* WireLogging in Frameworks */, + 59537D952CFFA11A00920B59 /* WireLegacyLogging in Frameworks */, 5972B0DB2E9EABC8005E6417 /* WireUtilitiesPackage in Frameworks */, E9FBF3A62C47C23100C65DA8 /* FLAnimatedImage in Frameworks */, E40050762D71A80100B7962B /* WireMessagingUI in Frameworks */, @@ -995,7 +999,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 59592D202D4B9527005EDF16 /* WireLogging in Frameworks */, + 59592D202D4B9527005EDF16 /* WireLegacyLogging in Frameworks */, 59592D1F2D4B9527005EDF16 /* WireFoundation in Frameworks */, 59B48C622C89CD3D00EA7999 /* WireTestingPackage in Frameworks */, 01C1A7C72A54C45A0058D578 /* SnapshotTesting in Frameworks */, @@ -1007,9 +1011,10 @@ 598E86F72BF4DD5C00FC5438 /* WireSystemSupport.framework in Frameworks */, 76EF74902E9E6380006A1579 /* WireLocators in Frameworks */, 598E86D12BF4D97800FC5438 /* WireUtilitiesSupport.framework in Frameworks */, - 59C951C22E2B67E3002C0A3E /* WireLoggingSupport in Frameworks */, + 59C951C22E2B67E3002C0A3E /* WireLegacyLoggingSupport in Frameworks */, 591B6E1C2C8B0964009F8A7B /* WireDataModelSupport.framework in Frameworks */, 595BE7A42E32367F00ED9088 /* WireAnalyticsSupport in Frameworks */, + 59D8C38F2EB9159E00B8E622 /* WireLoggingSupport in Frameworks */, 5996E8AD2C19D0DF007A52F0 /* WireTesting.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1019,9 +1024,10 @@ buildActionMask = 2147483647; files = ( 59AADE272BB429B200D9E658 /* WireRequestStrategySupport.framework in Frameworks */, - 59C951C42E2B67E8002C0A3E /* WireLoggingSupport in Frameworks */, + 59D8C3912EB915A500B8E622 /* WireLoggingSupport in Frameworks */, + 59C951C42E2B67E8002C0A3E /* WireLegacyLoggingSupport in Frameworks */, 5996E8AA2C19D0D6007A52F0 /* WireSystemSupport.framework in Frameworks */, - 5977ED1F2D26747900F5C78E /* WireLogging in Frameworks */, + 5977ED1F2D26747900F5C78E /* WireLegacyLogging in Frameworks */, 3438C55B2E5C51A700D6FB5C /* WireNetwork in Frameworks */, 595BE7A62E32368500ED9088 /* WireAnalyticsSupport in Frameworks */, 597D9BEF2DA7DA7B000031DE /* WireUtilitiesSupport.framework in Frameworks */, @@ -1037,7 +1043,7 @@ buildActionMask = 2147483647; files = ( E985CB8F2CEB4FCB0075DAD6 /* WireDatadog in Frameworks */, - 59537D8F2CFFA05600920B59 /* WireLogging in Frameworks */, + 59537D8F2CFFA05600920B59 /* WireLegacyLogging in Frameworks */, E9816C902CC9244700D77F22 /* WireSyncEngine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1321,7 +1327,7 @@ packageProductDependencies = ( 5945D0292C219F7200D039E3 /* WireDesign */, 59CDB3F52C4EA08F0049D1AB /* WireReusableUIComponents */, - 59537D922CFFA0DA00920B59 /* WireLogging */, + 59537D922CFFA0DA00920B59 /* WireLegacyLogging */, E489D8302DF709CE008966AE /* WireMultiBackendUI */, 34C5F1492E58AE0800C0FF34 /* WireNetwork */, 346C755E2E74726600800769 /* WireFoundation */, @@ -1373,7 +1379,7 @@ 590DCA072C971A56002D0A2C /* WireSidebarUI */, CB43D9BC2CDBBBB900BF5AEB /* WireFolderPickerUI */, E9BA75C52CD51DF100F6EDDF /* WireMoveToFolderUI */, - 59537D942CFFA11A00920B59 /* WireLogging */, + 59537D942CFFA11A00920B59 /* WireLegacyLogging */, 76D15E702CEFAE8A0059215D /* WireIndividualToTeamMigrationUI */, 594341D62D08611700A6C0B5 /* WireCountly */, 0619A95B2D3FE78700876BDE /* WireAuthenticationUI */, @@ -1421,11 +1427,12 @@ 59B48C612C89CD3D00EA7999 /* WireTestingPackage */, 590DCA092C971AFF002D0A2C /* WireFoundation */, 59B7684A2D2D5A17007B5F1E /* WireFoundationSupport */, - 59191A642D0051C7001AB388 /* WireLogging */, - 59C951C12E2B67E3002C0A3E /* WireLoggingSupport */, + 59191A642D0051C7001AB388 /* WireLegacyLogging */, + 59C951C12E2B67E3002C0A3E /* WireLegacyLoggingSupport */, 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */, 3438C5582E5C518900D6FB5C /* WireNetwork */, 76EF748F2E9E6380006A1579 /* WireLocators */, + 59D8C38E2EB9159E00B8E622 /* WireLoggingSupport */, ); productName = "ZClient-iOS Tests"; productReference = BACB88511AF7C48900DDCDB0 /* Wire-iOS-Tests.xctest */; @@ -1450,10 +1457,11 @@ ); name = "Wire-iOS UnitTests"; packageProductDependencies = ( - 5977ED1E2D26747900F5C78E /* WireLogging */, - 59C951C32E2B67E8002C0A3E /* WireLoggingSupport */, + 5977ED1E2D26747900F5C78E /* WireLegacyLogging */, + 59C951C32E2B67E8002C0A3E /* WireLegacyLoggingSupport */, 595BE7A52E32368500ED9088 /* WireAnalyticsSupport */, 3438C55A2E5C51A700D6FB5C /* WireNetwork */, + 59D8C3902EB915A500B8E622 /* WireLoggingSupport */, ); productName = "Wire-iOS UnitTests"; productReference = E6579E362AFF9B30004E7FD8 /* Wire-iOS UnitTests.xctest */; @@ -1476,7 +1484,7 @@ name = WireCommonComponents; packageProductDependencies = ( 016A141C2CE6BFC4006A7EF5 /* WireDatadog */, - 59537D8E2CFFA05600920B59 /* WireLogging */, + 59537D8E2CFFA05600920B59 /* WireLegacyLogging */, ); productName = WireCommonComponents; productReference = F1FEA14A21DCEB1700790A54 /* WireCommonComponents.framework */; @@ -2894,9 +2902,9 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; - 59191A642D0051C7001AB388 /* WireLogging */ = { + 59191A642D0051C7001AB388 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 5929CB212CA6C9C800070488 /* WireConversationListUI */ = { isa = XCSwiftPackageProductDependency; @@ -2914,21 +2922,21 @@ isa = XCSwiftPackageProductDependency; productName = WireDesign; }; - 59537D8E2CFFA05600920B59 /* WireLogging */ = { + 59537D8E2CFFA05600920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; - 59537D902CFFA0BA00920B59 /* WireLogging */ = { + 59537D902CFFA0BA00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; - 59537D922CFFA0DA00920B59 /* WireLogging */ = { + 59537D922CFFA0DA00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; - 59537D942CFFA11A00920B59 /* WireLogging */ = { + 59537D942CFFA11A00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */ = { isa = XCSwiftPackageProductDependency; @@ -2951,9 +2959,9 @@ isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackage; }; - 5977ED1E2D26747900F5C78E /* WireLogging */ = { + 5977ED1E2D26747900F5C78E /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 59B48C612C89CD3D00EA7999 /* WireTestingPackage */ = { isa = XCSwiftPackageProductDependency; @@ -2975,13 +2983,13 @@ isa = XCSwiftPackageProductDependency; productName = WireBackup; }; - 59C951C12E2B67E3002C0A3E /* WireLoggingSupport */ = { + 59C951C12E2B67E3002C0A3E /* WireLegacyLoggingSupport */ = { isa = XCSwiftPackageProductDependency; - productName = WireLoggingSupport; + productName = WireLegacyLoggingSupport; }; - 59C951C32E2B67E8002C0A3E /* WireLoggingSupport */ = { + 59C951C32E2B67E8002C0A3E /* WireLegacyLoggingSupport */ = { isa = XCSwiftPackageProductDependency; - productName = WireLoggingSupport; + productName = WireLegacyLoggingSupport; }; 59CDB3F52C4EA08F0049D1AB /* WireReusableUIComponents */ = { isa = XCSwiftPackageProductDependency; @@ -2991,6 +2999,14 @@ isa = XCSwiftPackageProductDependency; productName = WireMainNavigationUI; }; + 59D8C38E2EB9159E00B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; + 59D8C3902EB915A500B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; 76ACF8A12D4215E2001F48A1 /* WireViewsDebugUI */ = { isa = XCSwiftPackageProductDependency; productName = WireViewsDebugUI; diff --git a/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift b/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift new file mode 100644 index 00000000000..1475379c0b7 --- /dev/null +++ b/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +typealias Flow = WireLegacyLogging.Flow +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias LoggerProtocol = WireLegacyLogging.LoggerProtocol +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios/WireCommonComponents/WireLegacyLogging.swift b/wire-ios/WireCommonComponents/WireLegacyLogging.swift new file mode 100644 index 00000000000..2bea1893c08 --- /dev/null +++ b/wire-ios/WireCommonComponents/WireLegacyLogging.swift @@ -0,0 +1,28 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import WireLegacyLogging + +public typealias LogAttributes = WireLegacyLogging.LogAttributes +public typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +public typealias LogConvertible = WireLegacyLogging.LogConvertible +public typealias LogTarget = WireLegacyLogging.LogTarget + +typealias LoggerProtocol = WireLegacyLogging.LoggerProtocol +typealias SystemLogger = WireLegacyLogging.SystemLogger +typealias WireLogger = WireLegacyLogging.WireLogger