From 02bf0b5e705aa47abfc5f006eecee495d8f6cbd3 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Thu, 30 Oct 2025 13:58:02 +0100 Subject: [PATCH 01/37] chore: rename WireLogging to WireLegacyLogging - WPB-14876 --- WireAnalytics/Package.swift | 15 ++++-- .../WireAnalytics/WireLegacyLogging.swift | 21 ++++++++ .../Sources/WireDatadog/WireDatadog.swift | 2 +- .../WireDatadog/WireLegacyLogging.swift | 22 ++++++++ WireAuthentication/Package.swift | 3 +- .../WireLegacyLogging.swift | 21 ++++++++ .../WireLegacyLogging.swift | 21 ++++++++ WireBackup/Package.swift | 1 + .../WireBackup/WireLegacyLogging.swift | 22 ++++++++ WireCalling/Package.swift | 6 ++- WireDomain/Package.swift | 1 + .../Synchronization/IncrementalSyncV2.swift | 2 +- .../PullPendingUpdateEventsV2Sync.swift | 2 +- .../WireDomain/WireLegacyLogging.swift | 24 +++++++++ .../project.pbxproj | 7 +++ WireLogging/Package.swift | 20 +++++-- .../AggregatedLogger.swift | 1 + .../Flow.swift | 0 .../LogAttributes.swift | 6 +++ .../LogConvertible.swift | 0 .../LogFilesProviding.swift | 0 .../LogTarget.swift | 0 .../LoggerProtocol.swift | 5 +- .../Network/RequestLog.swift | 0 .../Network/ResponseLog.swift | 0 .../SystemLogger.swift | 1 + .../WireLogMessage/WireLogLevel.swift | 0 .../WireLogger+Instances.swift | 1 + .../WireLogger+MessageTime.swift | 0 .../WireLogger.swift | 0 .../Sourcery/AutoMockable.stencil | 1 + .../Sourcery/sourcery.yml | 8 +++ .../WireLegacyLogging.swift | 21 ++++++++ .../WireLogging/WireLoggingPlaceholder.swift | 17 ++++++ .../WireLoggingSupport/Sourcery/sourcery.yml | 2 +- .../Tests/TestPlans/AllTests.xctestplan | 8 +-- .../WireLoggingTestsPlaceholder.swift | 17 ++++++ WireMessaging/Package.swift | 4 +- .../WireLegacyLogging.swift | 21 ++++++++ WireNetwork/Package.swift | 1 + .../WireNetwork/WireLegacyLogging.swift | 21 ++++++++ WireUI/Package.swift | 1 + .../WireSettingsUI/WireLegacyLogging.swift | 24 +++++++++ fastlane/framework.rb | 2 +- .../Source/Utilis/WireLegacyLogger.swift | 23 ++++++++ .../Source/WireLegacyLogging.swift | 23 ++++++++ .../WireDataModel.xcodeproj/project.pbxproj | 11 ++++ .../xcshareddata/swiftpm/Package.resolved | 8 +-- .../xcschemes/WireLoggingAll.xcscheme | 54 ++++++++++++++++--- .../Sources/WireLegacyLogging.swift | 21 ++++++++ .../project.pbxproj | 6 +++ .../Sources/Helpers/WireLegacyLogging.swift | 24 +++++++++ .../Sources/WireLegacyLogging.swift | 22 ++++++++ .../project.pbxproj | 11 ++++ .../Sources/WireLegacyLogging.swift | 21 ++++++++ .../WireShareEngine.xcodeproj/project.pbxproj | 6 +++ .../Source/Utility/WireLegacyLogging.swift | 21 ++++++++ .../Source/WireLegacyLogging.swift | 21 ++++++++ .../WireSyncEngine.xcodeproj/project.pbxproj | 11 ++++ .../Source/Logging/WireLegacyLogging.swift | 21 ++++++++ .../WireSystem.xcodeproj/project.pbxproj | 7 +++ .../Source/Logging/WireLegacyLogging.swift | 22 ++++++++ .../WireTransport.xcodeproj/project.pbxproj | 7 +++ .../Source/WireLegacyLogging.swift | 21 ++++++++ .../WireUtilities.xcodeproj/project.pbxproj | 7 +++ .../WireLegacyLogging.swift | 21 ++++++++ .../WireLegacyLogging.swift | 21 ++++++++ .../SettingsDebugReportViewModelTests.swift | 2 +- wire-ios/Wire-iOS.xcodeproj/project.pbxproj | 41 ++++++++++++++ .../Sources/Helpers/WireLegacyLogging.swift | 24 +++++++++ .../WireLegacyLogging.swift | 28 ++++++++++ 71 files changed, 823 insertions(+), 34 deletions(-) create mode 100644 WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift create mode 100644 WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift create mode 100644 WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift create mode 100644 WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift create mode 100644 WireBackup/Sources/WireBackup/WireLegacyLogging.swift create mode 100644 WireDomain/Sources/WireDomain/WireLegacyLogging.swift rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/AggregatedLogger.swift (99%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/Flow.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/LogAttributes.swift (99%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/LogConvertible.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/LogFilesProviding.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/LogTarget.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/LoggerProtocol.swift (94%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/Network/RequestLog.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/Network/ResponseLog.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/SystemLogger.swift (99%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/WireLogMessage/WireLogLevel.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/WireLogger+Instances.swift (99%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/WireLogger+MessageTime.swift (100%) rename WireLogging/Sources/{WireLogging => WireLegacyLogging}/WireLogger.swift (100%) create mode 120000 WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/AutoMockable.stencil create mode 100644 WireLogging/Sources/WireLegacyLoggingSupport/Sourcery/sourcery.yml create mode 100644 WireLogging/Sources/WireLegacyLoggingSupport/WireLegacyLogging.swift create mode 100644 WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift create mode 100644 WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift create mode 100644 WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift create mode 100644 WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift create mode 100644 WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift create mode 100644 wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift create mode 100644 wire-ios-data-model/Source/WireLegacyLogging.swift rename WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme => wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme (52%) create mode 100644 wire-ios-notification-engine/Sources/WireLegacyLogging.swift create mode 100644 wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift create mode 100644 wire-ios-request-strategy/Sources/WireLegacyLogging.swift create mode 100644 wire-ios-share-engine/Sources/WireLegacyLogging.swift create mode 100644 wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift create mode 100644 wire-ios-sync-engine/Source/WireLegacyLogging.swift create mode 100644 wire-ios-system/Source/Logging/WireLegacyLogging.swift create mode 100644 wire-ios-transport/Source/Logging/WireLegacyLogging.swift create mode 100644 wire-ios-utilities/Source/WireLegacyLogging.swift create mode 100644 wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift create mode 100644 wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift create mode 100644 wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift create mode 100644 wire-ios/WireCommonComponents/WireLegacyLogging.swift diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 1144db07581..32ab54958ff 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -26,7 +26,11 @@ let package = Package( targets: [ .target( name: "WireAnalytics", - dependencies: ["WireFoundation", "WireLogging"] + dependencies: [ + "WireFoundation", + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") + ] ), .target( name: "WireAnalyticsSupport", @@ -46,7 +50,10 @@ let package = Package( .target( name: "WireDatadog", - dependencies: datadogDependencies() + ["WireLogging"], + dependencies: datadogDependencies() + [ + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") + ], sources: datadogFiles() ), @@ -97,9 +104,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/WireDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift index 95a36ca274a..2d1f18207e8 100644 --- a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift @@ -26,7 +26,7 @@ import DatadogLogs import DatadogRUM import DatadogTrace import UIKit - +x public final class WireDatadog { private let applicationID: String diff --git a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift new file mode 100644 index 00000000000..aabce498dc4 --- /dev/null +++ b/WireAnalytics/Sources/WireDatadog/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 WireLogLevel = WireLegacyLogging.WireLogLevel diff --git a/WireAuthentication/Package.swift b/WireAuthentication/Package.swift index 4c70e12f416..23111b19bd3 100644 --- a/WireAuthentication/Package.swift +++ b/WireAuthentication/Package.swift @@ -21,7 +21,7 @@ let package = Package( .package(path: "../WireUI"), .package(path: "../WirePlugins"), .package(url: "https://github.com/uber/needle.git", .upToNextMinor(from: "0.25.1")), - .package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0") + .package(url: "https://github.com/siteline/swiftui-introspect", from: "26.0.0"), ], targets: [ .target( @@ -64,6 +64,7 @@ let package = Package( 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 577cf76ce4e..d751deed767 100644 --- a/WireCalling/Package.swift +++ b/WireCalling/Package.swift @@ -24,7 +24,8 @@ let package = Package( name: "WireCallingDomain", dependencies: [ "WireFoundation", - "WireLogging" + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -39,7 +40,8 @@ let package = Package( name: "WireCallingData", dependencies: [ "WireCallingDomain", - "WireLogging" + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( diff --git a/WireDomain/Package.swift b/WireDomain/Package.swift index eb827bdb2c2..8d917141070 100644 --- a/WireDomain/Package.swift +++ b/WireDomain/Package.swift @@ -24,6 +24,7 @@ let package = Package( 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 4be85ae494d..22fe64ec1c0 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 902ebae7539..4621c18b5e7 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 c341a00794f..9fc638294f4 100644 --- a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj +++ b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */; }; 591B6E472C8B09BD009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01BDA5442C20762200636E50 /* WireDataModelSupport.framework */; }; 59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59202AD12D54D3D500143413 /* WireDomainPackage */; }; + 596A633C2EB3B2800017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A633B2EB3B2800017C3CA /* WireLegacyLogging */; }; 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 */; }; @@ -96,6 +97,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A633C2EB3B2800017C3CA /* WireLegacyLogging in Frameworks */, 598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */, 34DC44B32E01C206004D5DD5 /* WireNetwork in Frameworks */, CB6343F02DB7EF3D00A1C892 /* WireUpdateEventCoding in Frameworks */, @@ -227,6 +229,7 @@ C91D188D2D7212FC00B63B66 /* NeedleFoundation */, CB6343EF2DB7EF3D00A1C892 /* WireUpdateEventCoding */, 34DC44B22E01C206004D5DD5 /* WireNetwork */, + 596A633B2EB3B2800017C3CA /* WireLegacyLogging */, ); productName = WireDomain; productReference = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; @@ -801,6 +804,10 @@ isa = XCSwiftPackageProductDependency; productName = WireDomainPackage; }; + 596A633B2EB3B2800017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 598D042C2C89C63100B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index d65eaa8998d..522ad50757c 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -7,9 +7,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: [ @@ -17,11 +20,22 @@ 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") + ] ) ] ) 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 d7b33e757ef..584fa2dfdf6 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 46156742f9c..d33e973b788 100644 --- a/WireLogging/Sources/WireLogging/LogAttributes.swift +++ b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift @@ -50,14 +50,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 01e1004dc1f..51bb3dcdcf7 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 7484890299d..e7774ea7ed1 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/WireLogMessage/WireLogLevel.swift b/WireLogging/Sources/WireLegacyLogging/WireLogMessage/WireLogLevel.swift similarity index 100% rename from WireLogging/Sources/WireLogging/WireLogMessage/WireLogLevel.swift rename to WireLogging/Sources/WireLegacyLogging/WireLogMessage/WireLogLevel.swift diff --git a/WireLogging/Sources/WireLogging/WireLogger+Instances.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift similarity index 99% rename from WireLogging/Sources/WireLogging/WireLogger+Instances.swift rename to WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift index 8dfe17ab0ab..56b72febcca 100644 --- a/WireLogging/Sources/WireLogging/WireLogger+Instances.swift +++ b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift @@ -66,4 +66,5 @@ public extension WireLogger { static let supportedProtocols = WireLogger(tag: "supported-protocols") static let search = WireLogger(tag: "search") static let wireCells = WireLogger(tag: "wire-cells") + } 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/WireLogging/WireLoggingPlaceholder.swift b/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift new file mode 100644 index 00000000000..89c90917712 --- /dev/null +++ b/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift @@ -0,0 +1,17 @@ +// +// 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/. +// diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml index da40542bbce..408bf4aa4c3 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"] + autoMockablePublicImports: ["Foundation"] diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index ac2c1a8e298..a7a5aa8b594 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,20 +1,20 @@ { "configurations" : [ { - "id" : "8C7B2297-3D36-4CFC-9B55-BF2CC1C85BF4", - "name" : "Configuration 1", + "id" : "4D5F2F6E-3C6F-4ED2-AAD7-132E9DA30D40", + "name" : "Test Scheme Action", "options" : { } } ], "defaultOptions" : { - + "performanceAntipatternCheckerEnabled" : true }, "testTargets" : [ { "target" : { - "containerPath" : "container:", + "containerPath" : "container:WireLogging", "identifier" : "WireLoggingTests", "name" : "WireLoggingTests" } diff --git a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift new file mode 100644 index 00000000000..89c90917712 --- /dev/null +++ b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift @@ -0,0 +1,17 @@ +// +// 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/. +// diff --git a/WireMessaging/Package.swift b/WireMessaging/Package.swift index bd1ed4e903c..b34889d26b1 100644 --- a/WireMessaging/Package.swift +++ b/WireMessaging/Package.swift @@ -29,7 +29,8 @@ let package = Package( dependencies: [ .product(name: "CellsSDK", package: "cells-sdk-swift"), "WireFoundation", - "WireLogging" + "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -38,6 +39,7 @@ let package = Package( "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 30fa2ca104b..0cffd480124 100644 --- a/WireNetwork/Package.swift +++ b/WireNetwork/Package.swift @@ -22,6 +22,7 @@ let package = Package( dependencies: [ "WireFoundation", "WireLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "WireCrypto", package: "WireFoundation") ] ), 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 5d32ba9f39d..9802dfcb818 100644 --- a/WireUI/Package.swift +++ b/WireUI/Package.swift @@ -117,6 +117,7 @@ let package = Package( .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/fastlane/framework.rb b/fastlane/framework.rb index 8362d19b819..0890b01ccdb 100644 --- a/fastlane/framework.rb +++ b/fastlane/framework.rb @@ -176,7 +176,7 @@ def to_scheme(name) when "WireAnalytics" "WireAnalyticsAll" # if a package has multiple targets, fastlane does not found -Package when "WireLogging" - "WireLogging" + "WireLoggingAll" # if a package has multiple targets, fastlane does not find -Package when "wire-ios-mocktransport" "WireMockTransport" else diff --git a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift new file mode 100644 index 00000000000..eb3a55fb2da --- /dev/null +++ b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift @@ -0,0 +1,23 @@ +// +// Wire +// Copyright (C) 2024 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 +public typealias LogAttributes = WireLegacyLogging.LogAttributes +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey diff --git a/wire-ios-data-model/Source/WireLegacyLogging.swift b/wire-ios-data-model/Source/WireLegacyLogging.swift new file mode 100644 index 00000000000..26f48625fd0 --- /dev/null +++ b/wire-ios-data-model/Source/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 WireLogger = WireLegacyLogging.WireLogger +public typealias LogAttributes = WireLegacyLogging.LogAttributes +public typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 43e34c823b0..5867e81507c 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -258,6 +258,7 @@ 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; }; 5966D8342BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */; }; 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */; }; + 596A633E2EB3B2860017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A633D2EB3B2860017C3CA /* WireLegacyLogging */; }; 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 */; }; @@ -271,6 +272,7 @@ 599EA3D72C247A6B009319D4 /* FilterableConversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3D62C247A6B009319D4 /* FilterableConversation.swift */; }; 599EA3D92C247ABF009319D4 /* ZMFilterableConversationAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3D82C247ABF009319D4 /* ZMFilterableConversationAdapter.swift */; }; 599EA3DB2C2485AE009319D4 /* FilterableConversationParticipant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3DA2C2485AE009319D4 /* FilterableConversationParticipant.swift */; }; + 59A09F092EB3BA3300CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */; }; 59AAB6492AFCF541005B39E6 /* MessageProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */; }; 59B48C5C2C89CBBD00EA7999 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B48C5B2C89CBBD00EA7999 /* WireFoundation */; }; 59BAE1102C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */; }; @@ -1037,6 +1039,7 @@ 599EA3D62C247A6B009319D4 /* FilterableConversation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterableConversation.swift; sourceTree = ""; }; 599EA3D82C247ABF009319D4 /* ZMFilterableConversationAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMFilterableConversationAdapter.swift; sourceTree = ""; }; 599EA3DA2C2485AE009319D4 /* FilterableConversationParticipant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterableConversationParticipant.swift; sourceTree = ""; }; + 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageProtocolTests.swift; sourceTree = ""; }; 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterConversationsUseCaseTests.swift; sourceTree = ""; }; 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1646,6 +1649,7 @@ EE8DA9672954A02B00F58B79 /* WireCryptobox.framework in Frameworks */, CBD35F2C2D09EBB20080DA37 /* WireCrypto in Frameworks */, 1657FA9A2D9C2EB800A7B337 /* WireCoreCryptoUniffi in Frameworks */, + 596A633E2EB3B2860017C3CA /* WireLegacyLogging in Frameworks */, 591B6E4C2C8B09C6009F8A7B /* CoreData.framework in Frameworks */, EE8DA96D2954A03800F58B79 /* WireLinkPreview.framework in Frameworks */, 5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */, @@ -3002,6 +3006,7 @@ F9C9A7371CAE6D890039E10C /* ConversationList */, 599EA3D12C246897009319D4 /* ConversationSearch */, F9C9A6A01CAD7C7F0039E10C /* Public */, + 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */, ); path = Source; sourceTree = ""; @@ -3307,6 +3312,7 @@ 59506A872E2E61BD0051B07A /* SwiftProtobuf */, 5950B0342E2EA1070051B07A /* GenericMessageProtocol */, CBB648A42E33D18900FA52AA /* WireData */, + 596A633D2EB3B2860017C3CA /* WireLegacyLogging */, ); productName = WireDataModel; productReference = F9C9A4FC1CAD5DF10039E10C /* WireDataModel.framework */; @@ -3556,6 +3562,7 @@ F9A706AE1CAEE01D00C2F5FE /* SetSnapshot.swift in Sources */, 162A81DD202DA4BC00F6200C /* AssetCache.swift in Sources */, EE9AEC822BD1570E00F7853F /* WireDataModel.docc in Sources */, + 59A09F092EB3BA3300CE0458 /* WireLegacyLogging.swift in Sources */, 599EA3D92C247ABF009319D4 /* ZMFilterableConversationAdapter.swift in Sources */, 638805652410FE920043B641 /* ButtonState.swift in Sources */, 63B1335A29A503D100009D84 /* MLSActionExecutor.swift in Sources */, @@ -4585,6 +4592,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A633D2EB3B2860017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 5978BFD32E2E6132004778CC /* SwiftProtobuf */ = { isa = XCSwiftPackageProductDependency; package = 5978BFD22E2E6132004778CC /* XCRemoteSwiftPackageReference "swift-protobuf" */; diff --git a/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved b/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved index 09a6e9e494e..7c4b6c95cd9 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -204,8 +204,8 @@ "repositoryURL": "https://github.com/swiftlang/swift-docc-plugin", "state": { "branch": null, - "revision": "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", - "version": "1.4.3" + "revision": "3e4f133a77e644a5812911a0513aeb7288b07d06", + "version": "1.4.5" } }, { @@ -258,8 +258,8 @@ "repositoryURL": "https://github.com/siteline/swiftui-introspect", "state": { "branch": null, - "revision": "807f73ce09a9b9723f12385e592b4e0aaebd3336", - "version": "1.3.0" + "revision": "a08b87f96b41055577721a6e397562b21ad52454", + "version": "26.0.0" } }, { diff --git a/WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme similarity index 52% rename from WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme rename to wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index 6b7d5c03bed..884fb65efee 100644 --- a/WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -1,12 +1,26 @@ + + + + + ReferencedContainer = "container:WireLogging"> + + + + @@ -30,10 +58,22 @@ shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + + + BlueprintIdentifier = "WireLegacyLogging" + BuildableName = "WireLegacyLogging" + BlueprintName = "WireLegacyLogging" + ReferencedContainer = "container:WireLogging"> diff --git a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift new file mode 100644 index 00000000000..bea411fb92d --- /dev/null +++ b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2024 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-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index e4a110fae4f..670c65771f9 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 591B6E2C2C8B0983009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */; }; 591B6E2F2C8B0988009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEC80B5629B6054A00099727 /* WireMockTransport.framework */; }; 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLogging */; }; + 596A63342EB3B26B0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63332EB3B26B0017C3CA /* WireLegacyLogging */; }; 630A582D29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */; }; EE0BA28A29D59B1D004E93B5 /* NotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */; }; EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */; }; @@ -114,6 +115,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A63342EB3B26B0017C3CA /* WireLegacyLogging in Frameworks */, 06DE7ABF2DE4E39200D79D99 /* WireFoundation in Frameworks */, 06DE7AB72DE4D8A100D79D99 /* WireDomain.framework in Frameworks */, 3431F0892E795B90007BA692 /* WireNetwork in Frameworks */, @@ -830,6 +832,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A63332EB3B26B0017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 0660428C247FE76A00A5F161 /* Project object */; 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..029247eb5c4 --- /dev/null +++ b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift @@ -0,0 +1,24 @@ +// +// Wire +// Copyright (C) 2024 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/Sources/WireLegacyLogging.swift b/wire-ios-request-strategy/Sources/WireLegacyLogging.swift new file mode 100644 index 00000000000..bb51cf1b382 --- /dev/null +++ b/wire-ios-request-strategy/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/. +// + +public import WireLegacyLogging + +public typealias Flow = WireLegacyLogging.Flow +public 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 fabffaa524e..fc97e122da2 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -195,11 +195,13 @@ 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 */; }; + 596A633A2EB3B27A0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63392EB3B27A0017C3CA /* 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 */; }; 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04322C89C6CF00B64D71 /* WireFoundation */; }; 598E870D2BF4E08100FC5438 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */; }; + 59A09F0B2EB3BB0B00CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */; }; 59D398D22D5525DB001C9C5F /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59D398D12D5525DB001C9C5F /* WireTestingPackage */; }; 5E68F22722452CDC00298376 /* LinkPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */; }; 5E9EA4DE2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */; }; @@ -703,6 +705,7 @@ 597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandler.swift; sourceTree = ""; }; 597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandlerTests.swift; sourceTree = ""; }; 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C3112B1DF3AD0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreprocessor.swift; sourceTree = ""; }; 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkAttachmentsPreprocessor.swift; sourceTree = ""; }; @@ -971,6 +974,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A633A2EB3B27A0017C3CA /* WireLegacyLogging in Frameworks */, 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */, 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */, 591B6E3B2C8B09AA009F8A7B /* WireDataModel.framework in Frameworks */, @@ -1357,6 +1361,7 @@ E69A021F2B85095F00126FF6 /* Services */, 06474D4824AF6825002C695D /* Synchronization */, 1669016D1D707509000FE4AF /* WireRequestStrategy.h */, + 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */, ); path = Sources; sourceTree = ""; @@ -2197,6 +2202,7 @@ packageProductDependencies = ( 598D04322C89C6CF00B64D71 /* WireFoundation */, 59537D842CFF9D1600920B59 /* WireLogging */, + 596A63392EB3B27A0017C3CA /* WireLegacyLogging */, ); productName = WireRequestStrategy; productReference = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; @@ -2516,6 +2522,7 @@ 633B396A2891890600208124 /* ZMUpdateEvent+Decryption.swift in Sources */, 06474D4B24AF6858002C695D /* EventDecoder.swift in Sources */, 064824982B10E32C00115329 /* EnrollE2EICertificateUseCase.swift in Sources */, + 59A09F0B2EB3BB0B00CE0458 /* WireLegacyLogging.swift in Sources */, E629E3BC2B4704B200D526AD /* Payload+ConversationEvent.swift in Sources */, E629E3CE2B470B7900D526AD /* Payload+UpdateConversationMLSMessageAdd.swift in Sources */, 06025666248E616C00E060E1 /* ZMSimpleListRequestPaginator.m in Sources */, @@ -3207,6 +3214,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A63392EB3B27A0017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 598D042F2C89C67E00B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; diff --git a/wire-ios-share-engine/Sources/WireLegacyLogging.swift b/wire-ios-share-engine/Sources/WireLegacyLogging.swift new file mode 100644 index 00000000000..bea411fb92d --- /dev/null +++ b/wire-ios-share-engine/Sources/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2024 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 86e5b0516ef..e313ce3074b 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ 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 */; }; + 596A63362EB3B2700017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63352EB3B2700017C3CA /* WireLegacyLogging */; }; BFA18BD41D806050005C281B /* BaseSharingSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */; }; CB79791D2C748580006FBA58 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB79791C2C748580006FBA58 /* TestSetup.swift */; }; CE7FBFC41E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */; }; @@ -131,6 +132,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A63362EB3B2700017C3CA /* WireLegacyLogging in Frameworks */, 06DE04672DE5233100D79D99 /* WireFoundation in Frameworks */, 1606AD122DC5136000C95115 /* WireDomain.framework in Frameworks */, 34DC44AF2E01C1F1004D5DD5 /* WireNetwork in Frameworks */, @@ -644,6 +646,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A63352EB3B2700017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 5470D3DF1D76E1B000FDE440 /* Project object */; 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..bea411fb92d --- /dev/null +++ b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift @@ -0,0 +1,21 @@ +// +// Wire +// Copyright (C) 2024 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-sync-engine/Source/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/WireLegacyLogging.swift new file mode 100644 index 00000000000..40186665061 --- /dev/null +++ b/wire-ios-sync-engine/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/. +// + +public import WireLegacyLogging + +public typealias LogFilesProviding = WireLegacyLogging.LogFilesProviding diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index 42b2d3c736a..f2ee753f37a 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -261,12 +261,14 @@ 594EAA002EA23E73009BC0EB /* WireUtilitiesPackageSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */; }; 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D882CFF9E7700920B59 /* WireLogging */; }; 596A19EA2E9E523100E190AE /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 596A19E92E9E523100E190AE /* ZIPFoundation */; }; + 596A63382EB3B2760017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63372EB3B2760017C3CA /* WireLegacyLogging */; }; 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */; }; 597B70C32B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */; }; 598D04362C89C6FB00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04352C89C6FB00B64D71 /* WireFoundation */; }; 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 */; }; + 59A09F0D2EB3BB4400CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */; }; 59BB29252E29527500C49DB6 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BB29242E29527500C49DB6 /* WireLoggingSupport */; }; 59C8F6522DF1BE17005AAC9D /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59C8F6512DF1BE17005AAC9D /* WireFoundation */; }; 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */; }; @@ -848,6 +850,7 @@ 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+DeveloperMenu.swift"; sourceTree = ""; }; 598E87012BF4DE9600FC5438 /* WireSystemSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireSystemSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C30F2B1DEE6E0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomainSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59E6A9132B4EE5CF00DBCC6B /* RecurringAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecurringAction.swift; sourceTree = ""; }; @@ -1297,6 +1300,7 @@ 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */, 594C0FCE2D541643003D8183 /* WireDomainPackage in Frameworks */, 59358C8C2DF19ED700C32162 /* WireAnalytics in Frameworks */, + 596A63382EB3B2760017C3CA /* WireLegacyLogging in Frameworks */, 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1663,6 +1667,7 @@ 3E18605C191A4F3B000FE027 /* WireSyncEngine-iOS.pch */, E9E4D4702C2AD61500364352 /* TeamRole+AnalyticsValue.swift */, E955D3DE2C36CFFF0090BEAB /* ConversationType+ZMConversationType.swift */, + 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */, ); path = Source; sourceTree = ""; @@ -2598,6 +2603,7 @@ 34DC44B02E01C1FC004D5DD5 /* WireNetwork */, 596A19E92E9E523100E190AE /* ZIPFoundation */, 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */, + 596A63372EB3B2760017C3CA /* WireLegacyLogging */, ); productName = "WireSyncEngine-ios"; productReference = 549815931A43232400A7CE2E /* WireSyncEngine.framework */; @@ -3125,6 +3131,7 @@ F19F4F3A1E5F1AE400F4D8FF /* UserProfileImageUpdateStatus.swift in Sources */, 5498162D1A432BC800A7CE2E /* ZMMissingUpdateEventsTranscoder.m in Sources */, 549816451A432BC800A7CE2E /* ZMOperationLoop.m in Sources */, + 59A09F0D2EB3BB4400CE0458 /* WireLegacyLogging.swift in Sources */, D5D10DA4203AE43200145497 /* Conversation+AccessMode.swift in Sources */, 066A3D6E2CDD27670089C5C2 /* UserType+DeepLink.swift in Sources */, F9AB00221F0CDAF00037B437 /* CacheFileRelocator.swift in Sources */, @@ -3769,6 +3776,10 @@ package = 596A19E82E9E523100E190AE /* XCRemoteSwiftPackageReference "ZIPFoundation" */; productName = ZIPFoundation; }; + 596A63372EB3B2760017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */ = { isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackage; 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..301ffdc324c 100644 --- a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj +++ b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 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 */; }; + 596A19362EB3A5C20017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A19352EB3A5C20017C3CA /* 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,6 +91,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A19362EB3A5C20017C3CA /* WireLegacyLogging in Frameworks */, 5953781C2CFF42E900920B59 /* WireLogging in Frameworks */, 013334BC2C204AB0002D97DB /* CocoaLumberjackSwift in Frameworks */, 596A19E72E9E4F8700E190AE /* ZIPFoundation in Frameworks */, @@ -192,6 +194,7 @@ 013334BB2C204AB0002D97DB /* CocoaLumberjackSwift */, 5953781B2CFF42E900920B59 /* WireLogging */, 596A19E62E9E4F8700E190AE /* ZIPFoundation */, + 596A19352EB3A5C20017C3CA /* WireLegacyLogging */, ); productName = SyncEngineSystem; productReference = 3ECC35191AD436750089FD4B /* WireSystem.framework */; @@ -701,6 +704,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A19352EB3A5C20017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 596A19E62E9E4F8700E190AE /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; package = 596A19E52E9E4F8700E190AE /* XCRemoteSwiftPackageReference "ZIPFoundation" */; 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 3b39c1595a6..4cb8cec4a8d 100644 --- a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj +++ b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 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 */; }; + 596A193D2EB3A6580017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A193C2EB3A6580017C3CA /* 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 */; }; @@ -162,6 +163,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A193D2EB3A6580017C3CA /* WireLegacyLogging in Frameworks */, 59FE6ACC2DA90CBA00DB461C /* WireFoundation in Frameworks */, 591B6E632C8B09F3009F8A7B /* WireUtilities.framework in Frameworks */, 59537CD92CFF7ED800920B59 /* WireLogging in Frameworks */, @@ -293,6 +295,7 @@ 01BBCFD72BF559AA001D9397 /* Starscream */, 59537CD82CFF7ED800920B59 /* WireLogging */, 59FE6ACB2DA90CBA00DB461C /* WireFoundation */, + 596A193C2EB3A6580017C3CA /* WireLegacyLogging */, ); productName = Transport; productReference = 3E88BCA71B1F35DF00232589 /* WireTransport.framework */; @@ -836,6 +839,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A193C2EB3A6580017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 59FE6ACB2DA90CBA00DB461C /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; 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..98faeec3f8e 100644 --- a/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj +++ b/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 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 */; }; + 596A193B2EB3A6170017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A193A2EB3A6170017C3CA /* 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 */; }; @@ -131,6 +132,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A193B2EB3A6170017C3CA /* WireLegacyLogging in Frameworks */, 591B6E7A2C8B0A1B009F8A7B /* WireSystem.framework in Frameworks */, 59537CD72CFF7E1400920B59 /* WireLogging in Frameworks */, 59B48C5A2C89CB1F00EA7999 /* WireFoundation in Frameworks */, @@ -257,6 +259,7 @@ packageProductDependencies = ( 59B48C592C89CB1F00EA7999 /* WireFoundation */, 59537CD62CFF7E1400920B59 /* WireLogging */, + 596A193A2EB3A6170017C3CA /* WireLegacyLogging */, ); productName = WireUtilities; productReference = 3E88BD381B1F3EA300232589 /* WireUtilities.framework */; @@ -811,6 +814,10 @@ isa = XCSwiftPackageProductDependency; productName = WireLogging; }; + 596A193A2EB3A6170017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 59B48C592C89CB1F00EA7999 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; 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/Settings/Debug Report/SettingsDebugReportViewModelTests.swift b/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift index 2a1ad9fb35c..ddb49bfa9cd 100644 --- a/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift +++ b/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift @@ -17,7 +17,7 @@ // import WireDataModelSupport -import WireLoggingSupport +import WireLegacyLoggingSupport import WireSyncEngineSupport import XCTest diff --git a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj index 57ef5d3d495..51fd698c6de 100644 --- a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj +++ b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj @@ -83,6 +83,10 @@ 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 */; }; + 596A632C2EB3B2450017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632B2EB3B2450017C3CA /* WireLegacyLogging */; }; + 596A632E2EB3B2500017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632D2EB3B2500017C3CA /* WireLegacyLogging */; }; + 596A63302EB3B25A0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */; }; + 596A63322EB3B2600017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63312EB3B2600017C3CA /* WireLegacyLogging */; }; 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 */; }; @@ -100,6 +104,8 @@ 59B768432D2D58BE007B5F1E /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59B768422D2D58BE007B5F1E /* WireFoundationSupport */; }; 59B7684B2D2D5A17007B5F1E /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59B7684A2D2D5A17007B5F1E /* WireFoundationSupport */; }; 59B99FAA2C89DE8600201827 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B99FA92C89DE8600201827 /* WireFoundation */; }; + 59BABD9A2EB3BCAF00CA529B /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */; }; + 59BABD9C2EB3BCB500CA529B /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */; }; 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 */; }; @@ -924,6 +930,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A63322EB3B2600017C3CA /* WireLegacyLogging in Frameworks */, 346C75612E74727000800769 /* WireFoundation in Frameworks */, 591B6E212C8B096C009F8A7B /* WireCommonComponents.framework in Frameworks */, 3431F08B2E795BD0007BA692 /* WireNetwork in Frameworks */, @@ -939,6 +946,7 @@ 34C5F14A2E58AE0800C0FF34 /* WireNetwork in Frameworks */, E489D8312DF709CE008966AE /* WireMultiBackendUI in Frameworks */, 591B6E192C8B0960009F8A7B /* WireCommonComponents.framework in Frameworks */, + 596A632E2EB3B2500017C3CA /* WireLegacyLogging in Frameworks */, 59C4FBF12C45B7130037030B /* WireShareEngine.framework in Frameworks */, 346C755F2E74726600800769 /* WireFoundation in Frameworks */, 59537D932CFFA0DA00920B59 /* WireLogging in Frameworks */, @@ -975,6 +983,7 @@ CB4E15122C81CC81005DDEC8 /* Down in Frameworks */, EEE25B3829719C170008B894 /* WireDataModel.framework in Frameworks */, 59D038272C85D31E009FE583 /* WireMainNavigationUI in Frameworks */, + 596A632C2EB3B2450017C3CA /* WireLegacyLogging in Frameworks */, EE33C48D296485FA00C058D1 /* WireShareEngine.framework in Frameworks */, EEE25B2A29719A730008B894 /* cryptobox.xcframework in Frameworks */, 59076F952C934A9800AE7529 /* WireAccountImageUI in Frameworks */, @@ -1015,6 +1024,7 @@ 01C1A7C72A54C45A0058D578 /* SnapshotTesting in Frameworks */, CB4870F22C7F4FE5001E9151 /* WireTransportSupport.framework in Frameworks */, 59B7684B2D2D5A17007B5F1E /* WireFoundationSupport in Frameworks */, + 59BABD9C2EB3BCB500CA529B /* WireLegacyLoggingSupport in Frameworks */, 5996E8A82C19D09D007A52F0 /* WireSyncEngineSupport.framework in Frameworks */, 3438C5592E5C518900D6FB5C /* WireNetwork in Frameworks */, 5996E8A42C19D074007A52F0 /* WireRequestStrategySupport.framework in Frameworks */, @@ -1032,6 +1042,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 59BABD9A2EB3BCAF00CA529B /* WireLegacyLoggingSupport in Frameworks */, 59AADE272BB429B200D9E658 /* WireRequestStrategySupport.framework in Frameworks */, 59C951C42E2B67E8002C0A3E /* WireLoggingSupport in Frameworks */, 5996E8AA2C19D0D6007A52F0 /* WireSystemSupport.framework in Frameworks */, @@ -1050,6 +1061,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 596A63302EB3B25A0017C3CA /* WireLegacyLogging in Frameworks */, E985CB8F2CEB4FCB0075DAD6 /* WireDatadog in Frameworks */, 59537D8F2CFFA05600920B59 /* WireLogging in Frameworks */, E9816C902CC9244700D77F22 /* WireSyncEngine.framework in Frameworks */, @@ -1341,6 +1353,7 @@ E489D8302DF709CE008966AE /* WireMultiBackendUI */, 34C5F1492E58AE0800C0FF34 /* WireNetwork */, 346C755E2E74726600800769 /* WireFoundation */, + 596A632D2EB3B2500017C3CA /* WireLegacyLogging */, ); productName = "Wire-iOS Share Extension"; productReference = 168A16A91D9597C2005CFA6C /* Wire Share Extension.appex */; @@ -1409,6 +1422,7 @@ 065CDA942E9E58B90080799B /* WireCallingAssembly */, 76EF748D2E9E6366006A1579 /* WireLocators */, 5972B0DA2E9EABC8005E6417 /* WireUtilitiesPackage */, + 596A632B2EB3B2450017C3CA /* WireLegacyLogging */, ); productName = "ZClient iOS"; productReference = 8F42C538199244A700288E4D /* Wire.app */; @@ -1442,6 +1456,7 @@ 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */, 3438C5582E5C518900D6FB5C /* WireNetwork */, 76EF748F2E9E6380006A1579 /* WireLocators */, + 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */, ); productName = "ZClient-iOS Tests"; productReference = BACB88511AF7C48900DDCDB0 /* Wire-iOS-Tests.xctest */; @@ -1470,6 +1485,7 @@ 59C951C32E2B67E8002C0A3E /* WireLoggingSupport */, 595BE7A52E32368500ED9088 /* WireAnalyticsSupport */, 3438C55A2E5C51A700D6FB5C /* WireNetwork */, + 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */, ); productName = "Wire-iOS UnitTests"; productReference = E6579E362AFF9B30004E7FD8 /* Wire-iOS UnitTests.xctest */; @@ -1493,6 +1509,7 @@ packageProductDependencies = ( 016A141C2CE6BFC4006A7EF5 /* WireDatadog */, 59537D8E2CFFA05600920B59 /* WireLogging */, + 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */, ); productName = WireCommonComponents; productReference = F1FEA14A21DCEB1700790A54 /* WireCommonComponents.framework */; @@ -2960,6 +2977,22 @@ isa = XCSwiftPackageProductDependency; productName = WireSettingsUI; }; + 596A632B2EB3B2450017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; + 596A632D2EB3B2500017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; + 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; + 596A63312EB3B2600017C3CA /* WireLegacyLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLogging; + }; 59703B272DD4A42000B45773 /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; package = 59703B262DD4A42000B45773 /* XCRemoteSwiftPackageReference "ZIPFoundation" */; @@ -2989,6 +3022,14 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; + 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLoggingSupport; + }; + 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLoggingSupport; + }; 59BAEAFB2DBF483400B54AC4 /* WireBackup */ = { isa = XCSwiftPackageProductDependency; productName = WireBackup; 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 From 1cde70141cafc271fe10bc19cfc2ed395b07f027 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Thu, 30 Oct 2025 18:40:45 +0100 Subject: [PATCH 02/37] fix file headers --- .../Source/Utilis/WireLegacyLogger.swift | 6 ++--- .../Source/WireLegacyLogging.swift | 23 ------------------- .../WireDataModel.xcodeproj/project.pbxproj | 8 +++---- .../Sources/WireLegacyLogging.swift | 8 ++++--- .../project.pbxproj | 4 ++++ .../Sources/Helpers/WireLegacyLogging.swift | 2 +- .../Sources/WireLegacyLogging.swift | 22 ------------------ .../project.pbxproj | 8 +++---- .../Sources/WireLegacyLogging.swift | 8 ++++--- .../WireShareEngine.xcodeproj/project.pbxproj | 4 ++++ .../Source/Utility/WireLegacyLogging.swift | 2 +- .../Source/WireLegacyLogging.swift | 21 ----------------- .../WireSyncEngine.xcodeproj/project.pbxproj | 8 +++---- 13 files changed, 35 insertions(+), 89 deletions(-) delete mode 100644 wire-ios-data-model/Source/WireLegacyLogging.swift delete mode 100644 wire-ios-request-strategy/Sources/WireLegacyLogging.swift delete mode 100644 wire-ios-sync-engine/Source/WireLegacyLogging.swift diff --git a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift index eb3a55fb2da..04e2a2e064b 100644 --- a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift +++ b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// 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 @@ -18,6 +18,6 @@ import WireLegacyLogging -typealias WireLogger = WireLegacyLogging.WireLogger -public typealias LogAttributes = WireLegacyLogging.LogAttributes +typealias LogAttributes = WireLegacyLogging.LogAttributes typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-data-model/Source/WireLegacyLogging.swift b/wire-ios-data-model/Source/WireLegacyLogging.swift deleted file mode 100644 index 26f48625fd0..00000000000 --- a/wire-ios-data-model/Source/WireLegacyLogging.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// 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 LogAttributes = WireLegacyLogging.LogAttributes -public typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 5867e81507c..0d404bb872e 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -272,10 +272,10 @@ 599EA3D72C247A6B009319D4 /* FilterableConversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3D62C247A6B009319D4 /* FilterableConversation.swift */; }; 599EA3D92C247ABF009319D4 /* ZMFilterableConversationAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3D82C247ABF009319D4 /* ZMFilterableConversationAdapter.swift */; }; 599EA3DB2C2485AE009319D4 /* FilterableConversationParticipant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599EA3DA2C2485AE009319D4 /* FilterableConversationParticipant.swift */; }; - 59A09F092EB3BA3300CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */; }; 59AAB6492AFCF541005B39E6 /* MessageProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */; }; 59B48C5C2C89CBBD00EA7999 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B48C5B2C89CBBD00EA7999 /* WireFoundation */; }; 59BAE1102C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */; }; + 59BAE29D2EB3D99000CA529B /* WireLegacyLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */; }; 59D1C3062B1DE6FF0016F6B2 /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */; }; 59D1C30E2B1DEC300016F6B2 /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */; }; 59D398D02D552573001C9C5F /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59D398CF2D552573001C9C5F /* WireTestingPackage */; }; @@ -1039,9 +1039,9 @@ 599EA3D62C247A6B009319D4 /* FilterableConversation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterableConversation.swift; sourceTree = ""; }; 599EA3D82C247ABF009319D4 /* ZMFilterableConversationAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMFilterableConversationAdapter.swift; sourceTree = ""; }; 599EA3DA2C2485AE009319D4 /* FilterableConversationParticipant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterableConversationParticipant.swift; sourceTree = ""; }; - 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageProtocolTests.swift; sourceTree = ""; }; 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterConversationsUseCaseTests.swift; sourceTree = ""; }; + 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogger.swift; sourceTree = ""; }; 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59E1081E2E99149200D8BA62 /* store2-130-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-130-0.wiredatabase"; sourceTree = ""; }; 59EC73F62C20B03100E5C036 /* NSManagedObjectContext+executeFetchRequestOrAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectContext+executeFetchRequestOrAssert.h"; sourceTree = ""; }; @@ -2591,6 +2591,7 @@ F9A706421CAEE01D00C2F5FE /* Utilis */ = { isa = PBXGroup; children = ( + 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */, EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */, F963E9671D9ADD5A00098AD3 /* Protos */, F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */, @@ -3006,7 +3007,6 @@ F9C9A7371CAE6D890039E10C /* ConversationList */, 599EA3D12C246897009319D4 /* ConversationSearch */, F9C9A6A01CAD7C7F0039E10C /* Public */, - 59A09F082EB3BA3300CE0458 /* WireLegacyLogging.swift */, ); path = Source; sourceTree = ""; @@ -3562,7 +3562,6 @@ F9A706AE1CAEE01D00C2F5FE /* SetSnapshot.swift in Sources */, 162A81DD202DA4BC00F6200C /* AssetCache.swift in Sources */, EE9AEC822BD1570E00F7853F /* WireDataModel.docc in Sources */, - 59A09F092EB3BA3300CE0458 /* WireLegacyLogging.swift in Sources */, 599EA3D92C247ABF009319D4 /* ZMFilterableConversationAdapter.swift in Sources */, 638805652410FE920043B641 /* ButtonState.swift in Sources */, 63B1335A29A503D100009D84 /* MLSActionExecutor.swift in Sources */, @@ -3856,6 +3855,7 @@ F9AB00271F0CE5520037B437 /* FileManager+FileLocations.swift in Sources */, F9A7067F1CAEE01D00C2F5FE /* ZMImageMessage.m in Sources */, 63D41E7124597E420076826F /* GenericMessage+Flags.swift in Sources */, + 59BAE29D2EB3D99000CA529B /* WireLegacyLogger.swift in Sources */, 5473CC731E14245C00814C03 /* NSManagedObjectContext+Debugging.swift in Sources */, BF46662A1DCB71B0007463FF /* V3Asset.swift in Sources */, CBF4F17F2D36935300C9638B /* ConnectionValidator.swift in Sources */, diff --git a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift index bea411fb92d..70915aca4a2 100644 --- a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift +++ b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// 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 @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +// TODO: delete file? -typealias WireLogger = WireLegacyLogging.WireLogger +// import WireLegacyLogging + +// typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index 670c65771f9..f161c68366f 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ 591B6E2F2C8B0988009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEC80B5629B6054A00099727 /* WireMockTransport.framework */; }; 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLogging */; }; 596A63342EB3B26B0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63332EB3B26B0017C3CA /* WireLegacyLogging */; }; + 59BAE2A52EB3DA3E00CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */; }; 630A582D29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */; }; EE0BA28A29D59B1D004E93B5 /* NotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */; }; EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */; }; @@ -77,6 +78,7 @@ 06DE7AB62DE4D8A100D79D99 /* WireDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyNotificationSessionLoader.swift; sourceTree = ""; }; 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNotificationSessionTests.swift; sourceTree = ""; }; EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSessionTests.swift; sourceTree = ""; }; EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationStatusDirectory.swift; sourceTree = ""; }; @@ -188,6 +190,7 @@ 06604296247FE76A00A5F161 /* Sources */ = { isa = PBXGroup; children = ( + 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */, 0697129A2497CA8F00C32169 /* Synchronization */, 06604297247FE76A00A5F161 /* AppDelegate.swift */, EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */, @@ -431,6 +434,7 @@ files = ( 067ECB602487ABF700701956 /* AppDelegate.swift in Sources */, EE32460228229FDF00F2A84A /* AuthenticationStatus.swift in Sources */, + 59BAE2A52EB3DA3E00CA529B /* WireLegacyLogging.swift in Sources */, EE32460028229F6B00F2A84A /* ClientRegistrationStatus.swift in Sources */, 069712912497B96E00C32169 /* OperationLoop.swift in Sources */, EE9AEC982BD159C700F7853F /* WireNotificationEngine.docc in Sources */, diff --git a/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift index 029247eb5c4..962ee6e9acd 100644 --- a/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift +++ b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// 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 diff --git a/wire-ios-request-strategy/Sources/WireLegacyLogging.swift b/wire-ios-request-strategy/Sources/WireLegacyLogging.swift deleted file mode 100644 index bb51cf1b382..00000000000 --- a/wire-ios-request-strategy/Sources/WireLegacyLogging.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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 Flow = WireLegacyLogging.Flow -public 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 fc97e122da2..aadffdb39ad 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ 598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042F2C89C67E00B64D71 /* WireFoundation */; }; 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04322C89C6CF00B64D71 /* WireFoundation */; }; 598E870D2BF4E08100FC5438 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */; }; - 59A09F0B2EB3BB0B00CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */; }; + 59BAE2A32EB3DA1400CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */; }; 59D398D22D5525DB001C9C5F /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59D398D12D5525DB001C9C5F /* WireTestingPackage */; }; 5E68F22722452CDC00298376 /* LinkPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */; }; 5E9EA4DE2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */; }; @@ -705,7 +705,7 @@ 597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandler.swift; sourceTree = ""; }; 597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandlerTests.swift; sourceTree = ""; }; 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; + 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C3112B1DF3AD0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreprocessor.swift; sourceTree = ""; }; 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkAttachmentsPreprocessor.swift; sourceTree = ""; }; @@ -1361,7 +1361,6 @@ E69A021F2B85095F00126FF6 /* Services */, 06474D4824AF6825002C695D /* Synchronization */, 1669016D1D707509000FE4AF /* WireRequestStrategy.h */, - 59A09F0A2EB3BB0B00CE0458 /* WireLegacyLogging.swift */, ); path = Sources; sourceTree = ""; @@ -2101,6 +2100,7 @@ F963E8D81D955D4600098AD3 /* Helpers */ = { isa = PBXGroup; children = ( + 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */, F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */, F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */, F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */, @@ -2422,6 +2422,7 @@ F18401C12073BE0800E9F4CC /* ImageV2DownloadRequestStrategy.swift in Sources */, F18401CD2073BE0800E9F4CC /* LinkPreviewPreprocessor.swift in Sources */, E629E3C62B470A8200D526AD /* Payload+UpdateConversationReceiptMode.swift in Sources */, + 59BAE2A32EB3DA1400CA529B /* WireLegacyLogging.swift in Sources */, E69A02172B84F02800126FF6 /* SelfSupportedProtocolsRequestBuilder.swift in Sources */, 169BA1CB25E9507600374343 /* Payload+Coding.swift in Sources */, 6308F8AC2A273E7A0072A177 /* FetchMLSConversationGroupInfoActionHandler.swift in Sources */, @@ -2522,7 +2523,6 @@ 633B396A2891890600208124 /* ZMUpdateEvent+Decryption.swift in Sources */, 06474D4B24AF6858002C695D /* EventDecoder.swift in Sources */, 064824982B10E32C00115329 /* EnrollE2EICertificateUseCase.swift in Sources */, - 59A09F0B2EB3BB0B00CE0458 /* WireLegacyLogging.swift in Sources */, E629E3BC2B4704B200D526AD /* Payload+ConversationEvent.swift in Sources */, E629E3CE2B470B7900D526AD /* Payload+UpdateConversationMLSMessageAdd.swift in Sources */, 06025666248E616C00E060E1 /* ZMSimpleListRequestPaginator.m in Sources */, diff --git a/wire-ios-share-engine/Sources/WireLegacyLogging.swift b/wire-ios-share-engine/Sources/WireLegacyLogging.swift index bea411fb92d..fa6b1651271 100644 --- a/wire-ios-share-engine/Sources/WireLegacyLogging.swift +++ b/wire-ios-share-engine/Sources/WireLegacyLogging.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// 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 @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +// TODO: delete file -typealias WireLogger = WireLegacyLogging.WireLogger +// 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 e313ce3074b..69a41fef85a 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ 591B6E382C8B0995009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE67F6F8296F094C001D7C88 /* WireMockTransport.framework */; }; 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8A2CFF9F8F00920B59 /* WireLogging */; }; 596A63362EB3B2700017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63352EB3B2700017C3CA /* WireLegacyLogging */; }; + 59BAE2A12EB3D9EA00CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */; }; BFA18BD41D806050005C281B /* BaseSharingSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */; }; CB79791D2C748580006FBA58 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB79791C2C748580006FBA58 /* TestSetup.swift */; }; CE7FBFC41E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */; }; @@ -86,6 +87,7 @@ 5470D4121D76E2A400FDE440 /* project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = project.xcconfig; sourceTree = ""; }; 5470D4151D76E2A400FDE440 /* tests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = tests.xcconfig; sourceTree = ""; }; 5470D4171D76E2A400FDE440 /* warnings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = warnings.xcconfig; sourceTree = ""; }; + 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseSharingSessionTests.swift; sourceTree = ""; }; CB79791C2C748580006FBA58 /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = ""; }; CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestGeneratorStoreTests.swift; sourceTree = ""; }; @@ -261,6 +263,7 @@ F1DABF961E9B8B6100AD2324 /* Sources */ = { isa = PBXGroup; children = ( + 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */, 34C5BFAE2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift */, 34C5BFAA2E57663C00C0FF34 /* SyncStatus.swift */, 34C5BFA82E57662200C0FF34 /* ApplicationStatusDirectory.swift */, @@ -433,6 +436,7 @@ buildActionMask = 2147483647; files = ( 34C5BFAB2E57663C00C0FF34 /* SyncStatus.swift in Sources */, + 59BAE2A12EB3D9EA00CA529B /* WireLegacyLogging.swift in Sources */, 34C5BFA92E57662200C0FF34 /* ApplicationStatusDirectory.swift in Sources */, F1DABFA31E9B8B6100AD2324 /* Conversation.swift in Sources */, 34C5BFA52E5765EF00C0FF34 /* ClientRegistrationStatus.swift in Sources */, diff --git a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift index bea411fb92d..0e8c1c83c10 100644 --- a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift +++ b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// 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 diff --git a/wire-ios-sync-engine/Source/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/WireLegacyLogging.swift deleted file mode 100644 index 40186665061..00000000000 --- a/wire-ios-sync-engine/Source/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index f2ee753f37a..a093ed88d82 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -268,7 +268,7 @@ 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 */; }; - 59A09F0D2EB3BB4400CE0458 /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */; }; + 59BAE29F2EB3D9C400CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */; }; 59BB29252E29527500C49DB6 /* WireLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BB29242E29527500C49DB6 /* WireLoggingSupport */; }; 59C8F6522DF1BE17005AAC9D /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59C8F6512DF1BE17005AAC9D /* WireFoundation */; }; 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */; }; @@ -850,7 +850,7 @@ 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+DeveloperMenu.swift"; sourceTree = ""; }; 598E87012BF4DE9600FC5438 /* WireSystemSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireSystemSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; + 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C30F2B1DEE6E0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomainSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59E6A9132B4EE5CF00DBCC6B /* RecurringAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecurringAction.swift; sourceTree = ""; }; @@ -1667,7 +1667,6 @@ 3E18605C191A4F3B000FE027 /* WireSyncEngine-iOS.pch */, E9E4D4702C2AD61500364352 /* TeamRole+AnalyticsValue.swift */, E955D3DE2C36CFFF0090BEAB /* ConversationType+ZMConversationType.swift */, - 59A09F0C2EB3BB4400CE0458 /* WireLegacyLogging.swift */, ); path = Source; sourceTree = ""; @@ -2171,6 +2170,7 @@ A9EADFFF19DBF20A00FD386C /* Utility */ = { isa = PBXGroup; children = ( + 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */, 5430E9231BAA0D9F00395E05 /* WireSyncEngineLogs.h */, 546392711D79D5210094EC66 /* Application.swift */, 1645ECF72448A0A3007A82D6 /* Decodable+JSON.swift */, @@ -3131,7 +3131,6 @@ F19F4F3A1E5F1AE400F4D8FF /* UserProfileImageUpdateStatus.swift in Sources */, 5498162D1A432BC800A7CE2E /* ZMMissingUpdateEventsTranscoder.m in Sources */, 549816451A432BC800A7CE2E /* ZMOperationLoop.m in Sources */, - 59A09F0D2EB3BB4400CE0458 /* WireLegacyLogging.swift in Sources */, D5D10DA4203AE43200145497 /* Conversation+AccessMode.swift in Sources */, 066A3D6E2CDD27670089C5C2 /* UserType+DeepLink.swift in Sources */, F9AB00221F0CDAF00037B437 /* CacheFileRelocator.swift in Sources */, @@ -3248,6 +3247,7 @@ 54131BC625C7F71400CE2CA2 /* LoginDelegate.swift in Sources */, 167F383B23E0416E006B6AA9 /* UnauthenticatedSession+SSO.swift in Sources */, EEE186B6259CCA14008707CA /* SessionManager+AppLock.swift in Sources */, + 59BAE29F2EB3D9C400CA529B /* WireLegacyLogging.swift in Sources */, 54257C081DF1C94200107FE7 /* TopConversationsDirectory.swift in Sources */, 166B2B5E23E86522003E8581 /* ZMUserSession.swift in Sources */, F9ABE8511EFD568B00D83214 /* TeamRequestFactory.swift in Sources */, From 65a3559a4f547975d51f9c2a659d7753c5bffc5b Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 10:34:32 +0100 Subject: [PATCH 03/37] fix build errors --- .../Source/Utilis/WireLegacyLogger.swift | 3 ++- .../Sources/WireLegacyLogging.swift | 7 +++---- .../project.pbxproj | 2 +- .../Sources/WireLegacyLogging.swift | 6 ++---- .../WireShareEngine.xcodeproj/project.pbxproj | 2 +- .../Source/Utility/WireLegacyLogging.swift | 4 +++- .../WireSyncEngine.xcodeproj/project.pbxproj | 2 +- .../Tests/Utility/WireLegacyLogging.swift | 21 +++++++++++++++++++ 8 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 wire-ios/Tests/Utility/WireLegacyLogging.swift diff --git a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift index 04e2a2e064b..fd17cd04f04 100644 --- a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift +++ b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift @@ -18,6 +18,7 @@ import WireLegacyLogging -typealias LogAttributes = WireLegacyLogging.LogAttributes +public typealias LogAttributes = WireLegacyLogging.LogAttributes + typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift index 70915aca4a2..e36f4f22892 100644 --- a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift +++ b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift @@ -16,8 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -// TODO: delete file? +import WireLegacyLogging -// import WireLegacyLogging - -// typealias WireLogger = WireLegacyLogging.WireLogger +typealias LogAttributesKey = WireLegacyLogging.LogAttributesKey +typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index f161c68366f..eeae1f84ce2 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -190,7 +190,6 @@ 06604296247FE76A00A5F161 /* Sources */ = { isa = PBXGroup; children = ( - 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */, 0697129A2497CA8F00C32169 /* Synchronization */, 06604297247FE76A00A5F161 /* AppDelegate.swift */, EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */, @@ -199,6 +198,7 @@ EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */, 069712952497C1BC00C32169 /* NotificationSession.swift */, 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */, + 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */, 066042A0247FE76C00A5F161 /* Assets.xcassets */, 066042A5247FE76C00A5F161 /* Info.plist */, ); diff --git a/wire-ios-share-engine/Sources/WireLegacyLogging.swift b/wire-ios-share-engine/Sources/WireLegacyLogging.swift index fa6b1651271..0e8c1c83c10 100644 --- a/wire-ios-share-engine/Sources/WireLegacyLogging.swift +++ b/wire-ios-share-engine/Sources/WireLegacyLogging.swift @@ -16,8 +16,6 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -// TODO: delete file +import WireLegacyLogging -// import WireLegacyLogging - -// typealias WireLogger = WireLegacyLogging.WireLogger +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 69a41fef85a..01786c511c7 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -263,7 +263,6 @@ F1DABF961E9B8B6100AD2324 /* Sources */ = { isa = PBXGroup; children = ( - 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */, 34C5BFAE2E57665D00C0FF34 /* BackendEnvironmentProvider+CookieStorage.swift */, 34C5BFAA2E57663C00C0FF34 /* SyncStatus.swift */, 34C5BFA82E57662200C0FF34 /* ApplicationStatusDirectory.swift */, @@ -280,6 +279,7 @@ 165C55F52551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift */, F1DABF9D1E9B8B6100AD2324 /* SharingTarget.swift */, F1DABF9E1E9B8B6100AD2324 /* StrategyFactory.swift */, + 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */, F1DABF9F1E9B8B6100AD2324 /* WireShareEngine.h */, F1DABFA01E9B8B6100AD2324 /* ZMConversation+Conversation.swift */, F1DABFA11E9B8B6100AD2324 /* ZMMessage+Sendable.swift */, diff --git a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift index 0e8c1c83c10..676b0da3ad5 100644 --- a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift +++ b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +public import WireLegacyLogging + +public typealias LogFilesProviding = WireLegacyLogging.LogFilesProviding typealias WireLogger = WireLegacyLogging.WireLogger diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index a093ed88d82..16716615ce6 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -2170,7 +2170,6 @@ A9EADFFF19DBF20A00FD386C /* Utility */ = { isa = PBXGroup; children = ( - 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */, 5430E9231BAA0D9F00395E05 /* WireSyncEngineLogs.h */, 546392711D79D5210094EC66 /* Application.swift */, 1645ECF72448A0A3007A82D6 /* Decodable+JSON.swift */, @@ -2179,6 +2178,7 @@ EE2DE5EB29263C5100F42F4C /* Logger.swift */, 5E8EE1F920FDC7D700DB1F9B /* Pasteboard.swift */, EE0CAEAE2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift */, + 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */, E91180E02CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift */, ); path = Utility; diff --git a/wire-ios/Tests/Utility/WireLegacyLogging.swift b/wire-ios/Tests/Utility/WireLegacyLogging.swift new file mode 100644 index 00000000000..0e8c1c83c10 --- /dev/null +++ b/wire-ios/Tests/Utility/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 From 9a743d624274bd7b40197a06d9fce96c83c3eebb Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 10:56:28 +0100 Subject: [PATCH 04/37] cleanup --- WireAnalytics/Package.swift | 1 + WireAnalytics/Sources/WireDatadog/WireDatadog.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 32ab54958ff..59b77729ae3 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -4,6 +4,7 @@ import Foundation import PackageDescription // You can enable/disable Datadog for debugging by overriding the boolean. +// open --env ENABLE_DATADOG=true --env ENABLE_COUNTLY=true wire-ios-mono.xcworkspace let isDatadogEnabled = hasEnvironmentVariable("ENABLE_DATADOG", "true") let isCountlyEnabled = hasEnvironmentVariable("ENABLE_COUNTLY", "true") diff --git a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift index 2d1f18207e8..95a36ca274a 100644 --- a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift @@ -26,7 +26,7 @@ import DatadogLogs import DatadogRUM import DatadogTrace import UIKit -x + public final class WireDatadog { private let applicationID: String From 0e8abc7eb797e57534ee828e995de193e729674e Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 11:26:19 +0100 Subject: [PATCH 05/37] fix build eerror --- .../WireLegacyLogging.swift | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift 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 From a278cde0115d867f84880736e617783b86f38cdf Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 12:47:48 +0100 Subject: [PATCH 06/37] fix more errors --- WireLogging/Package.swift | 5 ++++- .../WireLogging/WireLoggingPlaceholder.swift | 6 ++++++ fastlane/Fastfile | 9 +++++++- .../WireDataModel.xcodeproj/project.pbxproj | 6 ++++++ .../project.pbxproj | 7 +++++++ .../Utility/WireLegacyLoggingSupport.swift | 21 +++++++++++++++++++ .../WireSyncEngine.xcodeproj/project.pbxproj | 15 +++++++++++-- 7 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 522ad50757c..17de321619c 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -1,5 +1,6 @@ // swift-tools-version: 6.2 +import Foundation import PackageDescription let package = Package( @@ -46,5 +47,7 @@ for target in package.targets { .enableUpcomingFeature("InternalImportsByDefault"), .enableUpcomingFeature("MemberImportVisibility"), .enableUpcomingFeature("StrictMemorySafety"), - ] + isCI ? .unsafeFlags(["-warnings-as-errors"]) : nil + ].compactMap(\.self) } +let isCI = ProcessInfo.processInfo.environment["CI"] != nil diff --git a/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift b/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift index 89c90917712..07e1459e049 100644 --- a/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift +++ b/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift @@ -15,3 +15,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see http://www.gnu.org/licenses/. // + +final class Something { + func x() { + let i = 0 + } +} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 85da9d882ae..8b53648f798 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -477,7 +477,14 @@ platform :ios do if build.for_simulator Dir.chdir("..") do # Build the app for simulator - sh "xcodebuild -workspace 'wire-ios-mono.xcworkspace' -scheme 'Wire-iOS' -configuration 'Debug' -destination \"generic/platform=iOS Simulator\" -derivedDataPath DerivedData -quiet build BUILD_NUMBER=#{build.build_number}" + sh "xcodebuild " \ + "-workspace 'wire-ios-mono.xcworkspace' " \ + "-scheme 'Wire-iOS' " \ + "-configuration 'Debug' " \ + "-destination \"generic/platform=iOS Simulator\" " \ + "-derivedDataPath DerivedData " \ + "-quiet build " \ + "BUILD_NUMBER=#{build.build_number}" # make a "fake" .ipa package that QA will use for installing to simulator sh "mkdir -p debug/Payload" diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 0d404bb872e..93e8a8f42e3 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -249,6 +249,7 @@ 591F8A022B8CB4DE00D562A6 /* IsSelfUserE2EICertifiedUseCaseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A012B8CB4DE00D562A6 /* IsSelfUserE2EICertifiedUseCaseProtocol.swift */; }; 591F8A042B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A032B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift */; }; 591F8A072B8CB82400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */; }; + 594471C52EB4D92200A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C42EB4D92200A77D75 /* WireLegacyLoggingSupport */; }; 5947923D2EA7A576006BEC0A /* store2-131-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 5947923C2EA7A576006BEC0A /* store2-131-0.wiredatabase */; }; 59506A882E2E61BD0051B07A /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 59506A872E2E61BD0051B07A /* SwiftProtobuf */; }; 5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0342E2EA1070051B07A /* GenericMessageProtocol */; }; @@ -1677,6 +1678,7 @@ 591B6E4E2C8B09CA009F8A7B /* OCMock.xcframework in Frameworks */, 0176B8812E7AE25B005D448B /* WireLogging in Frameworks */, 5950B0372E2EA1220051B07A /* GenericMessageProtocol in Frameworks */, + 594471C52EB4D92200A77D75 /* WireLegacyLoggingSupport in Frameworks */, 5978BFD42E2E6132004778CC /* SwiftProtobuf in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4573,6 +4575,10 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundationSupport; }; + 594471C42EB4D92200A77D75 /* WireLegacyLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLoggingSupport; + }; 59506A872E2E61BD0051B07A /* SwiftProtobuf */ = { isa = XCSwiftPackageProductDependency; package = 5978BFD22E2E6132004778CC /* XCRemoteSwiftPackageReference "swift-protobuf" */; diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj index aadffdb39ad..b60a6670430 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -193,6 +193,7 @@ 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 */; }; + 594471C32EB4D8E200A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */; }; 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLogging */; }; 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLogging */; }; 596A633A2EB3B27A0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63392EB3B27A0017C3CA /* WireLegacyLogging */; }; @@ -985,6 +986,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 594471C32EB4D8E200A77D75 /* WireLegacyLoggingSupport in Frameworks */, BF7D9BE11D8C351900949267 /* WireRequestStrategy.framework in Frameworks */, CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */, 598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */, @@ -2233,6 +2235,7 @@ 598D042F2C89C67E00B64D71 /* WireFoundation */, 59537D862CFF9DF600920B59 /* WireLogging */, 59D398D12D5525DB001C9C5F /* WireTestingPackage */, + 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */, ); productName = WireRequestStrategyTests; productReference = 166901741D707509000FE4AF /* WireRequestStrategyTests.xctest */; @@ -3206,6 +3209,10 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ + 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLoggingSupport; + }; 59537D842CFF9D1600920B59 /* WireLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLogging; 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 16716615ce6..f9f7234e8da 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -256,6 +256,8 @@ 59358C8C2DF19ED700C32162 /* WireAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 59358C8B2DF19ED700C32162 /* WireAnalytics */; }; 59358C902DF1A01300C32162 /* WireAnalyticsSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59358C8F2DF1A01300C32162 /* WireAnalyticsSupport */; }; 5943E9BC2D11CB3B00D39FFF /* CallEndedReason+initWithCallClosedReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5943E9BB2D11CB3300D39FFF /* CallEndedReason+initWithCallClosedReason.swift */; }; + 594471BF2EB4D84500A77D75 /* WireLegacyLoggingSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */; }; + 594471C12EB4D87000A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */; }; 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 */; }; @@ -847,6 +849,7 @@ 59271BE72B908DAC0019B726 /* SecurityClassificationProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityClassificationProviding.swift; sourceTree = ""; }; 59271BE92B908E150019B726 /* SecurityClassification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityClassification.swift; sourceTree = ""; }; 5943E9BB2D11CB3300D39FFF /* CallEndedReason+initWithCallClosedReason.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CallEndedReason+initWithCallClosedReason.swift"; sourceTree = ""; }; + 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLoggingSupport.swift; sourceTree = ""; }; 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+DeveloperMenu.swift"; sourceTree = ""; }; 598E87012BF4DE9600FC5438 /* WireSystemSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireSystemSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1272,6 +1275,7 @@ 5946F37E2D53DC550039C059 /* WireTestingPackage in Frameworks */, 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */, 5996E8952C19CB36007A52F0 /* WireUtilitiesSupport.framework in Frameworks */, + 594471C12EB4D87000A77D75 /* WireLegacyLoggingSupport in Frameworks */, CB4895532C4FB77C00CA2C25 /* WireTesting.framework in Frameworks */, 594EAA002EA23E73009BC0EB /* WireUtilitiesPackageSupport in Frameworks */, 59202AD42D54D49400143413 /* WireDomainPackage in Frameworks */, @@ -2189,10 +2193,11 @@ children = ( 543ED0001D79E0EE00A9CDF3 /* ApplicationMock.swift */, 879634411F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift */, - F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */, + 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */, 163FB9922052EA4600E74F83 /* OperationLoopNewRequestObserver.swift */, 169E303120D29C200012C219 /* PushRegistryMock.swift */, - 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */, + 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */, + F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */, 169BA1FE25ED0DAD00374343 /* ZMUserSession+Messages.swift */, ); path = Utility; @@ -2568,6 +2573,7 @@ 34F8CA972E02BFEB000FE4E0 /* WireNetwork */, 59BB29242E29527500C49DB6 /* WireLoggingSupport */, 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */, + 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */, ); productName = "WireSyncEngine-iOS-Tests"; productReference = 3E1860C3191A649D000FE027 /* UnitTests.xctest */; @@ -2961,6 +2967,7 @@ 0678D9942C2C5B54000DF6E3 /* CRLURLBuilderTests.swift in Sources */, 5E9D32712109C54B0032FB06 /* CompanyLoginActionTests.swift in Sources */, 1836188BC0E48C1AC1671FC2 /* ZMSyncStrategyTests.swift in Sources */, + 594471BF2EB4D84500A77D75 /* WireLegacyLoggingSupport.swift in Sources */, 015DE3A92DB29D4000DC34E8 /* MockUserSessionDelegate.swift in Sources */, 71AE6F20A2708DCF3BAD54F7 /* ZMOperationLoopTests.swift in Sources */, ); @@ -3755,6 +3762,10 @@ isa = XCSwiftPackageProductDependency; productName = WireAnalyticsSupport; }; + 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLegacyLoggingSupport; + }; 5946F37D2D53DC550039C059 /* WireTestingPackage */ = { isa = XCSwiftPackageProductDependency; productName = WireTestingPackage; From 06f2e6a5dd427d7b7dce4e9d21b948dd50358831 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 12:53:15 +0100 Subject: [PATCH 07/37] format Swift code --- WireLogging/Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 17de321619c..631cd50d5b9 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -50,4 +50,5 @@ for target in package.targets { isCI ? .unsafeFlags(["-warnings-as-errors"]) : nil ].compactMap(\.self) } + let isCI = ProcessInfo.processInfo.environment["CI"] != nil From 92d9f7ea72c9a5153937e9f101a72aec37496e2e Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 13:16:16 +0100 Subject: [PATCH 08/37] Trigger CI From ba6edbff2996f152275d8c5f3ffbccbd624ffd5e Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 13:41:41 +0100 Subject: [PATCH 09/37] pass -warnings-as-errors --- WireLogging/Package.swift | 6 +++++- .../xcshareddata/xcschemes/WireLoggingAll.xcscheme | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) rename WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme => wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme (95%) diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index d65eaa8998d..6a46f066360 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -1,5 +1,6 @@ // swift-tools-version: 6.2 +import Foundation import PackageDescription let package = Package( @@ -32,5 +33,8 @@ for target in package.targets { .enableUpcomingFeature("InternalImportsByDefault"), .enableUpcomingFeature("MemberImportVisibility"), .enableUpcomingFeature("StrictMemorySafety"), - ] + isCI ? .unsafeFlags(["-warnings-as-errors"]) : nil + ].compactMap(\.self) } + +let isCI = ProcessInfo.processInfo.environment["CI"] != nil diff --git a/WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme similarity index 95% rename from WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme rename to wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index 6b7d5c03bed..bf323730e98 100644 --- a/WireLogging/.swiftpm/xcode/xcshareddata/xcschemes/WireLogging.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -18,7 +18,7 @@ BlueprintIdentifier = "WireLogging" BuildableName = "WireLogging" BlueprintName = "WireLogging" - ReferencedContainer = "container:"> + ReferencedContainer = "container:WireLogging"> @@ -58,7 +58,7 @@ BlueprintIdentifier = "WireLogging" BuildableName = "WireLogging" BlueprintName = "WireLogging" - ReferencedContainer = "container:"> + ReferencedContainer = "container:WireLogging"> From 5da431299a69144ee0d2732fe20dc6a0733b2472 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 13:42:46 +0100 Subject: [PATCH 10/37] adjust fastlane files --- fastlane/Fastfile | 9 ++++++++- fastlane/framework.rb | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 85da9d882ae..8b53648f798 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -477,7 +477,14 @@ platform :ios do if build.for_simulator Dir.chdir("..") do # Build the app for simulator - sh "xcodebuild -workspace 'wire-ios-mono.xcworkspace' -scheme 'Wire-iOS' -configuration 'Debug' -destination \"generic/platform=iOS Simulator\" -derivedDataPath DerivedData -quiet build BUILD_NUMBER=#{build.build_number}" + sh "xcodebuild " \ + "-workspace 'wire-ios-mono.xcworkspace' " \ + "-scheme 'Wire-iOS' " \ + "-configuration 'Debug' " \ + "-destination \"generic/platform=iOS Simulator\" " \ + "-derivedDataPath DerivedData " \ + "-quiet build " \ + "BUILD_NUMBER=#{build.build_number}" # make a "fake" .ipa package that QA will use for installing to simulator sh "mkdir -p debug/Payload" diff --git a/fastlane/framework.rb b/fastlane/framework.rb index 8362d19b819..0890b01ccdb 100644 --- a/fastlane/framework.rb +++ b/fastlane/framework.rb @@ -176,7 +176,7 @@ def to_scheme(name) when "WireAnalytics" "WireAnalyticsAll" # if a package has multiple targets, fastlane does not found -Package when "WireLogging" - "WireLogging" + "WireLoggingAll" # if a package has multiple targets, fastlane does not find -Package when "wire-ios-mocktransport" "WireMockTransport" else From 20c206c55db14dbde9a9fcc00df7d0eb37bccff3 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 13:46:35 +0100 Subject: [PATCH 11/37] trigger warning --- WireLogging/Sources/WireLogging/Flow.swift | 2 ++ WireLogging/Tests/TestPlans/AllTests.xctestplan | 2 +- .../xcshareddata/xcschemes/WireLoggingAll.xcscheme | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WireLogging/Sources/WireLogging/Flow.swift b/WireLogging/Sources/WireLogging/Flow.swift index 426ad75c4ad..b3c524e7cac 100644 --- a/WireLogging/Sources/WireLogging/Flow.swift +++ b/WireLogging/Sources/WireLogging/Flow.swift @@ -48,6 +48,8 @@ open class Flow { ) { self.name = name self.logger = WireLogger(tag: tag) + + let i = 0 } // MARK: - Methods diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index ac2c1a8e298..10ba28770a2 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -14,7 +14,7 @@ "testTargets" : [ { "target" : { - "containerPath" : "container:", + "containerPath" : "container:WireLogging", "identifier" : "WireLoggingTests", "name" : "WireLoggingTests" } diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index bf323730e98..787e4182d68 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -30,7 +30,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> From 625ea1d7fdb36c5662c746f8869717b5e33f48d7 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 13:52:52 +0100 Subject: [PATCH 12/37] minor fixes --- WireAnalytics/Package.swift | 1 + WireAuthentication/Package.swift | 2 +- WireLogging/Tests/TestPlans/AllTests.xctestplan | 6 +++--- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- .../xcshareddata/xcschemes/WireLoggingAll.xcscheme | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 1144db07581..fb7237b645f 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -4,6 +4,7 @@ import Foundation import PackageDescription // You can enable/disable Datadog for debugging by overriding the boolean. +// open --env ENABLE_DATADOG=true --env ENABLE_COUNTLY=true wire-ios-mono.xcworkspace let isDatadogEnabled = hasEnvironmentVariable("ENABLE_DATADOG", "true") let isCountlyEnabled = hasEnvironmentVariable("ENABLE_COUNTLY", "true") diff --git a/WireAuthentication/Package.swift b/WireAuthentication/Package.swift index 4c70e12f416..0939cd9f92f 100644 --- a/WireAuthentication/Package.swift +++ b/WireAuthentication/Package.swift @@ -21,7 +21,7 @@ let package = Package( .package(path: "../WireUI"), .package(path: "../WirePlugins"), .package(url: "https://github.com/uber/needle.git", .upToNextMinor(from: "0.25.1")), - .package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0") + .package(url: "https://github.com/siteline/swiftui-introspect", from: "26.0.0"), ], targets: [ .target( diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index 10ba28770a2..a7a5aa8b594 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,15 +1,15 @@ { "configurations" : [ { - "id" : "8C7B2297-3D36-4CFC-9B55-BF2CC1C85BF4", - "name" : "Configuration 1", + "id" : "4D5F2F6E-3C6F-4ED2-AAD7-132E9DA30D40", + "name" : "Test Scheme Action", "options" : { } } ], "defaultOptions" : { - + "performanceAntipatternCheckerEnabled" : true }, "testTargets" : [ { diff --git a/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved b/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved index 09a6e9e494e..7c4b6c95cd9 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -204,8 +204,8 @@ "repositoryURL": "https://github.com/swiftlang/swift-docc-plugin", "state": { "branch": null, - "revision": "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", - "version": "1.4.3" + "revision": "3e4f133a77e644a5812911a0513aeb7288b07d06", + "version": "1.4.5" } }, { @@ -258,8 +258,8 @@ "repositoryURL": "https://github.com/siteline/swiftui-introspect", "state": { "branch": null, - "revision": "807f73ce09a9b9723f12385e592b4e0aaebd3336", - "version": "1.3.0" + "revision": "a08b87f96b41055577721a6e397562b21ad52454", + "version": "26.0.0" } }, { diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index 787e4182d68..0367c2de833 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 31 Oct 2025 14:25:17 +0100 Subject: [PATCH 13/37] minor fix --- WireLogging/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 6a46f066360..5710c9e60bf 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -27,6 +27,8 @@ let package = Package( ] ) +let isCI = ProcessInfo.processInfo.environment["CI"] != nil + for target in package.targets { target.swiftSettings = (target.swiftSettings ?? []) + [ .enableUpcomingFeature("ExistentialAny"), @@ -36,5 +38,3 @@ for target in package.targets { isCI ? .unsafeFlags(["-warnings-as-errors"]) : nil ].compactMap(\.self) } - -let isCI = ProcessInfo.processInfo.environment["CI"] != nil From caf702ac08ec39d64939dcb0c815ed5f100aa97b Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 14:32:26 +0100 Subject: [PATCH 14/37] fix error --- WireLogging/Package.swift | 3 +++ WireLogging/Sources/WireLogging/Flow.swift | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 5710c9e60bf..6b1d48c94b2 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -27,6 +27,9 @@ let package = Package( ] ) +// open --env CI wire-ios-mono.xcworkspace +// or +// CI= swift build let isCI = ProcessInfo.processInfo.environment["CI"] != nil for target in package.targets { diff --git a/WireLogging/Sources/WireLogging/Flow.swift b/WireLogging/Sources/WireLogging/Flow.swift index b3c524e7cac..426ad75c4ad 100644 --- a/WireLogging/Sources/WireLogging/Flow.swift +++ b/WireLogging/Sources/WireLogging/Flow.swift @@ -48,8 +48,6 @@ open class Flow { ) { self.name = name self.logger = WireLogger(tag: tag) - - let i = 0 } // MARK: - Methods From 8a17e57f95e313c3a1195fd77848009d578f00aa Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 14:36:32 +0100 Subject: [PATCH 15/37] minor fixes --- .../Tests/TestPlans/AllTests.xctestplan | 2 +- .../xcschemes/WireLoggingAll.xcscheme | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index a7a5aa8b594..c207acddbfe 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,7 +1,7 @@ { "configurations" : [ { - "id" : "4D5F2F6E-3C6F-4ED2-AAD7-132E9DA30D40", + "id" : "8DA8C849-71C0-4072-92BA-9AF39BAA1039", "name" : "Test Scheme Action", "options" : { diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index 0367c2de833..d35138b815f 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -21,6 +21,20 @@ ReferencedContainer = "container:WireLogging"> + + + + + + + + + + Date: Fri, 31 Oct 2025 16:56:38 +0100 Subject: [PATCH 16/37] delete unused file --- .../WireLogging/WireLoggingPlaceholder.swift | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift diff --git a/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift b/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift deleted file mode 100644 index 07e1459e049..00000000000 --- a/WireLogging/Sources/WireLogging/WireLoggingPlaceholder.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// 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/. -// - -final class Something { - func x() { - let i = 0 - } -} From 3c587408de4cca4d6a33b46390f5c704a764123a Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 17:01:52 +0100 Subject: [PATCH 17/37] Trigger CI From 2157fb31f03e39642d0834e0f3b21d8cfbc42559 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 31 Oct 2025 17:06:09 +0100 Subject: [PATCH 18/37] fix swiftformat action --- .github/workflows/swiftformat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/swiftformat.yml b/.github/workflows/swiftformat.yml index 175d12df3b9..7d6d192c789 100644 --- a/.github/workflows/swiftformat.yml +++ b/.github/workflows/swiftformat.yml @@ -29,6 +29,7 @@ jobs: if: ${{ steps.changes.outputs.swift == 'true' }} - name: Install SwiftFormat 0.58.3 + if: ${{ steps.changes.outputs.swift == 'true' }} run: | curl -L -o swiftformat.zip https://github.com/nicklockwood/SwiftFormat/releases/download/0.58.3/swiftformat_linux.zip unzip swiftformat.zip -d swiftformat_bin @@ -36,4 +37,5 @@ jobs: chmod +x /usr/local/bin/swiftformat - name: Run SwiftFormat + if: ${{ steps.changes.outputs.swift == 'true' }} run: swiftformat --lint . --reporter github-actions-log --config .swiftformat From 31dac0a8f0d78905653a4edfa25c388f04351870 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 13:18:37 +0100 Subject: [PATCH 19/37] add placeholder file --- .../Sources/WireLogging/Placeholder.swift | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 WireLogging/Sources/WireLogging/Placeholder.swift diff --git a/WireLogging/Sources/WireLogging/Placeholder.swift b/WireLogging/Sources/WireLogging/Placeholder.swift new file mode 100644 index 00000000000..89c90917712 --- /dev/null +++ b/WireLogging/Sources/WireLogging/Placeholder.swift @@ -0,0 +1,17 @@ +// +// 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/. +// From b7e5d7e504d20ccdbadd0219e259717256680b0c Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 14:49:09 +0100 Subject: [PATCH 20/37] Trigger CI From 5eaa39bbfcb5c45d969e86781c38c7edeed55017 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 15:11:33 +0100 Subject: [PATCH 21/37] attempt to fix build errors --- .../Tests/TestPlans/AllTests.xctestplan | 1 + .../WireDataModel.xcodeproj/project.pbxproj | 4 ++++ .../Source/Utility/WireLegacyLogging.swift | 21 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index 5b23ecab086..4a5c96a28d8 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -16,6 +16,7 @@ }, "testTargets" : [ { + "parallelizable" : false, "target" : { "containerPath" : "container:WireLogging", "identifier" : "WireLoggingTests", diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 93e8a8f42e3..044be02a867 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -260,6 +260,7 @@ 5966D8342BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */; }; 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */; }; 596A633E2EB3B2860017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A633D2EB3B2860017C3CA /* WireLegacyLogging */; }; + 597476082D019CF9005E891A /* WireLegacyLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597476072D019CF9005E891A /* WireLegacyLogger.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 */; }; @@ -1026,6 +1027,7 @@ 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 = ""; }; + 597476072D019CF9005E891A /* WireLegacyLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogger.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 = ""; }; @@ -2594,6 +2596,7 @@ isa = PBXGroup; children = ( 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */, + 597476072D019CF9005E891A /* WireLegacyLogger.swift */, EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */, F963E9671D9ADD5A00098AD3 /* Protos */, F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */, @@ -3859,6 +3862,7 @@ 63D41E7124597E420076826F /* GenericMessage+Flags.swift in Sources */, 59BAE29D2EB3D99000CA529B /* WireLegacyLogger.swift in Sources */, 5473CC731E14245C00814C03 /* NSManagedObjectContext+Debugging.swift in Sources */, + 597476082D019CF9005E891A /* WireLegacyLogger.swift in Sources */, BF46662A1DCB71B0007463FF /* V3Asset.swift in Sources */, CBF4F17F2D36935300C9638B /* ConnectionValidator.swift in Sources */, F9A706991CAEE01D00C2F5FE /* ZMManagedObject.m in Sources */, diff --git a/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift new file mode 100644 index 00000000000..58ed24879ac --- /dev/null +++ b/wire-ios-sync-engine/Tests/Source/Utility/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 WireLegacyLoggingSupport + +typealias LogFilesProvidingMock = WireLegacyLoggingSupport.LogFilesProvidingMock From 9684f5db0ff0253a6b3abc2b6427e053e1d5ff31 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:06:59 +0100 Subject: [PATCH 22/37] renamings --- .github/workflows/test_pr_changes.yml | 4 +- WireAnalytics/Package.swift | 17 +-- .../Service/AnalyticsService.swift | 2 +- .../WireAnalytics/WireLegacyLogging.swift | 21 ---- .../Sources/WireDatadog/WireDatadog.swift | 2 +- .../Sources/WireDatadog/WireFakeDatadog.swift | 2 +- .../WireDatadog/WireLegacyLogging.swift | 22 ---- WireAuthentication/Package.swift | 5 +- .../DetermineAuthMethodComponent.swift | 2 +- .../WireAuthentication/Needle.generated.swift | 2 +- .../FetchBackendConfigUseCase.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- .../DetermineAuthMethodViewModel.swift | 2 +- .../LoginViaEmailViewModel.swift | 2 +- .../ReloginViaEmailViewModel.swift | 2 +- .../ReloginViaSSOViewModel.swift | 2 +- .../VerificationCodeViewModel.swift | 2 +- .../PersonalAccountCreationViewModel.swift | 2 +- .../VerificationEmailCodeViewModel.swift | 2 +- .../Views/Root/Router.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- WireBackup/Package.swift | 5 +- .../UseCases/CreateBackupUseCase.swift | 2 +- .../UseCases/ImportBackupUseCase.swift | 2 +- .../WireBackup/WireLegacyLogging.swift | 22 ---- .../CreateAndImportBackupUseCaseTests.swift | 2 +- WireCalling/Package.swift | 8 +- WireDomain/Package.swift | 5 +- .../WireDomain/Account/AccountManager.swift | 2 +- .../WireDomain/Account/AccountStore.swift | 2 +- .../Account/BackendEnvironmentStore.swift | 2 +- .../AppVersionMigrationService.swift | 2 +- .../CoreCryptoKeyMigrationManager.swift | 2 +- .../MLSMessageDecryptor.swift | 2 +- .../UpdateEventDecryptor.swift | 2 +- .../ConversationCreateEventProcessor.swift | 2 +- .../ConversationMLSResetEventProcessor.swift | 2 +- ...ConversationMLSWelcomeEventProcessor.swift | 2 +- ...versationMLSMessageAddEventProcessor.swift | 2 +- ...ationProteusMessageAddEventProcessor.swift | 2 +- ...ConversationProtobufMessageProcessor.swift | 2 +- ...ationReceiptModeUpdateEventProcessor.swift | 2 +- .../UpdateEventProcessor.swift | 2 +- .../UserClientRemoveEventProcessor.swift | 2 +- .../UserConnectionEventProcessor.swift | 2 +- .../UserPropertiesDeleteEventProcessor.swift | 2 +- .../LogAttributes/SyncLogAttributes.swift | 2 +- .../AppExtensionPushChannelCoordinator.swift | 2 +- .../InitiateResetMLSConversationUseCase.swift | 2 +- .../MainAppPushChannelCoordinator.swift | 2 +- .../Sources/WireDomain/Needle.generated.swift | 2 +- .../Conversation/Models/CallContent.swift | 2 +- .../Components/Legacy/SyncEventsStep.swift | 2 +- .../Components/NSEClientScope.swift | 2 +- .../GenerateNotificationUseCase.swift | 2 +- .../NotificationServiceExtension.swift | 2 +- .../ProcessNotificationRequestUseCase.swift | 2 +- .../Notifications/PullEventsUseCase.swift | 2 +- .../ShowNotificationUseCase.swift | 2 +- .../Notifications/SyncEventsUseCase.swift | 2 +- .../VerifyUserSessionUseCase.swift | 2 +- .../BackendConfigRepository.swift | 2 +- .../LocalStore/ConversationLocalStore.swift | 2 +- .../Repository/ConversationRepository.swift | 2 +- .../ConversationLabelsLocalStore.swift | 2 +- .../ConversationLabelsRepository.swift | 2 +- .../FeatureConfigLocalStore.swift | 2 +- .../FeatureConfigRepository.swift | 2 +- .../Message/MessageLocalStore.swift | 2 +- .../UpdateEvents/UpdateEventsLocalStore.swift | 2 +- .../Repositories/User/UserLocalStore.swift | 2 +- .../Repositories/User/UserRepository.swift | 2 +- .../UserClients/UserClientsLocalStore.swift | 2 +- .../UnknownMessageProcessingService.swift | 2 +- .../ConsumableNotificationsMigrator.swift | 2 +- .../Synchronization/IncrementalSync.swift | 2 +- .../Synchronization/IncrementalSyncV2.swift | 4 +- .../Synchronization/InitialSync.swift | 2 +- .../Synchronization/MLSGroupRepairAgent.swift | 2 +- .../Synchronization/MLSTransportImpl.swift | 2 +- .../Synchronization/OneOnOneResolver.swift | 2 +- .../PullAllFeatureConfigsSync.swift | 2 +- .../PullLastUpdateEventIDSync.swift | 2 +- .../Synchronization/PullMLSStatusSync.swift | 2 +- .../PullPendingUpdateEventsSync.swift | 2 +- .../PullPendingUpdateEventsV2Sync.swift | 4 +- .../Synchronization/PullResourcesSync.swift | 2 +- .../Synchronization/PushChannelState.swift | 2 +- .../PushSupportedProtocolsSync.swift | 2 +- .../CalculateSupportedProtocolsUseCase.swift | 2 +- .../UseCases/CreateChannelUseCase.swift | 2 +- .../CreateGroupConversationUseCase.swift | 2 +- .../IndividualToTeamMigrationUseCase.swift | 2 +- .../WireDomain/WireLegacyLogging.swift | 24 ---- .../project.pbxproj | 17 +-- WireLogging/Package.swift | 26 +--- .../WireLegacyLogging/AggregatedLogger.swift | 1 - .../WireLegacyLogging/LogAttributes.swift | 6 - .../WireLegacyLogging/LoggerProtocol.swift | 5 +- .../WireLegacyLogging/SystemLogger.swift | 1 - .../WireLogger+Instances.swift | 1 - .../Sources/WireLogging/Placeholder.swift | 17 --- .../Sourcery/AutoMockable.stencil | 1 - .../WireLoggingSupport/Sourcery/sourcery.yml | 8 -- .../WireLoggingSupport/WireLogging.swift | 21 ---- .../Tests/TestPlans/AllTests.xctestplan | 16 +-- .../WireLogging/Network/RequestLogTests.swift | 2 +- .../WireLoggingTestsPlaceholder.swift | 17 --- WireMessaging/Package.swift | 8 +- .../WireCells/DraftsRepository.swift | 2 +- .../WireCells/NodesAPI/AWSClient.swift | 2 +- .../WireCells/NodesAPI/RestAPI.swift | 2 +- .../WireCellsNodeUploadManager.swift | 2 +- .../ClearPublishedDraftsUseCase.swift | 2 +- .../UseCases/UploadDraftUseCase.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- .../AttachmentsCarouselViewModel.swift | 2 +- ...CellsAttachmentsPreviewItemViewModel.swift | 2 +- .../Components/Files/FilesViewModel.swift | 2 +- WireNetwork/Package.swift | 5 +- ...dateEventDecodingProxy+FeatureConfig.swift | 2 +- .../AuthenticationManager.swift | 2 +- .../DomainRegistrationConfiguration.swift | 2 +- .../NetworkService/NetworkService.swift | 2 +- .../Network/NetworkStack/NetworkStack.swift | 2 +- .../Network/PushChannel/PushChannel.swift | 2 +- .../Network/PushChannel/PushChannelV2.swift | 2 +- .../Network/PushChannel/WebSocket.swift | 2 +- .../WireNetwork/WireLegacyLogging.swift | 21 ---- WireUI/Package.swift | 5 +- .../BackupImportExportBuilder.swift | 2 +- .../Export/ExportBackupViewModel.swift | 2 +- .../Import/ImportBackupViewModel.swift | 2 +- .../Previews/PreviewLogger.swift | 2 +- .../WireSettingsUI/WireLegacyLogging.swift | 24 ---- .../Export/ExportBackupViewModelTests.swift | 2 +- ...wModelTestImportBackupViewModelTests.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- fastlane/framework.rb | 38 +++--- .../AuthenticationContext.swift | 2 +- .../Authentication/EAR/EARKeyRepository.swift | 2 +- .../Authentication/EAR/EARService.swift | 2 +- .../Core Crypto/CoreCryptoConfiguration.swift | 2 +- .../Core Crypto/CoreCryptoKeyProvider.swift | 2 +- .../Source/Core Crypto/CoreCryptoLogger.swift | 2 +- .../Core Crypto/CoreCryptoProvider.swift | 2 +- .../Source/Core Crypto/SafeCoreCrypto.swift | 2 +- .../E2EIVerificationStatusService.swift | 2 +- .../ConnectionValidator.swift | 2 +- .../Source/MLS/CreateMLSGroupUseCase.swift | 2 +- .../Source/MLS/MLSActionExecutor.swift | 2 +- .../Source/MLS/MLSClientManager.swift | 2 +- .../Source/MLS/MLSDecryptionService.swift | 2 +- .../Source/MLS/MLSEncryptionService.swift | 2 +- .../Source/MLS/MLSGroupVerification.swift | 2 +- .../Source/MLS/MLSService.swift | 2 +- .../ProteusToMLSMigrationCoordinator.swift | 2 +- .../MLS/OneOnOne/LegacyOneOnOneResolver.swift | 2 +- .../MLS/OneOnOne/OneOnOneMigrator.swift | 2 +- .../MLS/StaleMLSKeyMaterialDetector.swift | 2 +- .../CoreDataStack+Backup.swift | 2 +- .../ManagedObjectContext/CoreDataStack.swift | 2 +- .../106-107/CleanupModels107PreAction.swift | 2 +- .../110-111/PrefillPrimaryKeyAction.swift | 2 +- .../110-111/RemoveDuplicatePreAction.swift | 2 +- .../OneOnOneConversationMigrationAction.swift | 2 +- ...DuplicateOneOnOneConversationsAction.swift | 2 +- .../ForceSyncResourcesPostAction.swift | 2 +- .../130-131/SetCorrectUserTypeAction.swift | 2 +- .../Migration/CoreDataMigrator.swift | 2 +- ...anagedObjectContext+EncryptionAtRest.swift | 2 +- .../NSManagedObjectContext+FetchRequest.swift | 2 +- .../Conversation/ZMConversation+Message.swift | 2 +- .../ZMConversation+Messaging.swift | 2 +- .../ZMConversation+SecurityLevel.swift | 2 +- .../ZMConversation+Timestamps.swift | 2 +- .../ZMConversation+UnreadCount.swift | 2 +- .../AppLock/AppLockController.swift | 2 +- .../Source/Model/Message/FileAssetCache.swift | 2 +- .../Message/GenericMessage+External.swift | 2 +- .../Model/Message/ZMAssetClientMessage.swift | 2 +- .../Message/ZMClientMessage+Encryption.swift | 2 +- .../Model/Message/ZMClientMessage.swift | 2 +- .../Model/Message/ZMGenericMessageData.swift | 2 +- .../Model/Message/ZMMessage+Insert.swift | 2 +- .../Model/Message/ZMOTRMessage+Quotes.swift | 2 +- .../Message/ZMOTRMessage+UpdateEvent.swift | 2 +- .../Source/Model/UserClient/UserClient.swift | 2 +- .../StoredUpdateEvent+Helpers.swift | 2 +- .../Proteus/CryptoboxMigrationManager.swift | 2 +- .../Source/Proteus/ProteusProvider.swift | 2 +- .../Source/Proteus/ProteusService.swift | 2 +- .../LegacyFeatureRepository.swift | 2 +- .../RemoveLocalConversationUseCase.swift | 2 +- .../Source/Utilis/KeychainManager.swift | 2 +- .../Utilis/LastUpdateEventIDRepository.swift | 2 +- .../Source/Utilis/WireLegacyLogger.swift | 24 ---- .../Source/Utilis/ZMUpdateEvent.swift | 2 +- .../UserClientTests+SafeLogging.swift | 2 +- .../WireDataModel.xcodeproj/project.pbxproj | 37 ++---- .../contents.xcworkspacedata | 2 +- .../xcschemes/WireFoundationAll.xcscheme | 6 +- .../xcschemes/WireLoggingAll.xcscheme | 44 ++----- .../Sources/NotificationSession.swift | 2 +- .../Synchronization/OperationLoop.swift | 2 +- .../Strategies/PushNotificationStrategy.swift | 2 +- .../Sources/WireLegacyLogging.swift | 22 ---- .../project.pbxproj | 16 +-- .../Sources/E2EIdentity/E2EIEnrollment.swift | 2 +- .../E2EIdentity/E2EIKeyPackageRotator.swift | 2 +- .../Sources/E2EIdentity/E2EIRepository.swift | 2 +- .../EnrollE2EICertificateUseCase.swift | 2 +- .../Helpers/MessageExpirationTimer.swift | 2 +- .../Helpers/MessageLogAttributesBuilder.swift | 2 +- .../Sources/Helpers/WireLegacyLogging.swift | 24 ---- .../MessageDependencyResolver.swift | 2 +- .../MessageInfoExtractor.swift | 2 +- .../Message Sending/MessageSender.swift | 2 +- .../NotificationStreamSync.swift | 2 +- .../Content/ZMLocalNotification+Events.swift | 2 +- .../Content/ZMLocalNotification.swift | 2 +- .../PushNotificationStatus.swift | 2 +- .../Sources/Payloads/Payload+Coding.swift | 2 +- .../ConnectionPayloadProcessor.swift | 2 +- .../ConversationEventPayloadProcessor.swift | 2 +- .../Helpers/MLSEventProcessor.swift | 2 +- ...MessageSendingStatusPayloadProcessor.swift | 2 +- .../AssetClientMessageRequestStrategy.swift | 2 +- .../Assets/AssetV3UploadRequestStrategy.swift | 2 +- ...inkPreviewAssetUploadRequestStrategy.swift | 2 +- .../LinkPreviewUpdateRequestStrategy.swift | 2 +- .../AvailabilityRequestStrategy.swift | 2 +- .../ClientMessageRequestStrategy.swift | 2 +- .../ConnectionRequestStrategy.swift | 2 +- ...CreateGroupConversationActionHandler.swift | 2 +- .../ConversationEventProcessor.swift | 2 +- .../ConversationParticipantsService.swift | 2 +- .../ConversationRequestStrategy.swift | 2 +- .../Conversation/ConversationService.swift | 2 +- .../MLSConversationParticipantsService.swift | 2 +- .../DeliveryReceiptRequestStrategy.swift | 2 +- .../FeatureConfigRequestStrategy.swift | 2 +- .../FeatureConfigsPayloadProcessor.swift | 2 +- ...hBackendMLSPublicKeysRequestStrategy.swift | 2 +- .../ResetSessionRequestStrategy.swift | 2 +- .../User/UserProfileRequestStrategy.swift | 2 +- .../User/UserPropertyRequestStrategy.swift | 2 +- .../Decoding/EventDecoder+MLS.swift | 2 +- .../Decoding/EventDecoder+Proteus.swift | 2 +- .../Decoding/EventDecoder.swift | 2 +- .../Tests/Helpers/MessagingTestBase.swift | 2 +- .../project.pbxproj | 36 ++---- .../Sources/WireLegacyLogging.swift | 21 ---- .../Sources/ZMConversation+Conversation.swift | 2 +- .../Sources/ZMMessage+Sendable.swift | 2 +- .../WireShareEngine.xcodeproj/project.pbxproj | 16 +-- .../Source/Calling/CallKitManager.swift | 2 +- ...LSConferenceStaleParticipantsRemover.swift | 2 +- .../Calling/WireCallCenterV3+Events.swift | 2 +- .../Source/Calling/WireCallCenterV3+MLS.swift | 2 +- .../Source/Calling/WireCallCenterV3.swift | 2 +- .../Data Model/Conversation+Deletion.swift | 2 +- ...nversation+MessageDestructionTimeout.swift | 2 +- .../Conversation+ReadReceiptMode.swift | 2 +- .../Source/Data Model/Typing.swift | 2 +- .../CertificateRevocationListsChecker.swift | 2 +- .../LocalNotificationDispatcher.swift | 2 +- .../Notifications/VoIPPushManager.swift | 2 +- .../LegacySupportedProtocolsService.swift | 2 +- .../APIMigration/APIMigrationManager.swift | 2 +- .../APIMigration/AccessTokenMigration.swift | 2 +- .../SessionManager/APIVersionResolver.swift | 2 +- .../SessionManager/AVSLogObserver.swift | 2 +- ...kendEnvironmentProvider+Reachability.swift | 2 +- .../SessionManager/PushTokenService.swift | 2 +- .../SessionManager/SessionFactories.swift | 2 +- ...essionManager+CallKitManagerDelegate.swift | 2 +- .../SessionManager+EncryptionAtRest.swift | 2 +- .../SessionManager+PushToken.swift | 2 +- ...ionManager+UserSessionLogoutDelegate.swift | 2 +- ...er+UserSessionSelfUserClientDelegate.swift | 2 +- ...ssionManager+VoIPPushManagerDelegate.swift | 2 +- .../SessionManager/SessionManager.swift | 2 +- .../Source/SessionManager/URLActions.swift | 2 +- .../SessionManager/UpdateEventMigrator.swift | 2 +- .../SessionManager/UserSessionLoader.swift | 2 +- .../Synchronization/EventProcessor.swift | 2 +- .../IncrementalSyncObserver.swift | 2 +- .../Synchronization/QuickSyncObserver.swift | 2 +- .../Strategies/CallingRequestStrategy.swift | 2 +- ...valuateOneOnOneConversationsStrategy.swift | 2 +- .../LabelDownstreamRequestStrategy.swift | 2 +- .../Strategies/LegalHoldRequestStrategy.swift | 2 +- ...tationCredentialVerificationStrategy.swift | 2 +- ...elfSupportedProtocolsRequestStrategy.swift | 2 +- .../TeamDownloadRequestStrategy.swift | 2 +- .../Strategies/UserClientEventConsumer.swift | 2 +- .../UserClientRequestStrategy.swift | 2 +- .../UserImageAssetUpdateStrategy.swift | 2 +- .../Source/Synchronization/SyncAgent.swift | 2 +- .../ZMOperationLoop+PushChannel.swift | 2 +- .../AppendMultipartMessageUseCase.swift | 2 +- ...entityCertificateUpdateStatusUseCase.swift | 2 +- .../GetUserClientFingerprintUseCase.swift | 2 +- .../ImportLegacyBackupUseCase.swift | 2 +- ...yResolveOneOnOneConversationsUseCase.swift | 2 +- .../Use cases/RemoveUserClientUseCase.swift | 2 +- .../Source/Use cases/ShareFileUseCase.swift | 2 +- .../NSManagedObject+CryptoStack.swift | 2 +- .../Source/UserSession/OperationStatus.swift | 2 +- .../Source/UserSession/SyncStatus.swift | 2 +- .../DeepLinkURLActionProcessor.swift | 2 +- .../ImportEventsURLActionProcessor.swift | 2 +- .../ZMClientRegistrationStatus.swift | 2 +- .../AppVersionMigration_4_1_1.swift | 2 +- .../UnknownMessageAppVersionMigration.swift | 2 +- .../ZMUserSession+AccessToken.swift | 2 +- .../ZMUserSession/ZMUserSession+Actions.swift | 2 +- .../ZMUserSession+AnalyticsUser.swift | 2 +- ...erSession+CertificateRevocationLists.swift | 2 +- .../ZMUserSession+EncryptionAtRest.swift | 2 +- .../ZMUserSession+LifeCycle.swift | 2 +- .../ZMUserSession+OneOnOne.swift | 2 +- .../ZMUserSession/ZMUserSession+Push.swift | 2 +- .../ZMUserSession+RecurringAction.swift | 2 +- .../ZMUserSession+WireCallStateObserver.swift | 2 +- .../ZMUserSession/ZMUserSession.swift | 2 +- .../ZMUserSession/ZMUserSessionBuilder.swift | 2 +- .../Source/Utility/WireLegacyLogging.swift | 23 ---- .../APIMigrationManagerTests.swift | 4 +- .../UserSession/ZMUserSessionTestsBase.swift | 2 +- .../ZMUserSessionTests_NetworkState.swift | 4 +- .../Source/Utility/WireLegacyLogging.swift | 21 ---- .../Utility/WireLegacyLoggingSupport.swift | 21 ---- .../WireSyncEngine.xcodeproj/project.pbxproj | 56 +++------ wire-ios-system/Source/ExpiringActivity.swift | 2 +- .../Source/Logging/WireLegacyLogging.swift | 21 ---- wire-ios-system/Source/TimePoint.swift | 2 +- wire-ios-system/Source/WireLoggerObjC.swift | 2 +- wire-ios-system/Source/ZMSAsserts.swift | 2 +- wire-ios-system/Source/ZMSLog.swift | 2 +- .../WireSystem.xcodeproj/project.pbxproj | 15 +-- .../Authentication/ZMAccessTokenHandler.swift | 2 +- .../BackgroundActivityFactory.swift | 2 +- .../Source/Logging/WireLegacyLogging.swift | 22 ---- .../Logging/WireLoggerObjC_LogRequest.swift | 2 +- .../Public/ServerCertificateTrust.swift | 2 +- .../Source/Public/ZMUpdateEvent.swift | 2 +- .../PushChannel/StarscreamPushChannel.swift | 2 +- .../UnauthenticatedTransportSession.swift | 2 +- .../WireTransport.xcodeproj/project.pbxproj | 15 +-- .../Source/Keychain/Keychain.swift | 2 +- .../Source/WireLegacyLogging.swift | 21 ---- .../WireUtilities.xcodeproj/project.pbxproj | 15 +-- .../Tests/Utility/WireLegacyLogging.swift | 21 ---- .../LegacyNotificationService.swift | 2 +- .../NotificationService.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- .../ShareExtensionViewController.swift | 2 +- .../WireLegacyLogging.swift | 21 ---- .../CallEndedAnalyticsControllerTests.swift | 2 +- wire-ios/Wire-iOS.xcodeproj/project.pbxproj | 119 ++++++------------ .../TrackingManager+UIAlertController.swift | 2 +- .../TrackingManager.swift | 2 +- wire-ios/Wire-iOS/Sources/AppDelegate.swift | 2 +- .../Wire-iOS/Sources/AppStateCalculator.swift | 2 +- .../Sources/AuthenticatedRouter.swift | 2 +- .../AuthenticationCoordinator.swift | 2 +- .../Helpers/PasscodeRules+Shared.swift | 2 +- .../RegistrationAnalyticsTracker.swift | 2 +- .../AuthenticationHostingController.swift | 2 +- .../Settings/SettingsPropertyFactory.swift | 2 +- .../Sources/Developer/DebugAlert.swift | 2 +- ...ConversationDeveloperActionsProvider.swift | 2 +- .../UserClientDeveloperActionsProvider.swift | 2 +- .../DeveloperDebugActionsViewModel.swift | 2 +- .../DeveloperE2eiViewModel.swift | 2 +- .../Sources/Helpers/AuthenticationType.swift | 2 +- .../Sources/Helpers/PerformanceDebugger.swift | 2 +- .../Sources/Helpers/SaveFileManager.swift | 2 +- .../TmpFiles/TemporaryFileService.swift | 2 +- .../Sources/Helpers/WireLegacyLogging.swift | 24 ---- .../Conversation+Participants.swift | 2 +- .../Sources/LaunchSequenceOperation.swift | 2 +- .../Image/ProfileImagePickerManager.swift | 2 +- .../Blacklist/BlockerViewController.swift | 2 +- .../CallEndedAnalyticsController.swift | 2 +- .../AVSVideoContainerView.swift | 2 +- .../CollectionsViewController.swift | 2 +- .../CompanyLoginController.swift | 2 +- .../NetworkStatus/NetworkStatusView.swift | 2 +- ...ersationSystemMessageCellDescription.swift | 2 +- ...troller+CanvasViewControllerDelegate.swift | 2 +- ...rsationContentViewController+Forward.swift | 2 +- ...nContentViewController+MessageAction.swift | 2 +- .../ConversationContentViewController.swift | 2 +- .../ConversationTableViewDataSource.swift | 2 +- ...rsationContentViewControllerDelegate.swift | 2 +- .../ConversationViewController.swift | 2 +- .../ConversationCreationController.swift | 2 +- ...ionChannelCreationFormViewController.swift | 2 +- .../Conversation/InputBar/AudioRecorder.swift | 2 +- ...rsationInputBarViewController+Camera.swift | 2 +- ...ersationInputBarViewController+Files.swift | 2 +- ...ionInputBarViewController+SendButton.swift | 2 +- .../ConversationInputBarViewController.swift | 2 +- .../InputBar/Emoji/EmojiRepository.swift | 2 +- ...versationListViewControllerViewModel.swift | 2 +- .../DeviceDetailsViewActionsHandler.swift | 2 +- .../E2EINotificationActionsHandler.swift | 2 +- .../E2EIdentity/OAuthUseCase.swift | 2 +- .../GroupDetailsViewController.swift | 2 +- .../GroupParticipantsDetailViewModel.swift | 2 +- .../ParticipantsSectionController.swift | 2 +- ...ClientViewController+StartUIDelegate.swift | 2 +- .../ZClientViewController.swift | 2 +- ...entNotificationPermissionHintUseCase.swift | 2 +- .../ProfileHeaderViewController.swift | 2 +- .../SelfProfile/SelfProfileViewsMonitor.swift | 2 +- ...ettingsCellDescriptorFactory+Account.swift | 2 +- .../Debug Report/LogFilesProvider.swift | 2 +- .../SettingsDebugReportViewModel.swift | 2 +- .../ClientListViewController.swift | 2 +- .../MFMailComposeViewController+Logs.swift | 2 +- .../StartUI/SearchResultsViewController.swift | 2 +- .../OtherUserClientsListViewController.swift | 2 +- .../UserProfile/ProfileActionsFactory.swift | 2 +- .../UserProfile/ProfileViewController.swift | 2 +- .../ProfileViewControllerViewModel.swift | 2 +- .../Datadog/WireDatadog+LoggerProtocol.swift | 2 +- .../Analytics/WireAnalytics.swift | 2 +- .../FileMetaDataGenerator.swift | 2 +- .../Logging/CocoaLumberjackLogger.swift | 2 +- .../WireLegacyLogging.swift | 28 ----- 434 files changed, 542 insertions(+), 1381 deletions(-) delete mode 100644 WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift delete mode 100644 WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift delete mode 100644 WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift delete mode 100644 WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift delete mode 100644 WireBackup/Sources/WireBackup/WireLegacyLogging.swift delete mode 100644 WireDomain/Sources/WireDomain/WireLegacyLogging.swift delete mode 100644 WireLogging/Sources/WireLogging/Placeholder.swift delete mode 120000 WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil delete mode 100644 WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml delete mode 100644 WireLogging/Sources/WireLoggingSupport/WireLogging.swift delete mode 100644 WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift delete mode 100644 WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift delete mode 100644 WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift delete mode 100644 WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift delete mode 100644 WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift delete mode 100644 wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift delete mode 100644 wire-ios-notification-engine/Sources/WireLegacyLogging.swift delete mode 100644 wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift delete mode 100644 wire-ios-share-engine/Sources/WireLegacyLogging.swift delete mode 100644 wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift delete mode 100644 wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift delete mode 100644 wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift delete mode 100644 wire-ios-system/Source/Logging/WireLegacyLogging.swift delete mode 100644 wire-ios-transport/Source/Logging/WireLegacyLogging.swift delete mode 100644 wire-ios-utilities/Source/WireLegacyLogging.swift delete mode 100644 wire-ios/Tests/Utility/WireLegacyLogging.swift delete mode 100644 wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift delete mode 100644 wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift delete mode 100644 wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift delete mode 100644 wire-ios/WireCommonComponents/WireLegacyLogging.swift diff --git a/.github/workflows/test_pr_changes.yml b/.github/workflows/test_pr_changes.yml index 3ddf68901aa..df339e1c038 100644 --- a/.github/workflows/test_pr_changes.yml +++ b/.github/workflows/test_pr_changes.yml @@ -64,8 +64,8 @@ jobs: WireCalling: - 'WireCalling/**' - 'wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireCallingAll.xcscheme' - WireLogging: - - 'WireLogging/**' + WireLegacyLogging: + - 'WireLegacyLogging/**' WireDomain: - 'WireDomain/**' wire-ios-data-model: diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 59b77729ae3..11d9ac06e83 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -21,17 +21,13 @@ let package = Package( .package(url: "https://github.com/Countly/countly-sdk-ios.git", exact: "25.4.3"), .package(url: "https://github.com/DataDog/dd-sdk-ios.git", exact: "2.27.0"), .package(path: "../WireFoundation"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WirePlugins") ], targets: [ .target( name: "WireAnalytics", - dependencies: [ - "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging") - ] + dependencies: ["WireFoundation", "WireLegacyLogging"] ), .target( name: "WireAnalyticsSupport", @@ -51,10 +47,7 @@ let package = Package( .target( name: "WireDatadog", - dependencies: datadogDependencies() + [ - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging") - ], + dependencies: datadogDependencies() + ["WireLegacyLogging"], sources: datadogFiles() ), @@ -105,9 +98,9 @@ func datadogDependencies() -> [Target.Dependency] { func datadogFiles() -> [String] { if isDatadogEnabled { - ["WireDatadog.swift", "WireLegacyLogging.swift"] + ["WireDatadog.swift"] } else { - ["WireFakeDatadog.swift", "WireLegacyLogging.swift"] + ["WireFakeDatadog.swift"] } } diff --git a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift index 46bf53290c4..8132172fbd7 100644 --- a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift +++ b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift @@ -19,7 +19,7 @@ public import WireFoundation import Foundation -import WireLogging +import WireLegacyLogging /// A service for tracking analytics data generated by the user. diff --git a/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift b/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/WireDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift index 95a36ca274a..2901f5d418a 100644 --- a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLogging +public import WireLegacyLogging import CryptoKit import DatadogCore diff --git a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift index 235e8e5ce8c..04d14bca321 100644 --- a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLogging +public import WireLegacyLogging public final class WireDatadog { diff --git a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift deleted file mode 100644 index aabce498dc4..00000000000 --- a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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 WireLogLevel = WireLegacyLogging.WireLogLevel diff --git a/WireAuthentication/Package.swift b/WireAuthentication/Package.swift index 23111b19bd3..bbafae941d6 100644 --- a/WireAuthentication/Package.swift +++ b/WireAuthentication/Package.swift @@ -17,7 +17,7 @@ let package = Package( dependencies: [ .package(path: "../WireNetwork"), .package(path: "../WireFoundation"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WireUI"), .package(path: "../WirePlugins"), .package(url: "https://github.com/uber/needle.git", .upToNextMinor(from: "0.25.1")), @@ -63,8 +63,7 @@ let package = Package( .target( name: "WireAuthenticationUI", dependencies: [ - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", "WireFoundation", "WireAuthenticationAPI", .product(name: "WireDesign", package: "WireUI"), diff --git a/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift b/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift index 8ea46020a0e..39fb8cd991b 100644 --- a/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift +++ b/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift @@ -19,7 +19,7 @@ import NeedleFoundation import SwiftUI import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork internal import WireAuthenticationUI internal import WireAuthenticationLogic diff --git a/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift b/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift index 1e339422615..8fc27b095c6 100644 --- a/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift +++ b/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift @@ -6,7 +6,7 @@ import NeedleFoundation import SwiftUI import WireAuthenticationAPI import WireFoundation -import WireLogging +import WireLegacyLogging import WireMultiBackendUI import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift b/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift index d76c613d2f1..ec273b64f71 100644 --- a/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift +++ b/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork public struct FetchBackendConfigUseCase: FetchBackendConfigUseCaseProtocol { diff --git a/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift b/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift deleted file mode 100644 index f7df465066d..00000000000 --- a/WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift index 6eaf4aa82ff..d919e4277d5 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift index 4f8d59c7667..97c83601cd8 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift @@ -19,7 +19,7 @@ import Foundation import UIKit import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift index 8dbd93f4bd3..7834e55e0d1 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift @@ -19,7 +19,7 @@ import Foundation import UIKit import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift index 3a2bed616c1..52d65b95d8d 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift index 38f45fb7817..26de20a29c5 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift index 6d393f4f014..70d8028ded1 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift @@ -18,7 +18,7 @@ import SwiftUI import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift index 0f3946db89a..4ab41e3b3d1 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLogging +import WireLegacyLogging @MainActor public final class VerificationEmailCodeViewModel: ObservableObject { diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift index 3571c10d6c0..482955f2725 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift @@ -19,7 +19,7 @@ import Combine import Foundation import SwiftUI -import WireLogging +import WireLegacyLogging @MainActor package protocol Router { diff --git a/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift b/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift deleted file mode 100644 index f7df465066d..00000000000 --- a/WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 88d627c44d8..46bd0a5e565 100644 --- a/WireBackup/Package.swift +++ b/WireBackup/Package.swift @@ -12,7 +12,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMajor(from: "0.9.0")), .package(path: "../WireFoundation"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -21,8 +21,7 @@ let package = Package( dependencies: [ "KaliumBackup", "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", .product(name: "WireUtilitiesPackage", package: "WireFoundation") ] ), diff --git a/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift b/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift index d56be431bbb..181d5992224 100644 --- a/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift +++ b/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift @@ -18,7 +18,7 @@ public import WireUtilitiesPackage public import WireFoundation -public import WireLogging +public import WireLegacyLogging import Foundation @preconcurrency import KaliumBackup diff --git a/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift b/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift index c3a269430f9..9da73cc95c6 100644 --- a/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift +++ b/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLogging +public import WireLegacyLogging public import WireFoundation public import WireUtilitiesPackage diff --git a/WireBackup/Sources/WireBackup/WireLegacyLogging.swift b/WireBackup/Sources/WireBackup/WireLegacyLogging.swift deleted file mode 100644 index 8ac00beb489..00000000000 --- a/WireBackup/Sources/WireBackup/WireLegacyLogging.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift b/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift index e7d2be7fb42..87556bf224d 100644 --- a/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift +++ b/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift @@ -19,7 +19,7 @@ import WireBackupSupport import WireFoundation import WireFoundationSupport -import WireLogging +import WireLegacyLogging import WireUtilitiesPackage import XCTest diff --git a/WireCalling/Package.swift b/WireCalling/Package.swift index d751deed767..6b548347d22 100644 --- a/WireCalling/Package.swift +++ b/WireCalling/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(path: "../WireFoundation"), .package(path: "../WirePlugins"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(name: "WireUI", path: "../WireUI") ], targets: [ @@ -24,8 +24,7 @@ let package = Package( name: "WireCallingDomain", dependencies: [ "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging") + "WireLegacyLogging" ] ), .target( @@ -40,8 +39,7 @@ let package = Package( name: "WireCallingData", dependencies: [ "WireCallingDomain", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging") + "WireLegacyLogging" ] ), .target( diff --git a/WireDomain/Package.swift b/WireDomain/Package.swift index 8d917141070..4fff4f62d90 100644 --- a/WireDomain/Package.swift +++ b/WireDomain/Package.swift @@ -15,7 +15,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(path: "../WireNetwork"), .package(path: "../WireFoundation"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -23,8 +23,7 @@ let package = Package( name: "WireDomainPackage", dependencies: [ "WireNetwork", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", "WireFoundation" ] ), diff --git a/WireDomain/Sources/WireDomain/Account/AccountManager.swift b/WireDomain/Sources/WireDomain/Account/AccountManager.swift index d19930ecb6a..971db252f23 100644 --- a/WireDomain/Sources/WireDomain/Account/AccountManager.swift +++ b/WireDomain/Sources/WireDomain/Account/AccountManager.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public let AccountManagerDidUpdateAccountsNotificationName = Notification .Name("AccountManagerDidUpdateAccountsNotification") diff --git a/WireDomain/Sources/WireDomain/Account/AccountStore.swift b/WireDomain/Sources/WireDomain/Account/AccountStore.swift index 74f5b4fbbd7..9b376b5cd5e 100644 --- a/WireDomain/Sources/WireDomain/Account/AccountStore.swift +++ b/WireDomain/Sources/WireDomain/Account/AccountStore.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift b/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift index 9fbecc47b33..aea27b7a3e0 100644 --- a/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift +++ b/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork public struct BackendEnvironmentStore { diff --git a/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift b/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift index 27405b95d1e..c50f9c864ec 100644 --- a/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift +++ b/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// A service that runs interruptible migrations when the app /// is updated from one version to another. diff --git a/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift b/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift index da65ae74d85..19348bb2bc8 100644 --- a/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift +++ b/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift @@ -18,7 +18,7 @@ import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging public class CoreCryptoKeyMigrationManager: CoreCryptoKeyMigrationManagerProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift b/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift index e8d5bf76054..3dc39b09caf 100644 --- a/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift +++ b/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct MLSMessageDecryptor: MLSMessageDecryptorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift index 3110f1fef7f..da19bc3d0bb 100644 --- a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift +++ b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct UpdateEventDecryptor: UpdateEventDecryptorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift index 23dd8233971..ac2836c7d63 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift index 3ec62c78a92..b14b9e20c73 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct ConversationMLSResetEventProcessor: ConversationMLSResetEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift index 4748506d37b..43af11df3d1 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct ConversationMLSWelcomeEventProcessor: ConversationMLSWelcomeEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift index 22fea5c8cf9..352f4fddce2 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift index 2c4b7eca0db..8e7da116e31 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct ConversationProteusMessageAddEventProcessor: ConversationProteusMessageAddEventProcessorProtocol, diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift index 368f592c017..114a99ac620 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public struct ConversationProtobufMessageProcessor: ConversationProtobufMessageProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift index 4b87a1e42b4..9017d8cdd3c 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift index a6bed111b14..fc8e9c3444f 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork struct UpdateEventProcessor: UpdateEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift index de2da7048d9..df1007d168c 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct UserClientRemoveEventProcessor: UserClientRemoveEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift index 0d44746bbb5..8e3f55d3eca 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork struct UserConnectionEventProcessor: UserConnectionEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift index f88189d0778..bf62a6fe2c2 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift b/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift index 4b5d6f6d8cc..825bc9d0d85 100644 --- a/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift +++ b/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireUtilities /// Sync related logs diff --git a/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift b/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift index f670927acb8..696a01519ad 100644 --- a/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift +++ b/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging public struct YieldRequest { var action: () -> Void diff --git a/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift b/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift index 0ebdbb09435..b8a07e376a5 100644 --- a/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public protocol InitiateResetMLSConversationUseCaseProtocol { diff --git a/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift b/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift index 6d532500aa4..be99f077094 100644 --- a/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift +++ b/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift @@ -15,7 +15,7 @@ // 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 WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MainAppPushChannelCoordinatorProtocol { diff --git a/WireDomain/Sources/WireDomain/Needle.generated.swift b/WireDomain/Sources/WireDomain/Needle.generated.swift index 76121bfab3d..b8d4a25bc3b 100644 --- a/WireDomain/Sources/WireDomain/Needle.generated.swift +++ b/WireDomain/Sources/WireDomain/Needle.generated.swift @@ -6,7 +6,7 @@ import UserNotifications import WireCrypto import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork // swiftlint:disable unused_declaration diff --git a/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift b/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift index 60581eb30f4..de70b203b5c 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging struct CallContent: Decodable { diff --git a/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift b/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift index 554ebef8356..719c60ff1ea 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift @@ -21,7 +21,7 @@ import NeedleFoundation import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork protocol SyncEventsDependency: Dependency { diff --git a/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift b/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift index aa7d4bdf982..4230cb8639f 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift @@ -19,7 +19,7 @@ import Foundation import NeedleFoundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork protocol NSEClientScopeDependency: Dependency { diff --git a/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift index 6e2bf6a6df0..5c3d5d18e86 100644 --- a/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift @@ -19,7 +19,7 @@ import CallKit import UserNotifications import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift b/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift index df344388f99..45b105e664e 100644 --- a/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift +++ b/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift @@ -19,7 +19,7 @@ import NeedleFoundation import UserNotifications import WireDataModel -import WireLogging +import WireLegacyLogging /// Receives and process a push notification through a flow of several steps: /// 1. Process push notification request (`ProcessNotificationRequestStep`) diff --git a/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift index 3d9a5a8845a..3cea0b0a004 100644 --- a/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift @@ -17,7 +17,7 @@ // import UserNotifications -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol ProcessNotificationUseCaseProtocol { diff --git a/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift index 1916c86f875..56be187b6f7 100644 --- a/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift index a42796db53c..3f0c88a3f73 100644 --- a/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift @@ -20,7 +20,7 @@ import CallKit import Foundation import UserNotifications import WireDataModel -import WireLogging +import WireLegacyLogging protocol ShowNotificationUseCaseProtocol { func invoke( diff --git a/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift index 8fc5bcdf65f..ff2d6ded185 100644 --- a/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift index 655078c1996..f4580dbfb8a 100644 --- a/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork /// Observes pending events, process them and generates new notifications content. diff --git a/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift b/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift index f2dc46ab8e6..a396834cd53 100644 --- a/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork final class BackendConfigRepository: BackendConfigRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift index 9ccbf7d55dd..724db980e62 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift @@ -19,7 +19,7 @@ import CoreData import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging public final class ConversationLocalStore: ConversationLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift index b2aac5b357b..9be0e4892ad 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public final class ConversationRepository: ConversationRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift index 21d41063e3b..ec089972dc8 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging public final class ConversationLabelsLocalStore: ConversationLabelsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift index b9ee359da1d..f49a658ff2a 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public class ConversationLabelsRepository: ConversationLabelsRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift index 6b66a24335f..75602c9c55d 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging public final class FeatureConfigLocalStore: FeatureConfigLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift index dcc057f8d6d..e8566a61462 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift @@ -18,7 +18,7 @@ import Combine import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public final class FeatureConfigRepository: FeatureConfigRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift index 261d71a9bad..7d19a0de0d2 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift @@ -20,7 +20,7 @@ import CoreData import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLogging +import WireLegacyLogging public final class MessageLocalStore: MessageLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift index 3119c6856d8..2cc874b5927 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift @@ -18,7 +18,7 @@ import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireUpdateEventCoding diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift index cbf3efac68c..0232cf16aa6 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public final class UserLocalStore: UserLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift index 96a37a24d07..fa8cbd86822 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork public final class UserRepository: UserRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift index 911948847be..fc5da6f9b53 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging public struct UserClientsLocalStore: UserClientsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift b/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift index 589d94dfc8f..cd6afb3049a 100644 --- a/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift +++ b/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging /// Service responsible for processing stored unknown messages when the app is updated /// and new protobuf message types become available. diff --git a/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift b/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift index 517968a8fb4..ca4dc5d6dc7 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork typealias IncrementalSyncV1 = IncrementalSync diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift index 23ccb7bb2ba..bad7a672a6a 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift index 22fe64ec1c0..a262223696e 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift @@ -20,7 +20,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public typealias CreatePushChannelStateClosure = () -> PushChannelStateProtocol @@ -85,7 +85,7 @@ public struct IncrementalSyncV2: LiveSyncProtocol { self.createPushChannelState = createPushChannelState } - private var logAttributes: LogAttributes { + private var logAttributes: WireLegacyLogging.LogAttributes { .incrementalSyncV3 } diff --git a/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift b/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift index 1a41d25bea1..a078caa9594 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLogging +import WireLegacyLogging public struct InitialSync: InitialSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift b/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift index 517706c68a1..41c1ce201ee 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MLSGroupRepairAgentProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift b/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift index bffbda37f68..1979838705f 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift @@ -17,7 +17,7 @@ // import WireCoreCrypto -import WireLogging +import WireLegacyLogging import WireNetwork final class MLSTransportImpl: MlsTransport { diff --git a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift index 8638c2b6a90..27f5454efa3 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift @@ -18,7 +18,7 @@ import CoreData import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public struct OneOnOneResolver: OneOnOneResolverProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift index 2c88490ff6e..33a4ba148a1 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork struct PullAllFeatureConfigsSync: PullAllFeatureConfigsSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift index 4b54a95c52d..505dadc594d 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork struct PullLastUpdateEventIDSync: PullLastUpdateEventIDSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift index 547e770d495..077eb17843a 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public struct PullMLSStatusSync: PullMLSStatusSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift index ddfd4511ffc..ef15f50499b 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork public struct PullPendingUpdateEventsSync: PullPendingUpdateEventsSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift index 4621c18b5e7..9f5aaebc309 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork /// Closure to generate syncMarker, use for testing @@ -65,7 +65,7 @@ public struct PullPendingUpdateEventsSyncV2: PullPendingUpdateEventsSyncV2Protoc self.syncMarkerGenerator = syncMarkerGenerator } - private var logAttributes: LogAttributes { + private var logAttributes: WireLegacyLogging.LogAttributes { .incrementalSyncV3 + .newNSE } diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift index f0e10d14c26..2409cd84d57 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging struct PullResourcesSync: PullResourcesSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift b/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift index f61ed485316..f781ea82f70 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // import WireDataModel -import WireLogging +import WireLegacyLogging /// sourcery: AutoMockable public protocol PushChannelStateProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift index 082a5b26a9e..23c2aae7230 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift index 79b3ab4abf7..3aad611675b 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift index 054f8bd136b..6fc82de2e16 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift index 95afd6683d7..23803e1e4ed 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift index cfc5e8c11e1..3fe2e70f1e5 100644 --- a/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireDomainPackage -import WireLogging +import WireLegacyLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/WireLegacyLogging.swift b/WireDomain/Sources/WireDomain/WireLegacyLogging.swift deleted file mode 100644 index d868cbffa06..00000000000 --- a/WireDomain/Sources/WireDomain/WireLegacyLogging.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// 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 9fc638294f4..66ba5a3b873 100644 --- a/WireDomain/WireDomain Project.xcodeproj/project.pbxproj +++ b/WireDomain/WireDomain Project.xcodeproj/project.pbxproj @@ -17,10 +17,9 @@ 591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */; }; 591B6E472C8B09BD009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01BDA5442C20762200636E50 /* WireDataModelSupport.framework */; }; 59202AD22D54D3D500143413 /* WireDomainPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59202AD12D54D3D500143413 /* WireDomainPackage */; }; - 596A633C2EB3B2800017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A633B2EB3B2800017C3CA /* WireLegacyLogging */; }; 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 */; }; @@ -97,14 +96,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A633C2EB3B2800017C3CA /* WireLegacyLogging in Frameworks */, 598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */, 34DC44B32E01C206004D5DD5 /* WireNetwork in Frameworks */, CB6343F02DB7EF3D00A1C892 /* WireUpdateEventCoding in Frameworks */, 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 */, ); @@ -223,13 +221,12 @@ name = WireDomain; packageProductDependencies = ( 598D042C2C89C63100B64D71 /* WireFoundation */, - 59EA774E2D00CE0C002CA0B8 /* WireLogging */, + 59EA774E2D00CE0C002CA0B8 /* WireLegacyLogging */, C9B4C1F62D4915F10072A0EE /* WireCrypto */, 59DBDE972D395BB50069C64C /* WireDomainPackage */, C91D188D2D7212FC00B63B66 /* NeedleFoundation */, CB6343EF2DB7EF3D00A1C892 /* WireUpdateEventCoding */, 34DC44B22E01C206004D5DD5 /* WireNetwork */, - 596A633B2EB3B2800017C3CA /* WireLegacyLogging */, ); productName = WireDomain; productReference = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; @@ -804,10 +801,6 @@ isa = XCSwiftPackageProductDependency; productName = WireDomainPackage; }; - 596A633B2EB3B2800017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; 598D042C2C89C63100B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; @@ -816,9 +809,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 f7b9cc4deb4..2a156fe8bec 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -4,39 +4,25 @@ import Foundation import PackageDescription let package = Package( - name: "WireLogging", + name: "WireLegacyLogging", platforms: [.iOS("16.4"), .macOS(.v12)], products: [ - .library(name: "WireLogging", targets: ["WireLogging"]), - .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: [ - .target(name: "WireLogging"), - .target( - name: "WireLoggingSupport", - dependencies: ["WireLogging"], - plugins: [ - .plugin(name: "SourceryPlugin", package: "WirePlugins") - ] - ), - .testTarget( - name: "WireLoggingTests", - dependencies: ["WireLogging", "WireLoggingSupport"] - ), - .target(name: "WireLegacyLogging"), .target( name: "WireLegacyLoggingSupport", dependencies: ["WireLegacyLogging"], - plugins: [ - .plugin(name: "SourceryPlugin", package: "WirePlugins") - ] + plugins: [.plugin(name: "SourceryPlugin", package: "WirePlugins")] + ), + .testTarget( + name: "WireLegacyLoggingTests", + dependencies: ["WireLegacyLogging"] ) ] ) diff --git a/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift b/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift index 584fa2dfdf6..d7b33e757ef 100644 --- a/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift +++ b/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift @@ -79,5 +79,4 @@ final class AggregatedLogger: LoggerProtocol { $0.addTag(key, value: value) } } - } diff --git a/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift index d33e973b788..46156742f9c 100644 --- a/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift +++ b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift @@ -50,20 +50,14 @@ 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/WireLegacyLogging/LoggerProtocol.swift b/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift index 51bb3dcdcf7..01e1004dc1f 100644 --- a/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift +++ b/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift @@ -27,7 +27,6 @@ public protocol LoggerProtocol { /// Add an attribute, value to each logs - DataDog only func addTag(_ key: LogAttributesKey, value: String?) - } public extension LoggerProtocol { @@ -36,8 +35,8 @@ public extension LoggerProtocol { var logAttributes = attributes // drop attributes used for visibility and category - logAttributes.removeValue(forKey: .public) - logAttributes.removeValue(forKey: .tag) + logAttributes.removeValue(forKey: LogAttributesKey.public) + logAttributes.removeValue(forKey: LogAttributesKey.tag) guard !logAttributes.isEmpty else { return "" diff --git a/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift b/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift index e7774ea7ed1..7484890299d 100644 --- a/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift +++ b/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift @@ -87,5 +87,4 @@ public class SystemLogger: LoggerProtocol { os_log(osLogType, log: logger, "\(finalMessage)") #endif } - } diff --git a/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift index 56b72febcca..8dfe17ab0ab 100644 --- a/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift +++ b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift @@ -66,5 +66,4 @@ public extension WireLogger { static let supportedProtocols = WireLogger(tag: "supported-protocols") static let search = WireLogger(tag: "search") static let wireCells = WireLogger(tag: "wire-cells") - } diff --git a/WireLogging/Sources/WireLogging/Placeholder.swift b/WireLogging/Sources/WireLogging/Placeholder.swift deleted file mode 100644 index 89c90917712..00000000000 --- a/WireLogging/Sources/WireLogging/Placeholder.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// 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/. -// diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil b/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil deleted file mode 120000 index 384e2627f10..00000000000 --- a/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil +++ /dev/null @@ -1 +0,0 @@ -../../../../WirePlugins/Plugins/SourceryPlugin/Stencils/AutoMockable.stencil \ No newline at end of file diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml deleted file mode 100644 index 408bf4aa4c3..00000000000 --- a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml +++ /dev/null @@ -1,8 +0,0 @@ -sources: -- ${PACKAGE_ROOT_DIR}/Sources/WireLogging -templates: -- ${TARGET_DIR}/Sourcery/AutoMockable.stencil -output: - ${DERIVED_SOURCES_DIR} -args: - autoMockablePublicImports: ["Foundation"] diff --git a/WireLogging/Sources/WireLoggingSupport/WireLogging.swift b/WireLogging/Sources/WireLoggingSupport/WireLogging.swift deleted file mode 100644 index 74d5741b771..00000000000 --- a/WireLogging/Sources/WireLoggingSupport/WireLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index 4a5c96a28d8..a3a5993f77c 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,26 +1,22 @@ { "configurations" : [ { - "id" : "558E1A72-E387-4C4E-A2A8-B2BCD04FDEAF", - "name" : "Configuration 1", + "id" : "8DA8C849-71C0-4072-92BA-9AF39BAA1039", + "name" : "Test Scheme Action", "options" : { } } ], "defaultOptions" : { - "language" : "en", - "region" : "DE", - "threadSanitizerEnabled" : true, - "undefinedBehaviorSanitizerEnabled" : true + "performanceAntipatternCheckerEnabled" : true }, "testTargets" : [ { - "parallelizable" : false, "target" : { - "containerPath" : "container:WireLogging", - "identifier" : "WireLoggingTests", - "name" : "WireLoggingTests" + "containerPath" : "container:WireLegacyLogging", + "identifier" : "WireLegacyLoggingTests", + "name" : "WireLegacyLoggingTests" } } ], diff --git a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift b/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift index d43e8d33e70..40cb662e9af 100644 --- a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift +++ b/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift @@ -18,7 +18,7 @@ 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 deleted file mode 100644 index 89c90917712..00000000000 --- a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// 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/. -// diff --git a/WireMessaging/Package.swift b/WireMessaging/Package.swift index b34889d26b1..6ae548649d2 100644 --- a/WireMessaging/Package.swift +++ b/WireMessaging/Package.swift @@ -19,7 +19,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"), .package(name: "WireFoundation", path: "../WireFoundation"), .package(path: "../WirePlugins"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(name: "WireUI", path: "../WireUI"), .package(path: "../WireData") ], @@ -29,8 +29,7 @@ let package = Package( dependencies: [ .product(name: "CellsSDK", package: "cells-sdk-swift"), "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging") + "WireLegacyLogging" ] ), .target( @@ -38,8 +37,7 @@ let package = Package( dependencies: [ "WireData", "WireMessagingDomain", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", .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/WireMessagingData/WireCells/DraftsRepository.swift b/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift index 7c5fec36e65..5dabef9f8fa 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift @@ -20,7 +20,7 @@ import Collections @preconcurrency import Combine import Foundation package import UniformTypeIdentifiers -import WireLogging +import WireLegacyLogging package import WireMessagingDomain enum DraftsRepositoryError: Error, Equatable { diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift index 9c523ec3e62..bf04c8d66d6 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift @@ -22,7 +22,7 @@ package import Foundation import Smithy import SmithyIdentity import SmithyStreams -import WireLogging +import WireLegacyLogging import WireMessagingDomain // sourcery: AutoMockable diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift index 16f734260f6..4581ae4037a 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift @@ -18,7 +18,7 @@ import CellsSDK import Foundation -import WireLogging +import WireLegacyLogging import WireMessagingDomain enum WireCellsNodesAPIError: Error { diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift b/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift index 910c503e3aa..19b9c64860f 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift @@ -17,7 +17,7 @@ // package import Foundation -import WireLogging +import WireLegacyLogging package import WireMessagingDomain package final actor WireCellsNodeUploadManager: WireCellsNodeUploadManagerProtocol { diff --git a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift index 62ce6d67b1c..c4fefe78511 100644 --- a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift +++ b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging package struct ClearPublishedDraftsUseCase: WireCellsClearPublishedDraftsUseCaseProtocol { diff --git a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift index 08969f0e242..0ba58f4f479 100644 --- a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift +++ b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift @@ -18,7 +18,7 @@ package import Foundation package import UniformTypeIdentifiers -import WireLogging +import WireLegacyLogging enum UploadDraftUseCaseError: Error { diff --git a/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift b/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift deleted file mode 100644 index f7df465066d..00000000000 --- a/WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift index 31d2a500799..79df3c98ece 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift @@ -21,7 +21,7 @@ import UIKit public import WireMessagingDomain import QuickLookThumbnailing import UniformTypeIdentifiers -import WireLogging +import WireLegacyLogging @MainActor public final class AttachmentsCarouselViewModel: ObservableObject { diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift index 790241b8a52..86cdcc2be8f 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import UniformTypeIdentifiers -import WireLogging +import WireLegacyLogging import WireMessagingDomain @MainActor diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift index f583e3239d5..6db57c02cab 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift @@ -20,7 +20,7 @@ import Combine import SwiftUI import UniformTypeIdentifiers import WireFoundation -import WireLogging +import WireLegacyLogging package import WireMessagingDomain import WireMessagingDomainSupport diff --git a/WireNetwork/Package.swift b/WireNetwork/Package.swift index 0cffd480124..d7052053c78 100644 --- a/WireNetwork/Package.swift +++ b/WireNetwork/Package.swift @@ -13,7 +13,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", exact: "1.18.3"), .package(path: "../WirePlugins"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WireFoundation") ], targets: [ @@ -21,8 +21,7 @@ let package = Package( name: "WireNetwork", dependencies: [ "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", .product(name: "WireCrypto", package: "WireFoundation") ] ), diff --git a/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift b/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift index fb2b4b8092d..b7fe5a108f0 100644 --- a/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift +++ b/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension UpdateEventDecodingProxy { diff --git a/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift b/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift index 02b5bf2a75c..f3992d22b35 100644 --- a/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift +++ b/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol AuthenticationManagerProtocol { diff --git a/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift b/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift index 352f4396e0a..9789e70ecfe 100644 --- a/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift +++ b/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift @@ -18,7 +18,7 @@ public import Foundation -import WireLogging +import WireLegacyLogging /// The domain redirect configuration. diff --git a/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift b/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift index f598fb25fcf..6574ec64e7c 100644 --- a/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift +++ b/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging public import Foundation // sourcery: AutoMockable diff --git a/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift b/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift index b8d7929696b..0ea0a5d7993 100644 --- a/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift +++ b/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging /// High level access to a specific backend with automatic api /// version resolution. diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift index 5aa1a595adf..63b7bf45805 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift @@ -19,7 +19,7 @@ public import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging public typealias PushChannelV1 = PushChannel public typealias PushChannelV1Procotol = PushChannelProtocol diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift index 295b23a8646..d0544d9a790 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging /// PushChannel using new consumable notifications public final class PushChannelV2: PushChannelV2Protocol { diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift index e9521871ea8..ff292c0f008 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift @@ -18,7 +18,7 @@ public import Foundation -import WireLogging +import WireLegacyLogging public actor WebSocket: WebSocketProtocol { diff --git a/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift b/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 9802dfcb818..f79b23a078e 100644 --- a/WireUI/Package.swift +++ b/WireUI/Package.swift @@ -30,7 +30,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(name: "WireDomainPackage", path: "../WireDomain"), .package(name: "WireFoundation", path: "../WireFoundation"), - .package(path: "../WireLogging"), + .package(path: "../WireLegacyLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -116,8 +116,7 @@ let package = Package( "WireDesign", .product(name: "WireDomainPackage", package: "WireDomainPackage"), "WireFoundation", - "WireLogging", - .product(name: "WireLegacyLogging", package: "WireLogging"), + "WireLegacyLogging", "WireReusableUIComponents", "WireLocators" ], diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift index b4d254f11bb..45a6ca75416 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift @@ -20,7 +20,7 @@ import SwiftUI import WireDesign import WireDomainPackage import WireFoundation -import WireLogging +import WireLegacyLogging public struct BackupImportExportBuilder { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift index 47f5d2c6ff7..4c28ce6a474 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging @MainActor final class ExportBackupViewModel: ObservableObject { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift index da54df5e037..c62994b43f4 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift @@ -19,7 +19,7 @@ import Foundation import WireDomainPackage import WireFoundation -import WireLogging +import WireLegacyLogging @MainActor final class ImportBackupViewModel: ObservableObject { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift index 9e9e5fd74a1..dc737cb0cac 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging struct PreviewLogger: LoggerProtocol { diff --git a/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift b/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift deleted file mode 100644 index f4c7f4d466a..00000000000 --- a/WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// 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/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift index 4bba1b3129c..3d65daee4dd 100644 --- a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift +++ b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift @@ -18,7 +18,7 @@ import WireFoundation import WireFoundationSupport -import WireLogging +import WireLegacyLogging import WireTestingPackage import XCTest diff --git a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift index a7868b50727..31085226dfc 100644 --- a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift +++ b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift @@ -20,7 +20,7 @@ import Foundation import WireDomainPackage import WireFoundation import WireFoundationSupport -import WireLogging +import WireLegacyLogging import WireTestingPackage import XCTest diff --git a/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift b/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/fastlane/framework.rb b/fastlane/framework.rb index 0890b01ccdb..9038a358353 100644 --- a/fastlane/framework.rb +++ b/fastlane/framework.rb @@ -12,7 +12,7 @@ def self.all "WireFoundation", "WireMessaging", "WireCalling", - "WireLogging", + "WireLegacyLogging", "WireUI", "wire-ios", "wire-ios-canvas", @@ -47,23 +47,23 @@ def self.all frameworks["wire-ios"].add_dependency(frameworks["WireMessaging"]) frameworks["wire-ios"].add_dependency(frameworks["WireCalling"]) frameworks["wire-ios"].add_dependency(frameworks["wire-ios-testing"]) # included in WireiOSTests - frameworks["wire-ios"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-notification-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) - frameworks["wire-ios-notification-engine"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-notification-engine"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireNetwork"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireAnalytics"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireDomain"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["wire-ios-testing"]) # included in WireSyncEngineiOSTests - frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireLegacyLogging"]) - frameworks["wire-ios-share-engine"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-share-engine"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-request-strategy"].add_dependency(frameworks["wire-ios-data-model"]) frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireNetwork"]) - frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-cryptobox"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-images"]) @@ -72,7 +72,7 @@ def self.all frameworks["wire-ios-data-model"].add_dependency(frameworks["WireFoundation"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["WireData"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-testing"]) # included in WireDataModelTests - frameworks["wire-ios-data-model"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-data-model"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-testing"]) frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-cryptobox"]) @@ -81,7 +81,7 @@ def self.all frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-utilities"]) frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-testing"]) # included in WireTransportTests - frameworks["wire-ios-transport"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-transport"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-link-preview"].add_dependency(frameworks["wire-ios-utilities"]) frameworks["wire-ios-link-preview"].add_dependency(frameworks["WireFoundation"]) @@ -90,7 +90,7 @@ def self.all frameworks["wire-ios-utilities"].add_dependency(frameworks["wire-ios-system"]) frameworks["wire-ios-utilities"].add_dependency(frameworks["WireFoundation"]) - frameworks["wire-ios-utilities"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-utilities"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["wire-ios-testing"].add_dependency(frameworks["wire-ios-system"]) @@ -98,30 +98,30 @@ def self.all frameworks["WireDomain"].add_dependency(frameworks["wire-ios-data-model"]) frameworks["WireDomain"].add_dependency(frameworks["WireNetwork"]) frameworks["WireDomain"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireDomain"].add_dependency(frameworks["WireLogging"]) + frameworks["WireDomain"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireNetwork"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireNetwork"].add_dependency(frameworks["WireLogging"]) + frameworks["WireNetwork"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireDomain"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireFoundation"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireUI"]) - frameworks["WireAuthentication"].add_dependency(frameworks["WireLogging"]) + frameworks["WireAuthentication"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireBackup"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireBackup"].add_dependency(frameworks["WireLogging"]) + frameworks["WireBackup"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireMessaging"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireMessaging"].add_dependency(frameworks["WireLogging"]) + frameworks["WireMessaging"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireCalling"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireCalling"].add_dependency(frameworks["WireLogging"]) + frameworks["WireCalling"].add_dependency(frameworks["WireLegacyLogging"]) - frameworks["WireUI"].add_dependency(frameworks["WireLogging"]) + frameworks["WireUI"].add_dependency(frameworks["WireLegacyLogging"]) frameworks["WireUI"].add_dependency(frameworks["WireFoundation"]) frameworks["WireUI"].add_dependency(frameworks["WireDomain"]) - frameworks["WireAnalytics"].add_dependency(frameworks["WireLogging"]) + frameworks["WireAnalytics"].add_dependency(frameworks["WireLegacyLogging"]) frameworks end @@ -175,8 +175,8 @@ def to_scheme(name) name when "WireAnalytics" "WireAnalyticsAll" # if a package has multiple targets, fastlane does not found -Package - when "WireLogging" - "WireLoggingAll" # if a package has multiple targets, fastlane does not find -Package + when "WireLegacyLogging" + "WireLegacyLoggingAll" # if a package has multiple targets, fastlane does not find -Package when "wire-ios-mocktransport" "WireMockTransport" else diff --git a/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift b/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift index e8d86ac1259..4817186514f 100644 --- a/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift +++ b/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift @@ -18,7 +18,7 @@ import Foundation import LocalAuthentication -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable /// An abstraction around authentication via `LAContext`. diff --git a/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift b/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift index e7d3e330864..a985e662909 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import Security -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable protocol EARKeyRepositoryInterface { diff --git a/wire-ios-data-model/Source/Authentication/EAR/EARService.swift b/wire-ios-data-model/Source/Authentication/EAR/EARService.swift index 1b9e7a99865..18f2e4918cc 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARService.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARService.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import LocalAuthentication -import WireLogging +import WireLegacyLogging /// An object that provides encryption at rest. /// diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift index 74e9424d449..5164f832e06 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging import WireSystem public struct CoreCryptoConfiguration { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift index 3921f3e430e..076e97693ff 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging import WireSystem public enum CoreCryptoKeyProviderDefaults: String, DefaultsKey { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift index 2410b01d8c6..96a98570fc9 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging final class CoreCryptoLoggerProxy: CoreCryptoLogger { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift index 2fa58833fbb..5b25aeed20f 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireFoundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol CoreCryptoProviderProtocol { diff --git a/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift b/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift index cd49030f6a1..cf8faf389af 100644 --- a/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift +++ b/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging // MARK: - Protocols diff --git a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift index ae37eff6209..deff71293df 100644 --- a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift +++ b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol E2EIVerificationStatusServiceInterface { diff --git a/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift b/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift index c56fe79c882..cba33cb44f0 100644 --- a/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift +++ b/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift @@ -17,7 +17,7 @@ // import CoreData -import WireLogging +import WireLegacyLogging /// An object responsible for correcting invalid state regarding /// user connections. diff --git a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift index e5c053ac037..0d5bd9e07b7 100644 --- a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift +++ b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift @@ -17,7 +17,7 @@ // import WireCoreCrypto -import WireLogging +import WireLegacyLogging struct CreateMLSGroupUseCase { diff --git a/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift b/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift index 121660046c0..3de394aa26d 100644 --- a/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift +++ b/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging public protocol MLSActionExecutorProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSClientManager.swift b/wire-ios-data-model/Source/MLS/MLSClientManager.swift index 295a0f2dcfb..f7f214c423a 100644 --- a/wire-ios-data-model/Source/MLS/MLSClientManager.swift +++ b/wire-ios-data-model/Source/MLS/MLSClientManager.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MLSClientManagerProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift index 5acca97bb82..01cb79779fb 100644 --- a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging import WireSystem // sourcery: AutoMockable diff --git a/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift b/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift index e5aa0ea71c5..74e97a00ad5 100644 --- a/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MLSEncryptionServiceInterface { diff --git a/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift b/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift index 4d58d67b6ca..88a7a65d342 100644 --- a/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift +++ b/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MLSGroupVerificationProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSService.swift b/wire-ios-data-model/Source/MLS/MLSService.swift index f5b51bebdcc..2ccb32eeef6 100644 --- a/wire-ios-data-model/Source/MLS/MLSService.swift +++ b/wire-ios-data-model/Source/MLS/MLSService.swift @@ -20,7 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork // This is only used in tests, so it should be removed. diff --git a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift index 8af515127d1..f49de446d20 100644 --- a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift +++ b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireTransport import WireUtilities diff --git a/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift b/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift index 8f46102a564..88f7ba2d675 100644 --- a/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift +++ b/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol OneOnOneResolverInterface { diff --git a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift index c39bfea5d5c..c31e91e9073 100644 --- a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift +++ b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol OneOnOneMigratorInterface { diff --git a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift index 5ee76c0634e..8186b156ca8 100644 --- a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift +++ b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol StaleMLSKeyDetectorProtocol { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift index 08e1fb36b9b..7d0b1852b62 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities private let log = ZMSLog(tag: "Backup") diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift index 424f5e2b469..cc26f71a2fa 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import WireData -import WireLogging +import WireLegacyLogging import WireSystem import WireUtilities diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift index 9c7e68a6665..53267593957 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Removes UserClient duplicates and invalid ParticipantRoles class CleanupModels107PreAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift index 8579357acaf..bb2078e36ac 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging class PrefillPrimaryKeyAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift index 81a19271214..ca74c1ae533 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging class RemoveDuplicatePreAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift index f52c46b0423..75ccf7af514 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // Up until model version 2.113, a user was related to their one on one // conversation via the `connection` relationship, ie `user.connection.conversation` diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift index 1953f71ed42..8be01bc68c0 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging final class FixDuplicateOneOnOneConversationsAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift index 19b266675e1..e79a7f17278 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging final class ForceSyncResourcesPostAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift index 834061498fc..afff08d94cd 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// A new user-type property has been introduced with API v12. /// Before users were either regular or service users. diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift index ff5c698ee98..b5ec332adf3 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift @@ -17,7 +17,7 @@ // import CoreData -import WireLogging +import WireLegacyLogging protocol CoreDataMigratorProtocol { associatedtype DatabaseVersion diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift index 8c6bb9959e3..393a60afc91 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift @@ -19,7 +19,7 @@ import Foundation import WireCrypto import WireCryptobox -import WireLogging +import WireLegacyLogging extension Sequence where Element: NSManagedObject { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift index e43e12aac1e..bec62164d40 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public extension NSManagedObjectContext { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift index 5a1a53c7134..0ad4d6588df 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging private let log = ZMSLog(tag: "Conversations") diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift index 6536a165c18..80651077c63 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities public extension ZMConversation { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift index 6a38f0c0bab..69eb94e7e67 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift @@ -20,7 +20,7 @@ import Foundation import GenericMessageProtocol import WireCoreCrypto import WireCryptobox -import WireLogging +import WireLegacyLogging @objc public enum ZMConversationLegalHoldStatus: Int16 { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift index 228cf058ffa..3dfe70f7bbb 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging private extension ZMConversationMessage { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift index e022aa577e9..c8abf06590b 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public extension ZMConversation { diff --git a/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift b/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift index aeef662987f..97a060aca97 100644 --- a/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift +++ b/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift @@ -18,7 +18,7 @@ import Foundation import LocalAuthentication -import WireLogging +import WireLegacyLogging public final class AppLockController: AppLockType { diff --git a/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift b/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift index 46cb57151fe..76e93903d5e 100644 --- a/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift +++ b/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging private let NSManagedObjectContextFileAssetCacheKey = "zm_fileAssetCache" diff --git a/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift b/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift index e705ca4add8..97fecc82b72 100644 --- a/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift +++ b/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging private let zmLog = ZMSLog(tag: "GenericMessage") diff --git a/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift b/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift index 61341e7db4b..68ca59ad061 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging /// An asset message (image, file, ...) @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift b/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift index 110248b4788..14dd274e4f9 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox -import WireLogging +import WireLegacyLogging private var zmLog = ZMSLog(tag: "message encryption") diff --git a/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift b/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift index 8ff4e938412..ba8e402c077 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging import WireSystem @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift b/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift index 58f66d43a74..69411a5c268 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox -import WireLogging +import WireLegacyLogging @objc(ZMGenericMessageData) @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift b/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift index 2a9d40f2c83..346d142a963 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension ZMMessage { @objc diff --git a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift index 5ed6d39513d..f0d061fce20 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging public extension ZMOTRMessage { diff --git a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift index d3ed40958dd..9eff1cf1a8e 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging extension ZMOTRMessage { diff --git a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift index 2c4d8b98f65..1638772b1d3 100644 --- a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift +++ b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift @@ -19,7 +19,7 @@ import CoreLocation import Foundation import WireCryptobox -import WireLogging +import WireLegacyLogging import WireUtilities public let ZMUserClientNumberOfKeysRemainingKey = "numberOfKeysRemaining" diff --git a/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift b/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift index a221d7fe840..239c653b0f3 100644 --- a/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift +++ b/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift @@ -18,7 +18,7 @@ import CoreData import Foundation -import WireLogging +import WireLegacyLogging public extension StoredUpdateEvent { diff --git a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift index 14210c11202..378af4162a6 100644 --- a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift +++ b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSystem // sourcery: AutoMockable diff --git a/wire-ios-data-model/Source/Proteus/ProteusProvider.swift b/wire-ios-data-model/Source/Proteus/ProteusProvider.swift index 5bb2d78f805..8110c5b793c 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusProvider.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusProvider.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities public typealias KeyStorePerformBlock = (UserClientKeysStore) throws -> T diff --git a/wire-ios-data-model/Source/Proteus/ProteusService.swift b/wire-ios-data-model/Source/Proteus/ProteusService.swift index f5bfc80332b..6737410e235 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusService.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging /// A service that provides support for messaging via the Proteus /// end-to-end-encryption protocol. diff --git a/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift b/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift index 16a18f1a3de..18ad8b42750 100644 --- a/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift +++ b/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol LegacyFeatureRepositoryInterface { diff --git a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift index 20edc1ae4ad..0795a1fbd70 100644 --- a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift +++ b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSystem public protocol RemoveLocalConversationUseCaseProtocol { diff --git a/wire-ios-data-model/Source/Utilis/KeychainManager.swift b/wire-ios-data-model/Source/Utilis/KeychainManager.swift index 08149daf53b..7ca01343ab0 100644 --- a/wire-ios-data-model/Source/Utilis/KeychainManager.swift +++ b/wire-ios-data-model/Source/Utilis/KeychainManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol KeychainItemProtocol { diff --git a/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift b/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift index 7f225335ca7..83fdf6f85d1 100644 --- a/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift +++ b/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable @objc diff --git a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift b/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift deleted file mode 100644 index fd17cd04f04..00000000000 --- a/wire-ios-data-model/Source/Utilis/WireLegacyLogger.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// 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/Source/Utilis/ZMUpdateEvent.swift b/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift index 459c79139c0..9834b86892d 100644 --- a/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift +++ b/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift @@ -17,7 +17,7 @@ // import GenericMessageProtocol -import WireLogging +import WireLegacyLogging public enum UpdateEventSource: String { case pushChannel diff --git a/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift b/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift index 926be30cff7..8488a4dc682 100644 --- a/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift +++ b/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import XCTest @testable import WireDataModel diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index 044be02a867..ebf66c9a547 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -27,7 +27,7 @@ 0158DF212C594B3600C7BFFD /* ZMEventModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0158DF1A2C594B1600C7BFFD /* ZMEventModel.xcdatamodeld */; }; 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 */; }; @@ -249,18 +249,15 @@ 591F8A022B8CB4DE00D562A6 /* IsSelfUserE2EICertifiedUseCaseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A012B8CB4DE00D562A6 /* IsSelfUserE2EICertifiedUseCaseProtocol.swift */; }; 591F8A042B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A032B8CB4EF00D562A6 /* IsSelfUserE2EICertifiedUseCase.swift */; }; 591F8A072B8CB82400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */; }; - 594471C52EB4D92200A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C42EB4D92200A77D75 /* WireLegacyLoggingSupport */; }; 5947923D2EA7A576006BEC0A /* store2-131-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = 5947923C2EA7A576006BEC0A /* store2-131-0.wiredatabase */; }; 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 */; }; + 59537CDB2CFF8F2B00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */; }; 5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */; }; 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; }; 5966D8342BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8332BD6ADCA00305BBC /* UserPropertyNormalizerTests.swift */; }; 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8352BD6AF1700305BBC /* UserPropertyNormalizationResult.swift */; }; - 596A633E2EB3B2860017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A633D2EB3B2860017C3CA /* WireLegacyLogging */; }; - 597476082D019CF9005E891A /* WireLegacyLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597476072D019CF9005E891A /* WireLegacyLogger.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 */; }; @@ -277,7 +274,6 @@ 59AAB6492AFCF541005B39E6 /* MessageProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */; }; 59B48C5C2C89CBBD00EA7999 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B48C5B2C89CBBD00EA7999 /* WireFoundation */; }; 59BAE1102C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */; }; - 59BAE29D2EB3D99000CA529B /* WireLegacyLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */; }; 59D1C3062B1DE6FF0016F6B2 /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */; }; 59D1C30E2B1DEC300016F6B2 /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */; }; 59D398D02D552573001C9C5F /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59D398CF2D552573001C9C5F /* WireTestingPackage */; }; @@ -1027,7 +1023,6 @@ 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 = ""; }; - 597476072D019CF9005E891A /* WireLegacyLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogger.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 = ""; }; @@ -1044,7 +1039,6 @@ 599EA3DA2C2485AE009319D4 /* FilterableConversationParticipant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterableConversationParticipant.swift; sourceTree = ""; }; 59AAB6482AFCF541005B39E6 /* MessageProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageProtocolTests.swift; sourceTree = ""; }; 59BAE10F2C3429EB00F8EEDC /* FilterConversationsUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterConversationsUseCaseTests.swift; sourceTree = ""; }; - 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogger.swift; sourceTree = ""; }; 59D1C3002B1DE6FF0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59E1081E2E99149200D8BA62 /* store2-130-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-130-0.wiredatabase"; sourceTree = ""; }; 59EC73F62C20B03100E5C036 /* NSManagedObjectContext+executeFetchRequestOrAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectContext+executeFetchRequestOrAssert.h"; sourceTree = ""; }; @@ -1652,7 +1646,6 @@ EE8DA9672954A02B00F58B79 /* WireCryptobox.framework in Frameworks */, CBD35F2C2D09EBB20080DA37 /* WireCrypto in Frameworks */, 1657FA9A2D9C2EB800A7B337 /* WireCoreCryptoUniffi in Frameworks */, - 596A633E2EB3B2860017C3CA /* WireLegacyLogging in Frameworks */, 591B6E4C2C8B09C6009F8A7B /* CoreData.framework in Frameworks */, EE8DA96D2954A03800F58B79 /* WireLinkPreview.framework in Frameworks */, 5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */, @@ -1661,7 +1654,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 */, ); @@ -1678,9 +1671,8 @@ 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 */, - 594471C52EB4D92200A77D75 /* WireLegacyLoggingSupport in Frameworks */, 5978BFD42E2E6132004778CC /* SwiftProtobuf in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2595,8 +2587,6 @@ F9A706421CAEE01D00C2F5FE /* Utilis */ = { isa = PBXGroup; children = ( - 59BAE29C2EB3D99000CA529B /* WireLegacyLogger.swift */, - 597476072D019CF9005E891A /* WireLegacyLogger.swift */, EE5316412A13B59500A9E0B1 /* LastUpdateEventIDRepository.swift */, F963E9671D9ADD5A00098AD3 /* Protos */, F9331C851CB419B500139ECC /* NSFetchRequest+ZMRelationshipKeyPaths.h */, @@ -3309,7 +3299,7 @@ packageProductDependencies = ( E6707E8F2BBD683F00469D57 /* PINCache */, 59B48C5B2C89CBBD00EA7999 /* WireFoundation */, - 59537CDA2CFF8F2B00920B59 /* WireLogging */, + 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */, CBD35F2B2D09EBB20080DA37 /* WireCrypto */, 01D2B7A22D64A8F50030D28D /* WireCoreCrypto */, 1657FA992D9C2EB800A7B337 /* WireCoreCryptoUniffi */, @@ -3317,7 +3307,6 @@ 59506A872E2E61BD0051B07A /* SwiftProtobuf */, 5950B0342E2EA1070051B07A /* GenericMessageProtocol */, CBB648A42E33D18900FA52AA /* WireData */, - 596A633D2EB3B2860017C3CA /* WireLegacyLogging */, ); productName = WireDataModel; productReference = F9C9A4FC1CAD5DF10039E10C /* WireDataModel.framework */; @@ -3860,9 +3849,7 @@ F9AB00271F0CE5520037B437 /* FileManager+FileLocations.swift in Sources */, F9A7067F1CAEE01D00C2F5FE /* ZMImageMessage.m in Sources */, 63D41E7124597E420076826F /* GenericMessage+Flags.swift in Sources */, - 59BAE29D2EB3D99000CA529B /* WireLegacyLogger.swift in Sources */, 5473CC731E14245C00814C03 /* NSManagedObjectContext+Debugging.swift in Sources */, - 597476082D019CF9005E891A /* WireLegacyLogger.swift in Sources */, BF46662A1DCB71B0007463FF /* V3Asset.swift in Sources */, CBF4F17F2D36935300C9638B /* ConnectionValidator.swift in Sources */, F9A706991CAEE01D00C2F5FE /* ZMManagedObject.m in Sources */, @@ -4559,9 +4546,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 0176B8802E7AE25B005D448B /* WireLogging */ = { + 0176B8802E7AE25B005D448B /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 01D2B7A22D64A8F50030D28D /* WireCoreCrypto */ = { isa = XCSwiftPackageProductDependency; @@ -4579,10 +4566,6 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundationSupport; }; - 594471C42EB4D92200A77D75 /* WireLegacyLoggingSupport */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLoggingSupport; - }; 59506A872E2E61BD0051B07A /* SwiftProtobuf */ = { isa = XCSwiftPackageProductDependency; package = 5978BFD22E2E6132004778CC /* XCRemoteSwiftPackageReference "swift-protobuf" */; @@ -4598,11 +4581,7 @@ package = 5950B0332E2EA1070051B07A /* XCRemoteSwiftPackageReference "generic-message-proto" */; productName = GenericMessageProtocol; }; - 59537CDA2CFF8F2B00920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A633D2EB3B2860017C3CA /* WireLegacyLogging */ = { + 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-mono.xcworkspace/contents.xcworkspacedata b/wire-ios-mono.xcworkspace/contents.xcworkspacedata index 61bd04eebc3..84e6beb3821 100644 --- a/wire-ios-mono.xcworkspace/contents.xcworkspacedata +++ b/wire-ios-mono.xcworkspace/contents.xcworkspacedata @@ -216,7 +216,7 @@ location = "group:WireFoundation"> + location = "group:WireLegacyLogging"> diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme index 9dcfe280a1d..07044d31690 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme @@ -15,9 +15,9 @@ buildForAnalyzing = "YES"> diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme index ea5cd09c916..0052c23b765 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -18,7 +18,7 @@ BlueprintIdentifier = "WireLegacyLogging" BuildableName = "WireLegacyLogging" BlueprintName = "WireLegacyLogging" - ReferencedContainer = "container:WireLogging"> + ReferencedContainer = "container:WireLegacyLogging"> - - - - - - - - + ReferencedContainer = "container:WireLegacyLogging"> @@ -72,7 +44,7 @@ shouldUseLaunchSchemeArgsEnv = "YES"> @@ -81,10 +53,10 @@ skipped = "NO"> + BlueprintIdentifier = "WireLegacyLoggingTests" + BuildableName = "WireLegacyLoggingTests" + BlueprintName = "WireLegacyLoggingTests" + ReferencedContainer = "container:WireLegacyLogging"> @@ -112,7 +84,7 @@ BlueprintIdentifier = "WireLegacyLogging" BuildableName = "WireLegacyLogging" BlueprintName = "WireLegacyLogging" - ReferencedContainer = "container:WireLogging"> + ReferencedContainer = "container:WireLegacyLogging"> diff --git a/wire-ios-notification-engine/Sources/NotificationSession.swift b/wire-ios-notification-engine/Sources/NotificationSession.swift index f12cceea837..553a2a34177 100644 --- a/wire-ios-notification-engine/Sources/NotificationSession.swift +++ b/wire-ios-notification-engine/Sources/NotificationSession.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging import WireRequestStrategy public enum NotificationSessionError: LocalizedError { diff --git a/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift b/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift index 58791faad24..314e890eeb4 100644 --- a/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift +++ b/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireRequestStrategy import WireTransport diff --git a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift index 309add5f118..e415d5e7e50 100644 --- a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift +++ b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy protocol PushNotificationStrategyDelegate: AnyObject { diff --git a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift b/wire-ios-notification-engine/Sources/WireLegacyLogging.swift deleted file mode 100644 index e36f4f22892..00000000000 --- a/wire-ios-notification-engine/Sources/WireLegacyLogging.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index eeae1f84ce2..94f007f429f 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -20,9 +20,7 @@ 591B6E262C8B097B009F8A7B /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE668BC52954BA4C00D939E7 /* WireRequestStrategy.framework */; }; 591B6E2C2C8B0983009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */; }; 591B6E2F2C8B0988009F8A7B /* WireMockTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEC80B5629B6054A00099727 /* WireMockTransport.framework */; }; - 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLogging */; }; - 596A63342EB3B26B0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63332EB3B26B0017C3CA /* WireLegacyLogging */; }; - 59BAE2A52EB3DA3E00CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */; }; + 59537D8D2CFF9FB300920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLegacyLogging */; }; 630A582D29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */; }; EE0BA28A29D59B1D004E93B5 /* NotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */; }; EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */; }; @@ -78,7 +76,6 @@ 06DE7AB62DE4D8A100D79D99 /* WireDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyNotificationSessionLoader.swift; sourceTree = ""; }; 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNotificationSessionTests.swift; sourceTree = ""; }; EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSessionTests.swift; sourceTree = ""; }; EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationStatusDirectory.swift; sourceTree = ""; }; @@ -117,12 +114,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A63342EB3B26B0017C3CA /* WireLegacyLogging in Frameworks */, 06DE7ABF2DE4E39200D79D99 /* WireFoundation in Frameworks */, 06DE7AB72DE4D8A100D79D99 /* WireDomain.framework in Frameworks */, 3431F0892E795B90007BA692 /* WireNetwork in Frameworks */, 591B6E262C8B097B009F8A7B /* WireRequestStrategy.framework in Frameworks */, - 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */, + 59537D8D2CFF9FB300920B59 /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -198,7 +194,6 @@ EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */, 069712952497C1BC00C32169 /* NotificationSession.swift */, 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */, - 59BAE2A42EB3DA3E00CA529B /* WireLegacyLogging.swift */, 066042A0247FE76C00A5F161 /* Assets.xcassets */, 066042A5247FE76C00A5F161 /* Info.plist */, ); @@ -434,7 +429,6 @@ files = ( 067ECB602487ABF700701956 /* AppDelegate.swift in Sources */, EE32460228229FDF00F2A84A /* AuthenticationStatus.swift in Sources */, - 59BAE2A52EB3DA3E00CA529B /* WireLegacyLogging.swift in Sources */, EE32460028229F6B00F2A84A /* ClientRegistrationStatus.swift in Sources */, 069712912497B96E00C32169 /* OperationLoop.swift in Sources */, EE9AEC982BD159C700F7853F /* WireNotificationEngine.docc in Sources */, @@ -832,11 +826,7 @@ isa = XCSwiftPackageProductDependency; productName = WireNetwork; }; - 59537D8C2CFF9FB300920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A63332EB3B26B0017C3CA /* WireLegacyLogging */ = { + 59537D8C2CFF9FB300920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift index 39465adebc9..f277d7bf526 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging public protocol E2EIEnrollmentInterface { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift index a157b9158a3..d7bee37d1ca 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift @@ -20,7 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol E2EIKeyPackageRotating { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift index 743e80f0e51..19f217eff40 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLogging +import WireLegacyLogging public protocol E2EIRepositoryInterface { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift b/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift index 3addbbfb583..65b76822fb3 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public struct OAuthParameters { diff --git a/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift b/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift index 2185f488a8d..b2b4804fed2 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public class MessageExpirationTimer: ZMMessageTimer, ZMContextChangeTracker { diff --git a/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift b/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift index f8298b9559d..9b01edba9eb 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift @@ -18,7 +18,7 @@ import CoreData import WireDataModel -import WireLogging +import WireLegacyLogging /// Provides log attributes for messages of supported message types. struct MessageLogAttributesBuilder { diff --git a/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift b/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift deleted file mode 100644 index 962ee6e9acd..00000000000 --- a/wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// 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/Sources/Message Sending/MessageDependencyResolver.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift index 49b03ebb95f..bb4192329c5 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MessageDependencyResolverInterface { diff --git a/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift index 16e998b829e..6041354a739 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging enum MessageInfoExtractorError: Error { case missingConversation diff --git a/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift index 6083f9cb8a0..6282e9c72ea 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging public enum MessageSendError: Error { case missingMessageProtocol diff --git a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift index c89ff0f18da..06e03d1f475 100644 --- a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift +++ b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public protocol NotificationStreamSyncDelegate: AnyObject { func fetchedEvents(_ events: [ZMUpdateEvent], hasMoreToFetch: Bool) diff --git a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift index 81c4b516012..1395f57f4ee 100644 --- a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift +++ b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging public extension ZMLocalNotification { diff --git a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift index 113934818b5..fa1298f72de 100644 --- a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift +++ b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift @@ -18,7 +18,7 @@ import UserNotifications import WireDataModel -import WireLogging +import WireLegacyLogging /// Defines the various types of local notifications, some of which /// have associated subtypes. diff --git a/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift b/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift index 096775b4861..702e0d5d8b5 100644 --- a/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift +++ b/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging private let zmLog = ZMSLog(tag: "PushNotificationStatus") diff --git a/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift b/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift index 6435a8fce20..f1493fcdea9 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // MARK: JSON Decoder / Encoder diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift index 90b93039d7a..162b2e9ac8f 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging final class ConnectionPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift index 599c88bc49f..8a93aab0706 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging enum ConversationEventPayloadProcessorError: Error { case noBackendConversationId diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift index 7e971e6d0f8..77b57886307 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol MLSEventProcessing { diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift index 6da529bedb1..585dcde025f 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging final class MessageSendingStatusPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift index b40c502f56a..337c4e0cf6e 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// The `AssetClientMessageRequestStrategy` for creating requests to insert the genericMessage of a /// `ZMAssetClientMessage` remotely. This is only necessary for the `/assets/v3' endpoint as we diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift index 0e8586c28a9..3ec06bfbcf7 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging /// AssetV3UploadRequestStrategy is responsible for uploading all the assets associated with a asset message /// after they've been preprocessed (downscaled & encrypted). After all the assets have been uploaded diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift index 7831c933e4d..1838014f86c 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireLinkPreview -import WireLogging +import WireLegacyLogging public final class LinkPreviewDetectorHelper: NSObject { fileprivate static var _test_debug_linkPreviewDetector: LinkPreviewDetectorType? diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift index eb12831899e..6af21c3c5be 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public class LinkPreviewUpdateRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift index b44500ea82c..d61a60002a4 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging public class AvailabilityRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift index e5cd6474b00..4d72505e050 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public class ClientMessageRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift index fa8b534bd49..f2565fc3b33 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public class ConnectionRequestStrategy: AbstractRequestStrategy, ZMRequestGeneratorSource, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift index 528cd74e42d..1878e2fb92f 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public final class CreateGroupConversationAction: EntityAction { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift index 0a9c8a2f020..c33e599bceb 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public class ConversationEventProcessor: NSObject, LegacyConversationEventProcessorProtocol, ZMEventAsyncConsumer { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift index 3e636d50fde..04cff06c643 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol ConversationParticipantsServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift index 9718fe0fea0..f063ebfa37e 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public class ConversationRequestStrategy: AbstractRequestStrategy, ZMRequestGeneratorSource, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift index 7f889161a94..51d9348f48b 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol ConversationServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift index 0856a25629a..7c35a4f9539 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable protocol MLSConversationParticipantsServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift index 4b2f52d7691..47c11988893 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging extension ZMUpdateEvent { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift index 94fa83dcf7d..6d0e7eb272b 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public final class FeatureConfigRequestStrategy: AbstractRequestStrategy { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift index 1450b405481..39f8ea2d12e 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift @@ -18,7 +18,7 @@ import Foundation import protocol WireDataModel.LegacyFeatureRepositoryInterface -import WireLogging +import WireLegacyLogging struct FeatureConfigsPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift index 58e3f1a0651..7977cac2b67 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public final class FetchBackendMLSPublicKeysRequestStrategy: AbstractRequestStrategy { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift index 189e852db84..d1bcbf81dd2 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging public class ResetSessionRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift index 70e78f4b7b9..b6a4d0d0680 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Request strategy for fetching user profiles and processing user update events. /// diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift index 888ee5b9f24..fad50fcdf1a 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireTransport private enum UserProperty: CaseIterable { diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift index 7fbc650886b..49eb4ad2533 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension EventDecoder { diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift index ccac818cd17..a314b84941b 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireCryptobox -import WireLogging +import WireLegacyLogging private let zmLog = ZMSLog(tag: "EventDecoder") diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift index e83873e2f60..f70360ee6ef 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift @@ -20,7 +20,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLogging +import WireLegacyLogging import WireUtilities private let zmLog = ZMSLog(tag: "EventDecoder") diff --git a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift index 97a3298862d..e882faeb3cf 100644 --- a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift +++ b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift @@ -19,7 +19,7 @@ import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLogging +import WireLegacyLogging import WireTesting @testable import WireRequestStrategy diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj index b60a6670430..51a8675d090 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -193,16 +193,13 @@ 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 */; }; - 594471C32EB4D8E200A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */; }; - 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLogging */; }; - 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLogging */; }; - 596A633A2EB3B27A0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63392EB3B27A0017C3CA /* WireLegacyLogging */; }; + 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 */; }; 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04322C89C6CF00B64D71 /* WireFoundation */; }; 598E870D2BF4E08100FC5438 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */; }; - 59BAE2A32EB3DA1400CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */; }; 59D398D22D5525DB001C9C5F /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 59D398D12D5525DB001C9C5F /* WireTestingPackage */; }; 5E68F22722452CDC00298376 /* LinkPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */; }; 5E9EA4DE2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */; }; @@ -706,7 +703,6 @@ 597B70C82B03CC76006C2121 /* UpdateConversationProtocolActionHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandler.swift; sourceTree = ""; }; 597B70CA2B03CC7D006C2121 /* UpdateConversationProtocolActionHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateConversationProtocolActionHandlerTests.swift; sourceTree = ""; }; 598E870C2BF4E08100FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C3112B1DF3AD0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5E68F22622452CDC00298376 /* LinkPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPreprocessor.swift; sourceTree = ""; }; 5E9EA4DD2243C10400D401B2 /* LinkAttachmentsPreprocessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkAttachmentsPreprocessor.swift; sourceTree = ""; }; @@ -975,9 +971,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A633A2EB3B27A0017C3CA /* WireLegacyLogging in Frameworks */, 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */, - 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */, + 59537D852CFF9D1600920B59 /* WireLegacyLogging in Frameworks */, 591B6E3B2C8B09AA009F8A7B /* WireDataModel.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -986,13 +981,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 594471C32EB4D8E200A77D75 /* WireLegacyLoggingSupport in Frameworks */, BF7D9BE11D8C351900949267 /* WireRequestStrategy.framework in Frameworks */, CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */, 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 */, ); @@ -2102,7 +2096,6 @@ F963E8D81D955D4600098AD3 /* Helpers */ = { isa = PBXGroup; children = ( - 59BAE2A22EB3DA1400CA529B /* WireLegacyLogging.swift */, F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */, F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */, F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */, @@ -2203,8 +2196,7 @@ name = WireRequestStrategy; packageProductDependencies = ( 598D04322C89C6CF00B64D71 /* WireFoundation */, - 59537D842CFF9D1600920B59 /* WireLogging */, - 596A63392EB3B27A0017C3CA /* WireLegacyLogging */, + 59537D842CFF9D1600920B59 /* WireLegacyLogging */, ); productName = WireRequestStrategy; productReference = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; @@ -2233,9 +2225,8 @@ name = WireRequestStrategyTests; packageProductDependencies = ( 598D042F2C89C67E00B64D71 /* WireFoundation */, - 59537D862CFF9DF600920B59 /* WireLogging */, + 59537D862CFF9DF600920B59 /* WireLegacyLogging */, 59D398D12D5525DB001C9C5F /* WireTestingPackage */, - 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */, ); productName = WireRequestStrategyTests; productReference = 166901741D707509000FE4AF /* WireRequestStrategyTests.xctest */; @@ -2425,7 +2416,6 @@ F18401C12073BE0800E9F4CC /* ImageV2DownloadRequestStrategy.swift in Sources */, F18401CD2073BE0800E9F4CC /* LinkPreviewPreprocessor.swift in Sources */, E629E3C62B470A8200D526AD /* Payload+UpdateConversationReceiptMode.swift in Sources */, - 59BAE2A32EB3DA1400CA529B /* WireLegacyLogging.swift in Sources */, E69A02172B84F02800126FF6 /* SelfSupportedProtocolsRequestBuilder.swift in Sources */, 169BA1CB25E9507600374343 /* Payload+Coding.swift in Sources */, 6308F8AC2A273E7A0072A177 /* FetchMLSConversationGroupInfoActionHandler.swift in Sources */, @@ -3209,19 +3199,11 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 594471C22EB4D8E200A77D75 /* WireLegacyLoggingSupport */ = { + 59537D842CFF9D1600920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLegacyLoggingSupport; - }; - 59537D842CFF9D1600920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 59537D862CFF9DF600920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; - 596A63392EB3B27A0017C3CA /* WireLegacyLogging */ = { + 59537D862CFF9DF600920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-share-engine/Sources/WireLegacyLogging.swift b/wire-ios-share-engine/Sources/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios-share-engine/Sources/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Sources/ZMConversation+Conversation.swift b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift index 48ec0204571..95d52fe5fe4 100644 --- a/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift +++ b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireRequestStrategy import WireUtilities diff --git a/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift b/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift index f72c2ed0ed4..0c748a99a95 100644 --- a/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift +++ b/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging private extension ZMMessage { diff --git a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj index 01786c511c7..78859706e42 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -23,9 +23,7 @@ 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 */; }; - 596A63362EB3B2700017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63352EB3B2700017C3CA /* WireLegacyLogging */; }; - 59BAE2A12EB3D9EA00CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */; }; + 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 */; }; CE7FBFC41E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */; }; @@ -87,7 +85,6 @@ 5470D4121D76E2A400FDE440 /* project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = project.xcconfig; sourceTree = ""; }; 5470D4151D76E2A400FDE440 /* tests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = tests.xcconfig; sourceTree = ""; }; 5470D4171D76E2A400FDE440 /* warnings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = warnings.xcconfig; sourceTree = ""; }; - 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; BFA18BD31D806050005C281B /* BaseSharingSessionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseSharingSessionTests.swift; sourceTree = ""; }; CB79791C2C748580006FBA58 /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = ""; }; CE7FBFC31E015C5900E1C4C9 /* RequestGeneratorStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestGeneratorStoreTests.swift; sourceTree = ""; }; @@ -134,12 +131,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A63362EB3B2700017C3CA /* WireLegacyLogging in Frameworks */, 06DE04672DE5233100D79D99 /* WireFoundation in Frameworks */, 1606AD122DC5136000C95115 /* WireDomain.framework in Frameworks */, 34DC44AF2E01C1F1004D5DD5 /* WireNetwork in Frameworks */, 591B6E322C8B098C009F8A7B /* WireRequestStrategy.framework in Frameworks */, - 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */, + 59537D8B2CFF9F8F00920B59 /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -279,7 +275,6 @@ 165C55F52551AF1300731CA9 /* SharingSession+EncryptionAtRest.swift */, F1DABF9D1E9B8B6100AD2324 /* SharingTarget.swift */, F1DABF9E1E9B8B6100AD2324 /* StrategyFactory.swift */, - 59BAE2A02EB3D9EA00CA529B /* WireLegacyLogging.swift */, F1DABF9F1E9B8B6100AD2324 /* WireShareEngine.h */, F1DABFA01E9B8B6100AD2324 /* ZMConversation+Conversation.swift */, F1DABFA11E9B8B6100AD2324 /* ZMMessage+Sendable.swift */, @@ -436,7 +431,6 @@ buildActionMask = 2147483647; files = ( 34C5BFAB2E57663C00C0FF34 /* SyncStatus.swift in Sources */, - 59BAE2A12EB3D9EA00CA529B /* WireLegacyLogging.swift in Sources */, 34C5BFA92E57662200C0FF34 /* ApplicationStatusDirectory.swift in Sources */, F1DABFA31E9B8B6100AD2324 /* Conversation.swift in Sources */, 34C5BFA52E5765EF00C0FF34 /* ClientRegistrationStatus.swift in Sources */, @@ -646,11 +640,7 @@ isa = XCSwiftPackageProductDependency; productName = WireNetwork; }; - 59537D8A2CFF9F8F00920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A63352EB3B2700017C3CA /* WireLegacyLogging */ = { + 59537D8A2CFF9F8F00920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift index baf97ba211a..2801e83c424 100644 --- a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift +++ b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift @@ -20,7 +20,7 @@ import avs import CallKit import Foundation import Intents -import WireLogging +import WireLegacyLogging import WireRequestStrategy protocol CallKitManagerDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift b/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift index cc9b096e3f5..e8a5734eeb4 100644 --- a/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift +++ b/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireUtilities /// A class responsible for removing stale participants in a MLS conference. diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift index cfdab0d35ce..21702da901e 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift @@ -18,7 +18,7 @@ import avs import Foundation -import WireLogging +import WireLegacyLogging // MARK: Conversation Changes diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift index fd844d4feec..9e98cd4be6a 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging struct ConferenceParticipantsInfo { let participants: [CallParticipant] diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift index 120d8cd0095..74e3740543b 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift @@ -19,7 +19,7 @@ import avs import Combine import Foundation -import WireLogging +import WireLegacyLogging /// WireCallCenter is used for making Wire calls and observing their state. There can only be one instance of the /// WireCallCenter. diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift index 3a24bfc9f11..bb219849aee 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireSystem public enum ConversationDeletionError: Error { diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift index 14325e43124..f3bd97b5702 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging private let log = ZMSLog(tag: "ConversationMessageDestructionTimeout") diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift index 64fd6a9bed9..d3770fc0782 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public enum ReadReceiptModeError: Error { case invalidOperation diff --git a/wire-ios-sync-engine/Source/Data Model/Typing.swift b/wire-ios-sync-engine/Source/Data Model/Typing.swift index 71351aa2d83..e448c0a078c 100644 --- a/wire-ios-sync-engine/Source/Data Model/Typing.swift +++ b/wire-ios-sync-engine/Source/Data Model/Typing.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging class Typing { diff --git a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift index 3c571347824..002d983cbcc 100644 --- a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift +++ b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol CertificateRevocationListsChecking { diff --git a/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift b/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift index 65016c3666f..7fcecdb740b 100644 --- a/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift +++ b/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import UserNotifications -import WireLogging +import WireLegacyLogging /// Creates and cancels local notifications @objcMembers diff --git a/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift b/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift index aca30d43121..4877ebfc0f4 100644 --- a/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift +++ b/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift @@ -20,7 +20,7 @@ import avs import CallKit import Foundation import PushKit -import WireLogging +import WireLegacyLogging public protocol VoIPPushManagerDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift b/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift index c20513f1a81..28144634356 100644 --- a/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift +++ b/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging import WireRequestStrategy // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift b/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift index 5f7dfd73cb5..d268b159958 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol APIMigration { func perform(with session: ZMUserSession, clientID: String) async throws diff --git a/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift b/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift index 34f62769dcb..d0a598ca8e5 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol AccessTokenRenewalObserver { func accessTokenRenewalDidSucceed() diff --git a/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift b/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift index ece058ac775..0b1890cc50a 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireTransport final class APIVersionResolver { diff --git a/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift b/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift index 2fbc731896a..33922d00b87 100644 --- a/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift @@ -17,7 +17,7 @@ // import avs -import WireLogging +import WireLegacyLogging final class AVSLogObserver: AVSLogger { private var token: Any! diff --git a/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift b/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift index f8a14819c92..2a89ae83b79 100644 --- a/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift +++ b/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public typealias Reachability = ReachabilityProvider & TearDownCapable diff --git a/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift b/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift index b833844e442..f9de46d5120 100644 --- a/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift +++ b/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public final class PushTokenService: PushTokenServiceInterface { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift b/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift index 2acb2710965..8dac87d2374 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift @@ -19,7 +19,7 @@ import avs import WireDataModel import WireDomain -import WireLogging +import WireLegacyLogging import WireNetwork open class AuthenticatedSessionFactory { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift index 819c125e767..61cc015e8a1 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift @@ -18,7 +18,7 @@ import CallKit import Foundation -import WireLogging +import WireLegacyLogging import WireSystem enum ConversationLookupError: Error { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift index 1aa65ba2b9f..7cdbee8e63c 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension SessionManager: UserSessionEncryptionAtRestDelegate { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift index 5cd216c7181..2fed189028f 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift @@ -18,7 +18,7 @@ import Foundation import PushKit -import WireLogging +import WireLegacyLogging extension SessionManager { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift index 14995131586..b0cb9202581 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol UserSessionLogoutDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift index 3a9aaf13f82..0dc02ad9c11 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol UserSessionSelfUserClientDelegate: AnyObject { /// Invoked when a client is successfully registered diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift index 2665c4b997d..40549a5a628 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift @@ -18,7 +18,7 @@ import Foundation import PushKit -import WireLogging +import WireLegacyLogging extension SessionManager: VoIPPushManagerDelegate { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift index 7949da3efce..6033e62877b 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift @@ -25,7 +25,7 @@ import WireAnalytics import WireDataModel import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireRequestStrategy import WireTransport diff --git a/wire-ios-sync-engine/Source/SessionManager/URLActions.swift b/wire-ios-sync-engine/Source/SessionManager/URLActions.swift index f76889999c0..7ad7c16d902 100644 --- a/wire-ios-sync-engine/Source/SessionManager/URLActions.swift +++ b/wire-ios-sync-engine/Source/SessionManager/URLActions.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public enum URLAction: Equatable { diff --git a/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift b/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift index f367102a229..8b7b521ec24 100644 --- a/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift +++ b/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging import WireNetwork import WireTransport diff --git a/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift b/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift index ab509b9d788..40c504916b5 100644 --- a/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift +++ b/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift @@ -19,7 +19,7 @@ import Foundation import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork protocol UserSessionLoaderDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift index c52dd82b0bd..48dc94f8616 100644 --- a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift +++ b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift b/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift index 1914dfd39f8..61ac7d81213 100644 --- a/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift +++ b/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLogging +import WireLegacyLogging final class IncrementalSyncObserver: IncrementalSyncObserverProtocol { diff --git a/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift b/wire-ios-sync-engine/Source/Synchronization/QuickSyncObserver.swift index e65837b9e21..3c15d360fd0 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/Synchronization/Strategies/CallingRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift index b615d02a3f6..8e741bb0b2a 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift @@ -20,7 +20,7 @@ import Combine import Foundation import GenericMessageProtocol import WireDataModel -import WireLogging +import WireLegacyLogging import WireRequestStrategy @objcMembers diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift index c8dbfb171cf..3b175fc5232 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy final class EvaluateOneOnOneConversationsStrategy: AbstractRequestStrategy { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift index fda8ca3a8d0..cc431de3cc4 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging struct LabelUpdate: Codable, Equatable { let id: UUID diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift index 0e1f0bbb97b..2d076b5a91e 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public class LegalHoldRequestStrategy: AbstractRequestStrategy, ZMSingleRequestTranscoder, ZMEventConsumer { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift index 8066144b014..87cacbda1aa 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging final class RegistationCredentialVerificationStrategy: NSObject { let registrationStatus: RegistrationStatusProtocol diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift index 3462cf28da1..233e0bd9317 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging import WireRequestStrategy public final class SelfSupportedProtocolsRequestStrategy: AbstractRequestStrategy, ZMSingleRequestTranscoder { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift index 54a265e3052..d72fcc456d3 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging struct TeamListPayload: Decodable { let hasMore: Bool diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift index 4e53d7b9d17..1985a5696e0 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Consumes self user client update events /// diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift index c925c8f0af8..21222f79445 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift @@ -19,7 +19,7 @@ import Foundation import WireCryptobox import WireDataModel -import WireLogging +import WireLegacyLogging import WireSystem import WireTransport import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift index 5b48f7ebf87..5730cb81b44 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy enum AssetTransportError: Error { diff --git a/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift b/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift index dcd8df17a10..fe4863211a0 100644 --- a/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift +++ b/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift @@ -21,7 +21,7 @@ import Foundation import WireDataModel import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireUtilities // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift index a98c3a4080e..c0614e6220a 100644 --- a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift +++ b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork extension ZMOperationLoop: ZMPushChannelConsumer { diff --git a/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift b/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift index c209687037d..4c9a39c3d2b 100644 --- a/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift @@ -19,7 +19,7 @@ import WireAnalytics import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging public protocol AppendMultipartMessageUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift index d6ac19e3aa8..46cdb1f8837 100644 --- a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging public enum E2EIdentityCertificateUpdateStatus { diff --git a/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift b/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift index 4dd68c5d17f..19b2e26b7d3 100644 --- a/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift b/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift index 6b4abcd8ba5..7c38115b31f 100644 --- a/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift @@ -21,7 +21,7 @@ import WireCrypto import WireDataModel import WireDomainPackage import WireFoundation -import WireLogging +import WireLegacyLogging import WireSystem import WireUtilitiesPackage diff --git a/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift b/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift index aecdc25bdc3..5f16d6659b0 100644 --- a/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol LegacyResolveOneOnOneConversationsUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift b/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift index 6a63de4f289..34a0a053809 100644 --- a/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol RemoveUserClientUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift index bd86f06b8a8..abb99e80a70 100644 --- a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging // sourcery: AutoMockable public protocol ShareFileUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift b/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift index 59794a00319..c7123274876 100644 --- a/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift +++ b/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public extension NSManagedObjectContext { diff --git a/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift b/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift index 15e254ba00a..d172a38b187 100644 --- a/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public typealias BackgroundFetchHandler = (_ fetchResult: UIBackgroundFetchResult) -> Void diff --git a/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift b/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift index adb0cb43cf8..87c85635f1e 100644 --- a/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift @@ -17,7 +17,7 @@ // import WireDomain -import WireLogging +import WireLegacyLogging private let zmLog = ZMSLog(tag: "SyncStatus") diff --git a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift index 8a4243cce27..cd628276898 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireRequestStrategy class DeepLinkURLActionProcessor: URLActionProcessor { diff --git a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift index d78b7493993..c415d0309ae 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging enum ImportEventsError: Error { case fileNotFound(String) diff --git a/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift b/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift index 073ab8c2d9f..4858447104b 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireSystem public extension Bundle { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift index e848c0020ab..35f4e2467fa 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLogging +import WireLegacyLogging /// **Issue:** some users had conversations in their database that weren't /// fully up do date with the backend. diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift index b81566301d0..e2b90af646c 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift @@ -19,7 +19,7 @@ import GenericMessageProtocol import WireDataModel import WireDomain -import WireLogging +import WireLegacyLogging import WireNetwork /// This migration should be used to re-process events which were received before but couldn't be deserialized due to diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift index 87bb25471ad..f108d977acf 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension ZMUserSession: AccessTokenRenewing { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift index c66bbf07537..3c31b41a01d 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLogging +import WireLegacyLogging @objc public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift index 93de0949802..5fc6d13a89b 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift @@ -21,7 +21,7 @@ import GenericMessageProtocol import WireAnalytics import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging extension ZMUserSession: AnalyticsEventTrackerProvider { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift index a8aaa9dd5af..850e0db0c3e 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift index 91e92c80b99..6cd237ba263 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import WireDataModel -import WireLogging +import WireLegacyLogging public protocol UserSessionEncryptionAtRestInterface { var encryptMessagesAtRest: Bool { get } diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift index ad4d317f5d1..96503a227fc 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift index ff40f14817a..6767aea9d2d 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift index b7087113403..87e600c68a9 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift @@ -19,7 +19,7 @@ import Foundation import UserNotifications import WireDomain -import WireLogging +import WireLegacyLogging import WireRequestStrategy import WireTransport diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift index 2aaa2beb588..39613169e6b 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift index 9ebdadcd0c9..1af5420264d 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging extension ZMUserSession: WireCallCenterCallStateObserver { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift index 8662c99bbf1..f85ff793aeb 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift @@ -23,7 +23,7 @@ import Foundation import WireCoreCrypto import WireDataModel import WireDomain -import WireLogging +import WireLegacyLogging import WireNetwork import WireRequestStrategy import WireSystem diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift index c510d519f42..4396ecb5014 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift @@ -20,7 +20,7 @@ import Foundation import WireDataModel import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireRequestStrategy import WireUtilities diff --git a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift deleted file mode 100644 index 676b0da3ad5..00000000000 --- a/wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// 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/SessionManager/APIMigrationManagerTests.swift b/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift index 1b05a21172b..cfb3495a2c7 100644 --- a/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift +++ b/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift @@ -19,11 +19,11 @@ import Foundation import WireDataModelSupport import WireDomain -import WireLoggingSupport +import WireLegacyLoggingSupport import WireNetwork import XCTest -@testable import WireLogging +@testable import WireLegacyLogging @testable import WireSyncEngine @testable import WireSyncEngineSupport @testable import WireTransport diff --git a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift index 20054bcac4d..1c4ac2b0e7f 100644 --- a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift +++ b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift @@ -19,7 +19,7 @@ import Combine import WireDataModelSupport import WireDomain -import WireLoggingSupport +import WireLegacyLoggingSupport import WireNetwork import WireRequestStrategySupport import WireTransportSupport diff --git a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift index 1a9453f94b2..90f1f2176db 100644 --- a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift +++ b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift @@ -18,10 +18,10 @@ import WireDataModelSupport import WireDomain -import WireLoggingSupport +import WireLegacyLoggingSupport import XCTest -@testable import WireLogging +@testable import WireLegacyLogging @testable import WireSyncEngine @testable import WireSyncEngineSupport diff --git a/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift b/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift deleted file mode 100644 index 58ed24879ac..00000000000 --- a/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Tests/Source/Utility/WireLegacyLoggingSupport.swift b/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift deleted file mode 100644 index 58ed24879ac..00000000000 --- a/wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 f9f7234e8da..d23c7c66d30 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -35,7 +35,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 */; }; @@ -256,22 +256,18 @@ 59358C8C2DF19ED700C32162 /* WireAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 59358C8B2DF19ED700C32162 /* WireAnalytics */; }; 59358C902DF1A01300C32162 /* WireAnalyticsSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59358C8F2DF1A01300C32162 /* WireAnalyticsSupport */; }; 5943E9BC2D11CB3B00D39FFF /* CallEndedReason+initWithCallClosedReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5943E9BB2D11CB3300D39FFF /* CallEndedReason+initWithCallClosedReason.swift */; }; - 594471BF2EB4D84500A77D75 /* WireLegacyLoggingSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */; }; - 594471C12EB4D87000A77D75 /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */; }; 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 */; }; - 596A63382EB3B2760017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63372EB3B2760017C3CA /* WireLegacyLogging */; }; 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */; }; 597B70C32B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */; }; 598D04362C89C6FB00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04352C89C6FB00B64D71 /* WireFoundation */; }; 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 */; }; - 59BAE29F2EB3D9C400CA529B /* WireLegacyLogging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */; }; - 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 */; }; 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */; }; 59E6A9142B4EE5CF00DBCC6B /* RecurringAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59E6A9132B4EE5CF00DBCC6B /* RecurringAction.swift */; }; @@ -849,11 +845,9 @@ 59271BE72B908DAC0019B726 /* SecurityClassificationProviding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityClassificationProviding.swift; sourceTree = ""; }; 59271BE92B908E150019B726 /* SecurityClassification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityClassification.swift; sourceTree = ""; }; 5943E9BB2D11CB3300D39FFF /* CallEndedReason+initWithCallClosedReason.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CallEndedReason+initWithCallClosedReason.swift"; sourceTree = ""; }; - 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLoggingSupport.swift; sourceTree = ""; }; 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ZMUserSession+DeveloperMenu.swift"; sourceTree = ""; }; 598E87012BF4DE9600FC5438 /* WireSystemSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireSystemSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireUtilitiesSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireLegacyLogging.swift; sourceTree = ""; }; 59D1C30F2B1DEE6E0016F6B2 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59DA5E1F2DA7ED95007C3629 /* WireDomainSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomainSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 59E6A9132B4EE5CF00DBCC6B /* RecurringAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecurringAction.swift; sourceTree = ""; }; @@ -1252,7 +1246,7 @@ 342DDD882E66B41300A94CCF /* WireNetwork in Frameworks */, 06E47CF12E16E3AE0096FEEA /* WireSyncEngine.framework in Frameworks */, 59C8F6522DF1BE17005AAC9D /* WireFoundation in Frameworks */, - 06E47CF02E16E3A70096FEEA /* WireLogging in Frameworks */, + 06E47CF02E16E3A70096FEEA /* WireLegacyLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1275,7 +1269,6 @@ 5946F37E2D53DC550039C059 /* WireTestingPackage in Frameworks */, 59DA5E202DA7ED95007C3629 /* WireDomainSupport.framework in Frameworks */, 5996E8952C19CB36007A52F0 /* WireUtilitiesSupport.framework in Frameworks */, - 594471C12EB4D87000A77D75 /* WireLegacyLoggingSupport in Frameworks */, CB4895532C4FB77C00CA2C25 /* WireTesting.framework in Frameworks */, 594EAA002EA23E73009BC0EB /* WireUtilitiesPackageSupport in Frameworks */, 59202AD42D54D49400143413 /* WireDomainPackage in Frameworks */, @@ -1284,7 +1277,7 @@ 54F4DC5A1A4438B300FDB6EA /* WireSyncEngine.framework in Frameworks */, 59919E092DACFEED00EF63C7 /* WireFoundationSupport in Frameworks */, 59358C902DF1A01300C32162 /* WireAnalyticsSupport in Frameworks */, - 59BB29252E29527500C49DB6 /* WireLoggingSupport in Frameworks */, + 59BB29252E29527500C49DB6 /* WireLegacyLoggingSupport in Frameworks */, EE4E6A262B714490007C476D /* WireRequestStrategySupport.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1301,10 +1294,9 @@ 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 */, - 596A63382EB3B2760017C3CA /* WireLegacyLogging in Frameworks */, 5972B0D92E9EAB78005E6417 /* WireUtilitiesPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2182,7 +2174,6 @@ EE2DE5EB29263C5100F42F4C /* Logger.swift */, 5E8EE1F920FDC7D700DB1F9B /* Pasteboard.swift */, EE0CAEAE2AAF2E8E00BD2DB7 /* URLSession+MinTLSVersion.swift */, - 59BAE29E2EB3D9C400CA529B /* WireLegacyLogging.swift */, E91180E02CA6FD3E00DD63E2 /* ZMConversationMessage+SelfUserReactions.swift */, ); path = Utility; @@ -2193,11 +2184,10 @@ children = ( 543ED0001D79E0EE00A9CDF3 /* ApplicationMock.swift */, 879634411F7BEC5100FC79BA /* DispatchQueueSerialAsyncTests.swift */, - 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */, + F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */, 163FB9922052EA4600E74F83 /* OperationLoopNewRequestObserver.swift */, 169E303120D29C200012C219 /* PushRegistryMock.swift */, - 594471BE2EB4D84000A77D75 /* WireLegacyLoggingSupport.swift */, - F16C8BC32040715800677D31 /* ZMUpdateEvent+Testing.swift */, + 5E67168F2174CA6300522E61 /* MockUser+LoginCredentials.swift */, 169BA1FE25ED0DAD00374343 /* ZMUserSession+Messages.swift */, ); path = Utility; @@ -2520,7 +2510,7 @@ name = WireSyncEngineSupport; packageProductDependencies = ( 59C8F6512DF1BE17005AAC9D /* WireFoundation */, - 06E47CEF2E16E3A70096FEEA /* WireLogging */, + 06E47CEF2E16E3A70096FEEA /* WireLegacyLogging */, 342DDD872E66B41300A94CCF /* WireNetwork */, ); productName = WireSyncEngineSupport; @@ -2571,9 +2561,8 @@ 59919E082DACFEED00EF63C7 /* WireFoundationSupport */, 59358C8F2DF1A01300C32162 /* WireAnalyticsSupport */, 34F8CA972E02BFEB000FE4E0 /* WireNetwork */, - 59BB29242E29527500C49DB6 /* WireLoggingSupport */, + 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */, 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */, - 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */, ); productName = "WireSyncEngine-iOS-Tests"; productReference = 3E1860C3191A649D000FE027 /* UnitTests.xctest */; @@ -2601,7 +2590,7 @@ name = "WireSyncEngine-ios"; packageProductDependencies = ( 598D04352C89C6FB00B64D71 /* WireFoundation */, - 59537D882CFF9E7700920B59 /* WireLogging */, + 59537D882CFF9E7700920B59 /* WireLegacyLogging */, CBD35F292D09EBA50080DA37 /* WireCrypto */, 594C0FCD2D541643003D8183 /* WireDomainPackage */, 01C774282D9EF01400A2FF07 /* WireAVS */, @@ -2609,7 +2598,6 @@ 34DC44B02E01C1FC004D5DD5 /* WireNetwork */, 596A19E92E9E523100E190AE /* ZIPFoundation */, 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */, - 596A63372EB3B2760017C3CA /* WireLegacyLogging */, ); productName = "WireSyncEngine-ios"; productReference = 549815931A43232400A7CE2E /* WireSyncEngine.framework */; @@ -2967,7 +2955,6 @@ 0678D9942C2C5B54000DF6E3 /* CRLURLBuilderTests.swift in Sources */, 5E9D32712109C54B0032FB06 /* CompanyLoginActionTests.swift in Sources */, 1836188BC0E48C1AC1671FC2 /* ZMSyncStrategyTests.swift in Sources */, - 594471BF2EB4D84500A77D75 /* WireLegacyLoggingSupport.swift in Sources */, 015DE3A92DB29D4000DC34E8 /* MockUserSessionDelegate.swift in Sources */, 71AE6F20A2708DCF3BAD54F7 /* ZMOperationLoopTests.swift in Sources */, ); @@ -3254,7 +3241,6 @@ 54131BC625C7F71400CE2CA2 /* LoginDelegate.swift in Sources */, 167F383B23E0416E006B6AA9 /* UnauthenticatedSession+SSO.swift in Sources */, EEE186B6259CCA14008707CA /* SessionManager+AppLock.swift in Sources */, - 59BAE29F2EB3D9C400CA529B /* WireLegacyLogging.swift in Sources */, 54257C081DF1C94200107FE7 /* TopConversationsDirectory.swift in Sources */, 166B2B5E23E86522003E8581 /* ZMUserSession.swift in Sources */, F9ABE8511EFD568B00D83214 /* TeamRequestFactory.swift in Sources */, @@ -3734,9 +3720,9 @@ isa = XCSwiftPackageProductDependency; productName = WireAVS; }; - 06E47CEF2E16E3A70096FEEA /* WireLogging */ = { + 06E47CEF2E16E3A70096FEEA /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 342DDD872E66B41300A94CCF /* WireNetwork */ = { isa = XCSwiftPackageProductDependency; @@ -3762,10 +3748,6 @@ isa = XCSwiftPackageProductDependency; productName = WireAnalyticsSupport; }; - 594471C02EB4D87000A77D75 /* WireLegacyLoggingSupport */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLoggingSupport; - }; 5946F37D2D53DC550039C059 /* WireTestingPackage */ = { isa = XCSwiftPackageProductDependency; productName = WireTestingPackage; @@ -3778,19 +3760,15 @@ isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackageSupport; }; - 59537D882CFF9E7700920B59 /* WireLogging */ = { + 59537D882CFF9E7700920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 596A19E92E9E523100E190AE /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; package = 596A19E82E9E523100E190AE /* XCRemoteSwiftPackageReference "ZIPFoundation" */; productName = ZIPFoundation; }; - 596A63372EB3B2760017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; 5972B0D82E9EAB78005E6417 /* WireUtilitiesPackage */ = { isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackage; @@ -3803,9 +3781,9 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundationSupport; }; - 59BB29242E29527500C49DB6 /* WireLoggingSupport */ = { + 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */ = { isa = XCSwiftPackageProductDependency; - productName = WireLoggingSupport; + productName = WireLegacyLoggingSupport; }; 59C8F6512DF1BE17005AAC9D /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; diff --git a/wire-ios-system/Source/ExpiringActivity.swift b/wire-ios-system/Source/ExpiringActivity.swift index 6a500ebc6bb..a01941f09f2 100644 --- a/wire-ios-system/Source/ExpiringActivity.swift +++ b/wire-ios-system/Source/ExpiringActivity.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging protocol ExpiringActivityInterface { diff --git a/wire-ios-system/Source/Logging/WireLegacyLogging.swift b/wire-ios-system/Source/Logging/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios-system/Source/Logging/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Source/TimePoint.swift b/wire-ios-system/Source/TimePoint.swift index a606888b16f..48bf8322162 100644 --- a/wire-ios-system/Source/TimePoint.swift +++ b/wire-ios-system/Source/TimePoint.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Records the passage of time since its creation. It also stores the callstack at creation time. @objc(ZMSTimePoint) @objcMembers diff --git a/wire-ios-system/Source/WireLoggerObjC.swift b/wire-ios-system/Source/WireLoggerObjC.swift index 7d22c45f311..fe726f503a9 100644 --- a/wire-ios-system/Source/WireLoggerObjC.swift +++ b/wire-ios-system/Source/WireLoggerObjC.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Class to proxy WireLogger methods to Objective-C @objcMembers diff --git a/wire-ios-system/Source/ZMSAsserts.swift b/wire-ios-system/Source/ZMSAsserts.swift index 21bedf7eb6b..75999e13375 100644 --- a/wire-ios-system/Source/ZMSAsserts.swift +++ b/wire-ios-system/Source/ZMSAsserts.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging /// Reports an error and terminates the application public func fatal( diff --git a/wire-ios-system/Source/ZMSLog.swift b/wire-ios-system/Source/ZMSLog.swift index 2956ebd5e38..7e736f87667 100644 --- a/wire-ios-system/Source/ZMSLog.swift +++ b/wire-ios-system/Source/ZMSLog.swift @@ -18,7 +18,7 @@ import Foundation import os.log -import WireLogging +import WireLegacyLogging import ZIPFoundation /// Represents an entry to be logged. diff --git a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj index 301ffdc324c..e671c569208 100644 --- a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj +++ b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj @@ -10,8 +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 */; }; - 596A19362EB3A5C20017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A19352EB3A5C20017C3CA /* WireLegacyLogging */; }; + 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 */; }; @@ -91,8 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A19362EB3A5C20017C3CA /* WireLegacyLogging in Frameworks */, - 5953781C2CFF42E900920B59 /* WireLogging in Frameworks */, + 5953781C2CFF42E900920B59 /* WireLegacyLogging in Frameworks */, 013334BC2C204AB0002D97DB /* CocoaLumberjackSwift in Frameworks */, 596A19E72E9E4F8700E190AE /* ZIPFoundation in Frameworks */, ); @@ -192,9 +190,8 @@ name = WireSystem; packageProductDependencies = ( 013334BB2C204AB0002D97DB /* CocoaLumberjackSwift */, - 5953781B2CFF42E900920B59 /* WireLogging */, + 5953781B2CFF42E900920B59 /* WireLegacyLogging */, 596A19E62E9E4F8700E190AE /* ZIPFoundation */, - 596A19352EB3A5C20017C3CA /* WireLegacyLogging */, ); productName = SyncEngineSystem; productReference = 3ECC35191AD436750089FD4B /* WireSystem.framework */; @@ -700,11 +697,7 @@ package = 013334BA2C204AB0002D97DB /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; productName = CocoaLumberjackSwift; }; - 5953781B2CFF42E900920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A19352EB3A5C20017C3CA /* WireLegacyLogging */ = { + 5953781B2CFF42E900920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift index 107e1a9c271..122a20c5d2a 100644 --- a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift +++ b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging @objc public extension ZMAccessTokenHandler { diff --git a/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift b/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift index a092da175d5..202ce7250b5 100644 --- a/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift +++ b/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireUtilities /// Manages the creation and lifecycle of background tasks. diff --git a/wire-ios-transport/Source/Logging/WireLegacyLogging.swift b/wire-ios-transport/Source/Logging/WireLegacyLogging.swift deleted file mode 100644 index 43afaedb5c8..00000000000 --- a/wire-ios-transport/Source/Logging/WireLegacyLogging.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// 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/Source/Logging/WireLoggerObjC_LogRequest.swift b/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift index b39fa596fec..5497c01bda1 100644 --- a/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift +++ b/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging extension WireLoggerObjC { static func logRequest(_ request: NSURLRequest) { diff --git a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift index aaf023b3752..c90c9aa53fa 100644 --- a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift +++ b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLogging +import WireLegacyLogging public final class ServerCertificateTrust: NSObject, BackendTrustProvider { diff --git a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift index 1ed589fd698..4c93b8a9d7a 100644 --- a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift +++ b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities @objc diff --git a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift index 5eddf73d131..8c4703873b7 100644 --- a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift +++ b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift @@ -18,7 +18,7 @@ import Foundation import Starscream -import WireLogging +import WireLegacyLogging @objcMembers final class StarscreamPushChannel: NSObject, PushChannelType { diff --git a/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift b/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift index ebf6b308f7c..6e2d128f4b3 100644 --- a/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift +++ b/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift @@ -18,7 +18,7 @@ import CoreFoundation import Security -import WireLogging +import WireLegacyLogging public enum EnqueueResult { case success diff --git a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj index 4cb8cec4a8d..4d1a9f34ab8 100644 --- a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj +++ b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj @@ -12,8 +12,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 */; }; - 596A193D2EB3A6580017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A193C2EB3A6580017C3CA /* WireLegacyLogging */; }; + 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 */; }; @@ -163,10 +162,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A193D2EB3A6580017C3CA /* WireLegacyLogging in Frameworks */, 59FE6ACC2DA90CBA00DB461C /* WireFoundation in Frameworks */, 591B6E632C8B09F3009F8A7B /* WireUtilities.framework in Frameworks */, - 59537CD92CFF7ED800920B59 /* WireLogging in Frameworks */, + 59537CD92CFF7ED800920B59 /* WireLegacyLogging in Frameworks */, 01BBCFD82BF559AA001D9397 /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -293,9 +291,8 @@ name = "WireTransport-ios"; packageProductDependencies = ( 01BBCFD72BF559AA001D9397 /* Starscream */, - 59537CD82CFF7ED800920B59 /* WireLogging */, + 59537CD82CFF7ED800920B59 /* WireLegacyLogging */, 59FE6ACB2DA90CBA00DB461C /* WireFoundation */, - 596A193C2EB3A6580017C3CA /* WireLegacyLogging */, ); productName = Transport; productReference = 3E88BCA71B1F35DF00232589 /* WireTransport.framework */; @@ -835,11 +832,7 @@ package = 01BBCFD62BF559AA001D9397 /* XCRemoteSwiftPackageReference "starscream" */; productName = Starscream; }; - 59537CD82CFF7ED800920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A193C2EB3A6580017C3CA /* WireLegacyLogging */ = { + 59537CD82CFF7ED800920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios-utilities/Source/Keychain/Keychain.swift b/wire-ios-utilities/Source/Keychain/Keychain.swift index 636d90eb491..94f3c10a7a7 100644 --- a/wire-ios-utilities/Source/Keychain/Keychain.swift +++ b/wire-ios-utilities/Source/Keychain/Keychain.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import Security -import WireLogging +import WireLegacyLogging public protocol KeychainItem { associatedtype Value diff --git a/wire-ios-utilities/Source/WireLegacyLogging.swift b/wire-ios-utilities/Source/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios-utilities/Source/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 98faeec3f8e..d4260155d7d 100644 --- a/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj +++ b/wire-ios-utilities/WireUtilities.xcodeproj/project.pbxproj @@ -11,8 +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 */; }; - 596A193B2EB3A6170017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A193A2EB3A6170017C3CA /* WireLegacyLogging */; }; + 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,9 +131,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A193B2EB3A6170017C3CA /* WireLegacyLogging in Frameworks */, 591B6E7A2C8B0A1B009F8A7B /* WireSystem.framework in Frameworks */, - 59537CD72CFF7E1400920B59 /* WireLogging in Frameworks */, + 59537CD72CFF7E1400920B59 /* WireLegacyLogging in Frameworks */, 59B48C5A2C89CB1F00EA7999 /* WireFoundation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -258,8 +256,7 @@ name = WireUtilities; packageProductDependencies = ( 59B48C592C89CB1F00EA7999 /* WireFoundation */, - 59537CD62CFF7E1400920B59 /* WireLogging */, - 596A193A2EB3A6170017C3CA /* WireLegacyLogging */, + 59537CD62CFF7E1400920B59 /* WireLegacyLogging */, ); productName = WireUtilities; productReference = 3E88BD381B1F3EA300232589 /* WireUtilities.framework */; @@ -810,11 +807,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 59537CD62CFF7E1400920B59 /* WireLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLogging; - }; - 596A193A2EB3A6170017C3CA /* WireLegacyLogging */ = { + 59537CD62CFF7E1400920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging; }; diff --git a/wire-ios/Tests/Utility/WireLegacyLogging.swift b/wire-ios/Tests/Utility/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios/Tests/Utility/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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 Notification Service Extension/LegacyNotificationService.swift b/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift index 1316c1886cc..456128cddec 100644 --- a/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift +++ b/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift @@ -22,7 +22,7 @@ import UserNotifications import WireCommonComponents import WireDataModel import WireDomain -import WireLogging +import WireLegacyLogging import WireNotificationEngine import WireRequestStrategy import WireSyncEngine diff --git a/wire-ios/Wire Notification Service Extension/NotificationService.swift b/wire-ios/Wire Notification Service Extension/NotificationService.swift index ae56fea08e7..5fad79a4da1 100644 --- a/wire-ios/Wire Notification Service Extension/NotificationService.swift +++ b/wire-ios/Wire Notification Service Extension/NotificationService.swift @@ -21,7 +21,7 @@ import UserNotifications import WireCommonComponents import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireTransport import WireUtilities diff --git a/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift b/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Sources/View Controllers/ShareExtensionViewController.swift b/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift index fe41b1585ec..e0f7c42ee1c 100644 --- a/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift +++ b/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift @@ -28,7 +28,7 @@ import WireDesign import WireDomain import WireFoundation import WireLinkPreview -import WireLogging +import WireLegacyLogging import WireNetwork import WireShareEngine import WireUtilities diff --git a/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift b/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift deleted file mode 100644 index 0e8c1c83c10..00000000000 --- a/wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// 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/Calling/Analytics/CallEndedAnalyticsControllerTests.swift b/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift index 0ff7c3da0a5..f04a2615622 100644 --- a/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift +++ b/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift @@ -19,7 +19,7 @@ import WireDataModelSupport import WireFoundation import WireFoundationSupport -import WireLogging +import WireLegacyLogging import XCTest @testable import Wire diff --git a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj index 51fd698c6de..21924811911 100644 --- a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj +++ b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj @@ -74,22 +74,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 */; }; - 596A632C2EB3B2450017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632B2EB3B2450017C3CA /* WireLegacyLogging */; }; - 596A632E2EB3B2500017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632D2EB3B2500017C3CA /* WireLegacyLogging */; }; - 596A63302EB3B25A0017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */; }; - 596A63322EB3B2600017C3CA /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 596A63312EB3B2600017C3CA /* WireLegacyLogging */; }; 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 */; }; @@ -104,12 +100,10 @@ 59B768432D2D58BE007B5F1E /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59B768422D2D58BE007B5F1E /* WireFoundationSupport */; }; 59B7684B2D2D5A17007B5F1E /* WireFoundationSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59B7684A2D2D5A17007B5F1E /* WireFoundationSupport */; }; 59B99FAA2C89DE8600201827 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 59B99FA92C89DE8600201827 /* WireFoundation */; }; - 59BABD9A2EB3BCAF00CA529B /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */; }; - 59BABD9C2EB3BCB500CA529B /* WireLegacyLoggingSupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */; }; 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 */; }; 76ACF8A22D4215E2001F48A1 /* WireViewsDebugUI in Frameworks */ = {isa = PBXBuildFile; productRef = 76ACF8A12D4215E2001F48A1 /* WireViewsDebugUI */; }; @@ -930,11 +924,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A63322EB3B2600017C3CA /* WireLegacyLogging in Frameworks */, 346C75612E74727000800769 /* WireFoundation in Frameworks */, 591B6E212C8B096C009F8A7B /* WireCommonComponents.framework in Frameworks */, 3431F08B2E795BD0007BA692 /* WireNetwork in Frameworks */, - 59537D912CFFA0BA00920B59 /* WireLogging in Frameworks */, + 59537D912CFFA0BA00920B59 /* WireLegacyLogging in Frameworks */, EE9A8586298B0A3B00064A9C /* WireNotificationEngine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -946,10 +939,9 @@ 34C5F14A2E58AE0800C0FF34 /* WireNetwork in Frameworks */, E489D8312DF709CE008966AE /* WireMultiBackendUI in Frameworks */, 591B6E192C8B0960009F8A7B /* WireCommonComponents.framework in Frameworks */, - 596A632E2EB3B2500017C3CA /* WireLegacyLogging 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 */, ); @@ -983,7 +975,6 @@ CB4E15122C81CC81005DDEC8 /* Down in Frameworks */, EEE25B3829719C170008B894 /* WireDataModel.framework in Frameworks */, 59D038272C85D31E009FE583 /* WireMainNavigationUI in Frameworks */, - 596A632C2EB3B2450017C3CA /* WireLegacyLogging in Frameworks */, EE33C48D296485FA00C058D1 /* WireShareEngine.framework in Frameworks */, EEE25B2A29719A730008B894 /* cryptobox.xcframework in Frameworks */, 59076F952C934A9800AE7529 /* WireAccountImageUI in Frameworks */, @@ -996,7 +987,7 @@ EEE25B4429719C950008B894 /* WireSystem.framework in Frameworks */, 76ACF8A22D4215E2001F48A1 /* WireViewsDebugUI in Frameworks */, 591B6E172C8B095B009F8A7B /* WireNotificationEngine.framework in Frameworks */, - 59537D952CFFA11A00920B59 /* WireLogging in Frameworks */, + 59537D952CFFA11A00920B59 /* WireLegacyLogging in Frameworks */, 5972B0DB2E9EABC8005E6417 /* WireUtilitiesPackage in Frameworks */, E9FBF3A62C47C23100C65DA8 /* FLAnimatedImage in Frameworks */, E40050762D71A80100B7962B /* WireMessagingUI in Frameworks */, @@ -1018,20 +1009,19 @@ 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 */, CB4870F22C7F4FE5001E9151 /* WireTransportSupport.framework in Frameworks */, 59B7684B2D2D5A17007B5F1E /* WireFoundationSupport in Frameworks */, - 59BABD9C2EB3BCB500CA529B /* WireLegacyLoggingSupport in Frameworks */, 5996E8A82C19D09D007A52F0 /* WireSyncEngineSupport.framework in Frameworks */, 3438C5592E5C518900D6FB5C /* WireNetwork in Frameworks */, 5996E8A42C19D074007A52F0 /* WireRequestStrategySupport.framework in Frameworks */, 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 */, 5996E8AD2C19D0DF007A52F0 /* WireTesting.framework in Frameworks */, @@ -1042,11 +1032,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 59BABD9A2EB3BCAF00CA529B /* WireLegacyLoggingSupport in Frameworks */, 59AADE272BB429B200D9E658 /* WireRequestStrategySupport.framework in Frameworks */, - 59C951C42E2B67E8002C0A3E /* 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 */, @@ -1061,9 +1050,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 596A63302EB3B25A0017C3CA /* WireLegacyLogging in Frameworks */, E985CB8F2CEB4FCB0075DAD6 /* WireDatadog in Frameworks */, - 59537D8F2CFFA05600920B59 /* WireLogging in Frameworks */, + 59537D8F2CFFA05600920B59 /* WireLegacyLogging in Frameworks */, E9816C902CC9244700D77F22 /* WireSyncEngine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1349,11 +1337,10 @@ packageProductDependencies = ( 5945D0292C219F7200D039E3 /* WireDesign */, 59CDB3F52C4EA08F0049D1AB /* WireReusableUIComponents */, - 59537D922CFFA0DA00920B59 /* WireLogging */, + 59537D922CFFA0DA00920B59 /* WireLegacyLogging */, E489D8302DF709CE008966AE /* WireMultiBackendUI */, 34C5F1492E58AE0800C0FF34 /* WireNetwork */, 346C755E2E74726600800769 /* WireFoundation */, - 596A632D2EB3B2500017C3CA /* WireLegacyLogging */, ); productName = "Wire-iOS Share Extension"; productReference = 168A16A91D9597C2005CFA6C /* Wire Share Extension.appex */; @@ -1402,7 +1389,7 @@ 590DCA072C971A56002D0A2C /* WireSidebarUI */, CB43D9BC2CDBBBB900BF5AEB /* WireFolderPickerUI */, E9BA75C52CD51DF100F6EDDF /* WireMoveToFolderUI */, - 59537D942CFFA11A00920B59 /* WireLogging */, + 59537D942CFFA11A00920B59 /* WireLegacyLogging */, 76D15E702CEFAE8A0059215D /* WireIndividualToTeamMigrationUI */, 594341D62D08611700A6C0B5 /* WireCountly */, 0619A95B2D3FE78700876BDE /* WireAuthenticationUI */, @@ -1422,7 +1409,6 @@ 065CDA942E9E58B90080799B /* WireCallingAssembly */, 76EF748D2E9E6366006A1579 /* WireLocators */, 5972B0DA2E9EABC8005E6417 /* WireUtilitiesPackage */, - 596A632B2EB3B2450017C3CA /* WireLegacyLogging */, ); productName = "ZClient iOS"; productReference = 8F42C538199244A700288E4D /* Wire.app */; @@ -1451,12 +1437,11 @@ 59B48C612C89CD3D00EA7999 /* WireTestingPackage */, 590DCA092C971AFF002D0A2C /* WireFoundation */, 59B7684A2D2D5A17007B5F1E /* WireFoundationSupport */, - 59191A642D0051C7001AB388 /* WireLogging */, - 59C951C12E2B67E3002C0A3E /* WireLoggingSupport */, + 59191A642D0051C7001AB388 /* WireLegacyLogging */, + 59C951C12E2B67E3002C0A3E /* WireLegacyLoggingSupport */, 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */, 3438C5582E5C518900D6FB5C /* WireNetwork */, 76EF748F2E9E6380006A1579 /* WireLocators */, - 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */, ); productName = "ZClient-iOS Tests"; productReference = BACB88511AF7C48900DDCDB0 /* Wire-iOS-Tests.xctest */; @@ -1481,11 +1466,10 @@ ); name = "Wire-iOS UnitTests"; packageProductDependencies = ( - 5977ED1E2D26747900F5C78E /* WireLogging */, - 59C951C32E2B67E8002C0A3E /* WireLoggingSupport */, + 5977ED1E2D26747900F5C78E /* WireLegacyLogging */, + 59C951C32E2B67E8002C0A3E /* WireLegacyLoggingSupport */, 595BE7A52E32368500ED9088 /* WireAnalyticsSupport */, 3438C55A2E5C51A700D6FB5C /* WireNetwork */, - 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */, ); productName = "Wire-iOS UnitTests"; productReference = E6579E362AFF9B30004E7FD8 /* Wire-iOS UnitTests.xctest */; @@ -1508,8 +1492,7 @@ name = WireCommonComponents; packageProductDependencies = ( 016A141C2CE6BFC4006A7EF5 /* WireDatadog */, - 59537D8E2CFFA05600920B59 /* WireLogging */, - 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */, + 59537D8E2CFFA05600920B59 /* WireLegacyLogging */, ); productName = WireCommonComponents; productReference = F1FEA14A21DCEB1700790A54 /* WireCommonComponents.framework */; @@ -2929,9 +2912,9 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; - 59191A642D0051C7001AB388 /* WireLogging */ = { + 59191A642D0051C7001AB388 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 5929CB212CA6C9C800070488 /* WireConversationListUI */ = { isa = XCSwiftPackageProductDependency; @@ -2949,21 +2932,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; @@ -2977,22 +2960,6 @@ isa = XCSwiftPackageProductDependency; productName = WireSettingsUI; }; - 596A632B2EB3B2450017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; - 596A632D2EB3B2500017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; - 596A632F2EB3B25A0017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; - 596A63312EB3B2600017C3CA /* WireLegacyLogging */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLogging; - }; 59703B272DD4A42000B45773 /* ZIPFoundation */ = { isa = XCSwiftPackageProductDependency; package = 59703B262DD4A42000B45773 /* XCRemoteSwiftPackageReference "ZIPFoundation" */; @@ -3002,9 +2969,9 @@ isa = XCSwiftPackageProductDependency; productName = WireUtilitiesPackage; }; - 5977ED1E2D26747900F5C78E /* WireLogging */ = { + 5977ED1E2D26747900F5C78E /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; - productName = WireLogging; + productName = WireLegacyLogging; }; 59B48C612C89CD3D00EA7999 /* WireTestingPackage */ = { isa = XCSwiftPackageProductDependency; @@ -3022,25 +2989,17 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; - 59BABD992EB3BCAF00CA529B /* WireLegacyLoggingSupport */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLoggingSupport; - }; - 59BABD9B2EB3BCB500CA529B /* WireLegacyLoggingSupport */ = { - isa = XCSwiftPackageProductDependency; - productName = WireLegacyLoggingSupport; - }; 59BAEAFB2DBF483400B54AC4 /* WireBackup */ = { 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; diff --git a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift index 4df3010e322..3cec3d431ee 100644 --- a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift +++ b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireSystem extension TrackingManager { diff --git a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift index cb1dc6aa058..0ca94ae5e3b 100644 --- a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift +++ b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLogging +import WireLegacyLogging import WireSyncEngine struct TrackingManager: TrackingInterface { diff --git a/wire-ios/Wire-iOS/Sources/AppDelegate.swift b/wire-ios/Wire-iOS/Sources/AppDelegate.swift index 697ace67232..7477d0f6299 100644 --- a/wire-ios/Wire-iOS/Sources/AppDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/AppDelegate.swift @@ -25,7 +25,7 @@ import WireCoreCrypto import WireCountly import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift index 10af2ac278e..5e5ac63d1c1 100644 --- a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift +++ b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift b/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift index 722c66f9d54..2febab03ff4 100644 --- a/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift +++ b/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift @@ -19,7 +19,7 @@ import UIKit import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift index 4c06ee13de9..d52a7e9a047 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift @@ -19,7 +19,7 @@ import UIKit import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift index cb0a376615b..e95c2a0947f 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities extension PasswordRuleSet { diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift index 49eecb17096..7ea3d00d393 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift @@ -20,7 +20,7 @@ import UIKit import WireAnalytics import WireAuthenticationAPI import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift b/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift index ec8bdb63e54..605d038607a 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift @@ -21,7 +21,7 @@ import Foundation import SwiftUI import WireAuthentication import WireDomain -import WireLogging +import WireLegacyLogging import WireSyncEngine // A temporary bridging object to allow the new WireAuthentication flow inside diff --git a/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift b/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift index 652e7dfd884..3ba26a74a3a 100644 --- a/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift +++ b/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift @@ -19,7 +19,7 @@ import avs import WireCommonComponents import WireFoundation -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireUtilities diff --git a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift index 5a1339ecc34..de877ef8505 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift @@ -20,7 +20,7 @@ import MessageUI import UIKit import WireCommonComponents import WireDataModel -import WireLogging +import WireLegacyLogging import WireSystem /// Presents debug alerts diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift index 5ec77d50225..570ed8ad9a4 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireUtilities struct ConversationDeveloperActionsProvider: DeveloperToolsContextItemsProvider { diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift index 377c0c2f519..c4f29b643a6 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging /// Provides debug actions for UserClientDetails struct UserClientDeveloperItemsProvider: DeveloperToolsContextItemsProvider { diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift index 8c0f7e91633..f483d9c18a5 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift @@ -21,7 +21,7 @@ import SwiftUI import WireDataModel import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift index ba7716d5f3a..3d4d36311e3 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSyncEngine final class DeveloperE2eiViewModel: ObservableObject { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift b/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift index e239e57447e..5373a60ee4e 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift @@ -17,7 +17,7 @@ // import LocalAuthentication -import WireLogging +import WireLegacyLogging import WireSystem enum AuthenticationType: CaseIterable { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift b/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift index 1cb5459373a..9a88146160f 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireSystem /// An object that tracks performance issues in the application for debugging purposes. diff --git a/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift b/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift index 92afde84a8c..39e0c861afa 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireSystem protocol SaveFileActions { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift b/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift index 816167e31c6..a202bfba94a 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSystem protocol TemporaryFileServiceInterface { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift b/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift deleted file mode 100644 index 1475379c0b7..00000000000 --- a/wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// 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/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift b/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift index 8b27053aa49..c7d8d6e4aff 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireSyncEngine extension GroupDetailsConversation where Self: ZMConversation { diff --git a/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift b/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift index 0e9c6444f0a..09a97d10281 100644 --- a/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift +++ b/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift @@ -20,7 +20,7 @@ import avs import Foundation import WireCommonComponents import WireDesign -import WireLogging +import WireLegacyLogging import WireSyncEngine // MARK: - LaunchSequenceOperation diff --git a/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift b/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift index eddbcb6fa8e..7e3d815fac8 100644 --- a/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift +++ b/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSyncEngine final class ProfileImagePickerManager: ImagePickerManager { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift index 56c6470ea63..1419e96a653 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift @@ -18,7 +18,7 @@ import MessageUI import UIKit -import WireLogging +import WireLegacyLogging import WireMultiBackendUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift index 75b167af7ba..f426f3f57c6 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift @@ -18,7 +18,7 @@ import WireAnalytics import WireFoundation -import WireLogging +import WireLegacyLogging import WireSyncEngine final class CallEndedAnalyticsController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift index b2a1b80f657..ce2e8f0059e 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging /// A placeholder container for AVSVideo to start the rendering only if the view is instantiated and setup. final class AVSVideoContainerView: UIView { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift index f57c4e14f8c..27808492dae 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift index b8f2dfdadad..4e7a165e296 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift @@ -18,7 +18,7 @@ import UIKit import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireTransport diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift index 2a912a8b6dd..d93f0751b59 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift @@ -18,7 +18,7 @@ import UIKit import WireDesign -import WireLogging +import WireLegacyLogging import WireSystem enum NetworkStatusViewState { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift index 16f2906d1c5..4b25000cf0a 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine enum ConversationSystemMessageCellDescription { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift index e51b0927000..a20d8a8ea10 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLogging +import WireLegacyLogging import WireSyncEngine extension ConversationContentViewController: CanvasViewControllerDelegate { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift index 9b097f4742f..91fbae8843b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift @@ -19,7 +19,7 @@ import UIKit import WireCommonComponents import WireDesign -import WireLogging +import WireLegacyLogging import WireSyncEngine extension ZMConversation: ShareDestination { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift index 0ceda253fab..beb8623a5a5 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine extension ConversationContentViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift index cb5a8e0e923..c206dc6438c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift @@ -21,7 +21,7 @@ import WireCommonComponents import WireDataModel import WireDesign import WireFoundation -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireMessagingUI import WireRequestStrategy diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift index 16e6ef8a2cc..7f772d41886 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift @@ -19,7 +19,7 @@ import DifferenceKit import WireDataModel import WireFoundation -import WireLogging +import WireLegacyLogging import WireMessagingUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift index 75126c9363b..fc557ca0428 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift @@ -19,7 +19,7 @@ import UIKit import UniformTypeIdentifiers import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift index d3deb546df5..d316acf7131 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift @@ -20,7 +20,7 @@ import UIKit import WireCommonComponents import WireDesign import WireDomain -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift index 7fa6549270b..f2bd4e12233 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift @@ -21,7 +21,7 @@ import WireCommonComponents import WireDataModel import WireDesign import WireDomain -import WireLogging +import WireLegacyLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift index 41ebc336c97..3f92a1fba92 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift @@ -19,7 +19,7 @@ import SwiftUI import UIKit import WireDomain -import WireLogging +import WireLegacyLogging import WireMessagingDomain import WireMessagingUI import WireNetwork diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift index a12bd2ce8d0..f6ed4c9cfde 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift @@ -19,7 +19,7 @@ import avs import Foundation import MediaPlayer -import WireLogging +import WireLegacyLogging import WireSyncEngine enum PlayingState: UInt, CustomStringConvertible { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift index 526657b7632..9e880c8cd46 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift @@ -20,7 +20,7 @@ import FLAnimatedImage import MobileCoreServices import Photos import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift index e55dec704b5..0948b5630f9 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift @@ -18,7 +18,7 @@ import Foundation import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireMessagingAssembly import WireSyncEngine import WireUtilitiesPackage diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift index 53044158a90..a8e3a5671a3 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift @@ -18,7 +18,7 @@ import UIKit import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireSyncEngine extension ConversationInputBarViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift index 539e45504db..6115b424223 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift @@ -25,7 +25,7 @@ import UIKit import WireCommonComponents import WireDesign import WireFoundation -import WireLogging +import WireLegacyLogging import WireMessagingAssembly import WireMessagingDomain import WireMessagingUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift index 22eff324fcc..7bcc8ff1881 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireUtilities protocol EmojiRepositoryInterface { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift index e023fbdd98d..6b353deff01 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift @@ -23,7 +23,7 @@ import WireCommonComponents import WireDataModel import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift b/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift index 5d20524847c..9e7e2a5567b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine final class DeviceDetailsViewActionsHandler: DeviceDetailsViewActions, ObservableObject { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift index ff0e6ff2a6b..ba8295242b8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift index e7bd91ed26b..18e6008b826 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift @@ -19,7 +19,7 @@ import AppAuth import Foundation import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireRequestStrategy import WireSystem import WireUtilities diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift index 28d25c134de..aa96a491aff 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift @@ -20,7 +20,7 @@ import SwiftUI import UIKit import WireDesign import WireDomain -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingDomain diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift index c64ac36b2c4..4560f96308f 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine private extension String { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift index 39458643647..9f17de3a1ee 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine enum ParticipantsRowType { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift index 855fb03c94c..77331bd5518 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLogging +import WireLegacyLogging extension ZClientViewController: StartUIDelegate { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift index 4571c135e8f..9f40f8a01d6 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift @@ -25,7 +25,7 @@ import WireCallingAssembly import WireCommonComponents import WireDesign import WireFoundation -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingDomain diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift b/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift index 7c88e90a136..50c99f470a8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift @@ -18,7 +18,7 @@ import UserNotifications import WireFoundation -import WireLogging +import WireLegacyLogging import WireUtilities struct ShouldPresentNotificationPermissionHintUseCase< diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift index 9c5131f0cb9..cbe3b7c8327 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift @@ -20,7 +20,7 @@ import SwiftUI import UIKit import WireCommonComponents import WireDesign -import WireLogging +import WireLegacyLogging import WireSyncEngine final class ProfileHeaderViewController: UIViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift index 662da4ec8c7..08e72db29ce 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLogging +import WireLegacyLogging import WireSyncEngine protocol SelfProfileViewsMonitor { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift index 3a29a366d8f..273cb7078e2 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift @@ -23,7 +23,7 @@ import WireDataModel import WireDesign import WireDomain import WireFoundation -import WireLogging +import WireLegacyLogging import WireNetwork import WireSettingsUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift index 693eb798c11..f3528100f9c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift @@ -19,7 +19,7 @@ import UIKit import WireCommonComponents import WireDomain -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireSystem import ZIPFoundation diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift index 478991ce86a..bf01bf5cb65 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift @@ -18,7 +18,7 @@ import MessageUI import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireSyncEngine final class SettingsDebugReportViewModel: SettingsDebugReportViewModelProtocol { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift index 654e24323e0..53e300fa120 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift @@ -19,7 +19,7 @@ import SwiftUI import WireCommonComponents import WireDesign -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireReusableUIComponents import WireSettingsUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift index 3e82b0689bb..e49afe63f09 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift @@ -19,7 +19,7 @@ import Foundation import MessageUI import WireCommonComponents -import WireLogging +import WireLegacyLogging import WireSystem extension MFMailComposeViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift index 0be78a819cf..0aea78d0ad2 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLogging +import WireLegacyLogging import WireSyncEngine enum SearchGroup: Int { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift index f5086eca91d..64cd5df1f96 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift @@ -18,7 +18,7 @@ import SwiftUI import WireDesign -import WireLogging +import WireLegacyLogging import WireSyncEngine final class OtherUserClientsListViewController: UIViewController, diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift index f567e3f1458..92a2eed44e9 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift @@ -20,7 +20,7 @@ import Foundation import WireCommonComponents import WireDataModel import WireDesign -import WireLogging +import WireLegacyLogging import WireSyncEngine /// The actions that can be performed from the profile details or devices. diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift index 81259fbda7c..31d5cdd0495 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift @@ -19,7 +19,7 @@ import UIKit import WireDataModel import WireDesign -import WireLogging +import WireLegacyLogging import WireMainNavigationUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift index 54260171b0e..ea5b5b0dfdb 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLogging +import WireLegacyLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift b/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift index d18eb5d9f83..5c3ca96fcaa 100644 --- a/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift +++ b/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift @@ -18,7 +18,7 @@ import WireAnalytics import WireDatadog -import WireLogging +import WireLegacyLogging import WireSystem extension WireDatadog: LoggerProtocol { diff --git a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift index fc302a1d0a7..8519db54a70 100644 --- a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift +++ b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift @@ -18,7 +18,7 @@ import Foundation import os -import WireLogging +import WireLegacyLogging import WireSystem /// Namespace for analytics tools. diff --git a/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift b/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift index 9de0966b089..360c53aedda 100644 --- a/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift +++ b/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift @@ -20,7 +20,7 @@ import AVFoundation import Foundation import MobileCoreServices import WireDataModel -import WireLogging +import WireLegacyLogging private let zmLog = ZMSLog(tag: "UI") diff --git a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift index f35b3937a59..c838face6c4 100644 --- a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift +++ b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift @@ -18,7 +18,7 @@ import CocoaLumberjackSwift import Foundation -import WireLogging +import WireLegacyLogging import WireSystem /// Logger to write logs to fileSystem via CocoaLumberjack diff --git a/wire-ios/WireCommonComponents/WireLegacyLogging.swift b/wire-ios/WireCommonComponents/WireLegacyLogging.swift deleted file mode 100644 index 2bea1893c08..00000000000 --- a/wire-ios/WireCommonComponents/WireLegacyLogging.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// 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 From 0c7ecb500cdc9ca410b97559dc2d4c7c02c32194 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:14:44 +0100 Subject: [PATCH 23/37] various fixes --- WireAnalytics/Package.swift | 11 ++++++++--- WireAuthentication/Package.swift | 4 ++-- WireBackup/Package.swift | 4 ++-- WireCalling/Package.swift | 6 +++--- WireDomain/Package.swift | 4 ++-- WireMessaging/Package.swift | 6 +++--- WireNetwork/Package.swift | 4 ++-- WireUI/Package.swift | 4 ++-- wire-ios-mono.xcworkspace/contents.xcworkspacedata | 2 +- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 11d9ac06e83..3f144b8a49c 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -21,13 +21,16 @@ let package = Package( .package(url: "https://github.com/Countly/countly-sdk-ios.git", exact: "25.4.3"), .package(url: "https://github.com/DataDog/dd-sdk-ios.git", exact: "2.27.0"), .package(path: "../WireFoundation"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WirePlugins") ], targets: [ .target( name: "WireAnalytics", - dependencies: ["WireFoundation", "WireLegacyLogging"] + dependencies: [ + "WireFoundation", + .product(name: "WireLegacyLogging", package: "WireLogging") + ] ), .target( name: "WireAnalyticsSupport", @@ -47,7 +50,9 @@ let package = Package( .target( name: "WireDatadog", - dependencies: datadogDependencies() + ["WireLegacyLogging"], + dependencies: datadogDependencies() + [ + .product(name: "WireLegacyLogging", package: "WireLogging") + ], sources: datadogFiles() ), diff --git a/WireAuthentication/Package.swift b/WireAuthentication/Package.swift index bbafae941d6..58d5eedabce 100644 --- a/WireAuthentication/Package.swift +++ b/WireAuthentication/Package.swift @@ -17,7 +17,7 @@ let package = Package( dependencies: [ .package(path: "../WireNetwork"), .package(path: "../WireFoundation"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WireUI"), .package(path: "../WirePlugins"), .package(url: "https://github.com/uber/needle.git", .upToNextMinor(from: "0.25.1")), @@ -63,7 +63,7 @@ let package = Package( .target( name: "WireAuthenticationUI", dependencies: [ - "WireLegacyLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireFoundation", "WireAuthenticationAPI", .product(name: "WireDesign", package: "WireUI"), diff --git a/WireBackup/Package.swift b/WireBackup/Package.swift index 46bd0a5e565..b25cb3f3b3b 100644 --- a/WireBackup/Package.swift +++ b/WireBackup/Package.swift @@ -12,7 +12,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMajor(from: "0.9.0")), .package(path: "../WireFoundation"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -21,7 +21,7 @@ let package = Package( dependencies: [ "KaliumBackup", "WireFoundation", - "WireLegacyLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "WireUtilitiesPackage", package: "WireFoundation") ] ), diff --git a/WireCalling/Package.swift b/WireCalling/Package.swift index 6b548347d22..4a6185bcd40 100644 --- a/WireCalling/Package.swift +++ b/WireCalling/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(path: "../WireFoundation"), .package(path: "../WirePlugins"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(name: "WireUI", path: "../WireUI") ], targets: [ @@ -24,7 +24,7 @@ let package = Package( name: "WireCallingDomain", dependencies: [ "WireFoundation", - "WireLegacyLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -39,7 +39,7 @@ let package = Package( name: "WireCallingData", dependencies: [ "WireCallingDomain", - "WireLegacyLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( diff --git a/WireDomain/Package.swift b/WireDomain/Package.swift index 4fff4f62d90..96bf1359d23 100644 --- a/WireDomain/Package.swift +++ b/WireDomain/Package.swift @@ -15,7 +15,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(path: "../WireNetwork"), .package(path: "../WireFoundation"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -23,7 +23,7 @@ let package = Package( name: "WireDomainPackage", dependencies: [ "WireNetwork", - "WireLegacyLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireFoundation" ] ), diff --git a/WireMessaging/Package.swift b/WireMessaging/Package.swift index 6ae548649d2..f946e05cebc 100644 --- a/WireMessaging/Package.swift +++ b/WireMessaging/Package.swift @@ -19,7 +19,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"), .package(name: "WireFoundation", path: "../WireFoundation"), .package(path: "../WirePlugins"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(name: "WireUI", path: "../WireUI"), .package(path: "../WireData") ], @@ -29,7 +29,7 @@ let package = Package( dependencies: [ .product(name: "CellsSDK", package: "cells-sdk-swift"), "WireFoundation", - "WireLegacyLogging" + .product(name: "WireLegacyLogging", package: "WireLogging") ] ), .target( @@ -37,7 +37,7 @@ let package = Package( dependencies: [ "WireData", "WireMessagingDomain", - "WireLegacyLogging", + .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/WireNetwork/Package.swift b/WireNetwork/Package.swift index d7052053c78..3e21af6baea 100644 --- a/WireNetwork/Package.swift +++ b/WireNetwork/Package.swift @@ -13,7 +13,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", exact: "1.18.3"), .package(path: "../WirePlugins"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WireFoundation") ], targets: [ @@ -21,7 +21,7 @@ let package = Package( name: "WireNetwork", dependencies: [ "WireFoundation", - "WireLegacyLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), .product(name: "WireCrypto", package: "WireFoundation") ] ), diff --git a/WireUI/Package.swift b/WireUI/Package.swift index f79b23a078e..c3042545882 100644 --- a/WireUI/Package.swift +++ b/WireUI/Package.swift @@ -30,7 +30,7 @@ let package = Package( .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"), .package(name: "WireDomainPackage", path: "../WireDomain"), .package(name: "WireFoundation", path: "../WireFoundation"), - .package(path: "../WireLegacyLogging"), + .package(path: "../WireLogging"), .package(path: "../WirePlugins") ], targets: [ @@ -116,7 +116,7 @@ let package = Package( "WireDesign", .product(name: "WireDomainPackage", package: "WireDomainPackage"), "WireFoundation", - "WireLegacyLogging", + .product(name: "WireLegacyLogging", package: "WireLogging"), "WireReusableUIComponents", "WireLocators" ], diff --git a/wire-ios-mono.xcworkspace/contents.xcworkspacedata b/wire-ios-mono.xcworkspace/contents.xcworkspacedata index 84e6beb3821..61bd04eebc3 100644 --- a/wire-ios-mono.xcworkspace/contents.xcworkspacedata +++ b/wire-ios-mono.xcworkspace/contents.xcworkspacedata @@ -216,7 +216,7 @@ location = "group:WireFoundation"> + location = "group:WireLogging"> From fec15f20c9a727195d155ae869f23589d22fb24a Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:19:57 +0100 Subject: [PATCH 24/37] undo changing imports --- .github/workflows/test_pr_changes.yml | 4 ++-- .../Sources/WireAnalytics/Service/AnalyticsService.swift | 2 +- WireAnalytics/Sources/WireDatadog/WireDatadog.swift | 2 +- WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift | 2 +- .../Components/DetermineAuthMethodComponent.swift | 2 +- .../Sources/WireAuthentication/Needle.generated.swift | 2 +- .../WireAuthenticationLogic/FetchBackendConfigUseCase.swift | 2 +- .../DetermineAuthMethod/DetermineAuthMethodViewModel.swift | 2 +- .../Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift | 2 +- .../Login/ReloginViaEmail/ReloginViaEmailViewModel.swift | 2 +- .../Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift | 2 +- .../Login/VerificationCode/VerificationCodeViewModel.swift | 2 +- .../PersonalAccountCreationViewModel.swift | 2 +- .../VerificationEmailCodeViewModel.swift | 2 +- .../Sources/WireAuthenticationUI/Views/Root/Router.swift | 2 +- .../Sources/WireBackup/UseCases/CreateBackupUseCase.swift | 2 +- .../Sources/WireBackup/UseCases/ImportBackupUseCase.swift | 2 +- .../UseCases/CreateAndImportBackupUseCaseTests.swift | 2 +- WireDomain/Sources/WireDomain/Account/AccountManager.swift | 2 +- WireDomain/Sources/WireDomain/Account/AccountStore.swift | 2 +- .../Sources/WireDomain/Account/BackendEnvironmentStore.swift | 2 +- .../AppVersionMigration/AppVersionMigrationService.swift | 2 +- .../Core Crypto/CoreCryptoKeyMigrationManager.swift | 2 +- .../WireDomain/Event Decryption/MLSMessageDecryptor.swift | 2 +- .../WireDomain/Event Decryption/UpdateEventDecryptor.swift | 2 +- .../ConversationCreateEventProcessor.swift | 2 +- .../ConversationMLSResetEventProcessor.swift | 2 +- .../ConversationMLSWelcomeEventProcessor.swift | 2 +- .../ConversationMLSMessageAddEventProcessor.swift | 2 +- .../ConversationProteusMessageAddEventProcessor.swift | 2 +- .../ConversationProtobufMessageProcessor.swift | 2 +- .../ConversationReceiptModeUpdateEventProcessor.swift | 2 +- .../WireDomain/Event Processing/UpdateEventProcessor.swift | 2 +- .../UserEventProcessor/UserClientRemoveEventProcessor.swift | 2 +- .../UserEventProcessor/UserConnectionEventProcessor.swift | 2 +- .../UserPropertiesDeleteEventProcessor.swift | 2 +- .../Extensions/LogAttributes/SyncLogAttributes.swift | 2 +- .../Helpers/AppExtensionPushChannelCoordinator.swift | 2 +- .../Helpers/InitiateResetMLSConversationUseCase.swift | 2 +- .../WireDomain/Helpers/MainAppPushChannelCoordinator.swift | 2 +- WireDomain/Sources/WireDomain/Needle.generated.swift | 2 +- .../Builders/Conversation/Models/CallContent.swift | 2 +- .../Notifications/Components/Legacy/SyncEventsStep.swift | 2 +- .../WireDomain/Notifications/Components/NSEClientScope.swift | 2 +- .../Notifications/GenerateNotificationUseCase.swift | 2 +- .../Notifications/NotificationServiceExtension.swift | 2 +- .../Notifications/ProcessNotificationRequestUseCase.swift | 2 +- .../Sources/WireDomain/Notifications/PullEventsUseCase.swift | 2 +- .../WireDomain/Notifications/ShowNotificationUseCase.swift | 2 +- .../Sources/WireDomain/Notifications/SyncEventsUseCase.swift | 2 +- .../WireDomain/Notifications/VerifyUserSessionUseCase.swift | 2 +- .../Repositories/BackendConfig/BackendConfigRepository.swift | 2 +- .../Conversations/LocalStore/ConversationLocalStore.swift | 2 +- .../Conversations/Repository/ConversationRepository.swift | 2 +- .../ConversationsLabels/ConversationLabelsLocalStore.swift | 2 +- .../ConversationsLabels/ConversationLabelsRepository.swift | 2 +- .../Repositories/FeatureConfig/FeatureConfigLocalStore.swift | 2 +- .../Repositories/FeatureConfig/FeatureConfigRepository.swift | 2 +- .../WireDomain/Repositories/Message/MessageLocalStore.swift | 2 +- .../Repositories/UpdateEvents/UpdateEventsLocalStore.swift | 2 +- .../Sources/WireDomain/Repositories/User/UserLocalStore.swift | 2 +- .../Sources/WireDomain/Repositories/User/UserRepository.swift | 2 +- .../Repositories/UserClients/UserClientsLocalStore.swift | 2 +- .../WireDomain/Services/UnknownMessageProcessingService.swift | 2 +- .../Synchronization/ConsumableNotificationsMigrator.swift | 2 +- .../Sources/WireDomain/Synchronization/IncrementalSync.swift | 2 +- .../WireDomain/Synchronization/IncrementalSyncV2.swift | 2 +- .../Sources/WireDomain/Synchronization/InitialSync.swift | 2 +- .../WireDomain/Synchronization/MLSGroupRepairAgent.swift | 2 +- .../Sources/WireDomain/Synchronization/MLSTransportImpl.swift | 2 +- .../Sources/WireDomain/Synchronization/OneOnOneResolver.swift | 2 +- .../Synchronization/PullAllFeatureConfigsSync.swift | 2 +- .../Synchronization/PullLastUpdateEventIDSync.swift | 2 +- .../WireDomain/Synchronization/PullMLSStatusSync.swift | 2 +- .../Synchronization/PullPendingUpdateEventsSync.swift | 2 +- .../Synchronization/PullPendingUpdateEventsV2Sync.swift | 2 +- .../WireDomain/Synchronization/PullResourcesSync.swift | 2 +- .../Sources/WireDomain/Synchronization/PushChannelState.swift | 2 +- .../Synchronization/PushSupportedProtocolsSync.swift | 2 +- .../UseCases/CalculateSupportedProtocolsUseCase.swift | 2 +- .../Sources/WireDomain/UseCases/CreateChannelUseCase.swift | 2 +- .../WireDomain/UseCases/CreateGroupConversationUseCase.swift | 2 +- .../UseCases/IndividualToTeamMigrationUseCase.swift | 2 +- WireLogging/Tests/WireLogging/Network/RequestLogTests.swift | 2 +- .../WireMessagingData/WireCells/DraftsRepository.swift | 2 +- .../WireMessagingData/WireCells/NodesAPI/AWSClient.swift | 2 +- .../WireMessagingData/WireCells/NodesAPI/RestAPI.swift | 2 +- .../WireCells/WireCellsNodeUploadManager.swift | 2 +- .../WireCells/UseCases/ClearPublishedDraftsUseCase.swift | 2 +- .../WireCells/UseCases/UploadDraftUseCase.swift | 2 +- .../AttachmentsCarousel/AttachmentsCarouselViewModel.swift | 2 +- .../WireCellsAttachmentsPreviewItemViewModel.swift | 2 +- .../WireCells/Components/Files/FilesViewModel.swift | 2 +- .../UpdateEventDecodingProxy+FeatureConfig.swift | 2 +- .../WireNetwork/Authentication/AuthenticationManager.swift | 2 +- .../Authorization/DomainRegistrationConfiguration.swift | 2 +- .../WireNetwork/Network/NetworkService/NetworkService.swift | 2 +- .../WireNetwork/Network/NetworkStack/NetworkStack.swift | 2 +- .../Sources/WireNetwork/Network/PushChannel/PushChannel.swift | 2 +- .../WireNetwork/Network/PushChannel/PushChannelV2.swift | 2 +- .../Sources/WireNetwork/Network/PushChannel/WebSocket.swift | 2 +- .../BackupImportExport/BackupImportExportBuilder.swift | 2 +- .../BackupImportExport/Export/ExportBackupViewModel.swift | 2 +- .../BackupImportExport/Import/ImportBackupViewModel.swift | 2 +- .../Account/BackupImportExport/Previews/PreviewLogger.swift | 2 +- .../Export/ExportBackupViewModelTests.swift | 2 +- .../ImportBackupViewModelTestImportBackupViewModelTests.swift | 2 +- .../Source/Authentication/AuthenticationContext.swift | 2 +- .../Source/Authentication/EAR/EARKeyRepository.swift | 2 +- .../Source/Authentication/EAR/EARService.swift | 2 +- .../Source/Core Crypto/CoreCryptoConfiguration.swift | 2 +- .../Source/Core Crypto/CoreCryptoKeyProvider.swift | 2 +- wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift | 2 +- .../Source/Core Crypto/CoreCryptoProvider.swift | 2 +- wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift | 2 +- .../Source/E2EIdentity/E2EIVerificationStatusService.swift | 2 +- .../Source/EntityValidation/ConnectionValidator.swift | 2 +- wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift | 2 +- wire-ios-data-model/Source/MLS/MLSActionExecutor.swift | 2 +- wire-ios-data-model/Source/MLS/MLSClientManager.swift | 2 +- wire-ios-data-model/Source/MLS/MLSDecryptionService.swift | 2 +- wire-ios-data-model/Source/MLS/MLSEncryptionService.swift | 2 +- wire-ios-data-model/Source/MLS/MLSGroupVerification.swift | 2 +- wire-ios-data-model/Source/MLS/MLSService.swift | 2 +- .../MLS/Migration/ProteusToMLSMigrationCoordinator.swift | 2 +- .../Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift | 2 +- .../Source/MLS/OneOnOne/OneOnOneMigrator.swift | 2 +- .../Source/MLS/StaleMLSKeyMaterialDetector.swift | 2 +- .../Source/ManagedObjectContext/CoreDataStack+Backup.swift | 2 +- .../Source/ManagedObjectContext/CoreDataStack.swift | 2 +- .../Migration/106-107/CleanupModels107PreAction.swift | 2 +- .../Migration/110-111/PrefillPrimaryKeyAction.swift | 2 +- .../Migration/110-111/RemoveDuplicatePreAction.swift | 2 +- .../113-114/OneOnOneConversationMigrationAction.swift | 2 +- .../118-119/FixDuplicateOneOnOneConversationsAction.swift | 2 +- .../Migration/119-120/ForceSyncResourcesPostAction.swift | 2 +- .../Migration/130-131/SetCorrectUserTypeAction.swift | 2 +- .../ManagedObjectContext/Migration/CoreDataMigrator.swift | 2 +- .../NSManagedObjectContext+EncryptionAtRest.swift | 2 +- .../NSManagedObjectContext+FetchRequest.swift | 2 +- .../Source/Model/Conversation/ZMConversation+Message.swift | 2 +- .../Source/Model/Conversation/ZMConversation+Messaging.swift | 2 +- .../Model/Conversation/ZMConversation+SecurityLevel.swift | 2 +- .../Source/Model/Conversation/ZMConversation+Timestamps.swift | 2 +- .../Model/Conversation/ZMConversation+UnreadCount.swift | 2 +- .../Model/FeatureConfig/AppLock/AppLockController.swift | 2 +- wire-ios-data-model/Source/Model/Message/FileAssetCache.swift | 2 +- .../Source/Model/Message/GenericMessage+External.swift | 2 +- .../Source/Model/Message/ZMAssetClientMessage.swift | 2 +- .../Source/Model/Message/ZMClientMessage+Encryption.swift | 2 +- .../Source/Model/Message/ZMClientMessage.swift | 2 +- .../Source/Model/Message/ZMGenericMessageData.swift | 2 +- .../Source/Model/Message/ZMMessage+Insert.swift | 2 +- .../Source/Model/Message/ZMOTRMessage+Quotes.swift | 2 +- .../Source/Model/Message/ZMOTRMessage+UpdateEvent.swift | 2 +- wire-ios-data-model/Source/Model/UserClient/UserClient.swift | 2 +- .../StoredUpdateEvent/StoredUpdateEvent+Helpers.swift | 2 +- .../Source/Proteus/CryptoboxMigrationManager.swift | 2 +- wire-ios-data-model/Source/Proteus/ProteusProvider.swift | 2 +- wire-ios-data-model/Source/Proteus/ProteusService.swift | 2 +- .../Source/Repositories/LegacyFeatureRepository.swift | 2 +- .../Source/UseCases/RemoveLocalConversationUseCase.swift | 2 +- wire-ios-data-model/Source/Utilis/KeychainManager.swift | 2 +- .../Source/Utilis/LastUpdateEventIDRepository.swift | 2 +- wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift | 2 +- .../Source/Model/UserClient/UserClientTests+SafeLogging.swift | 2 +- .../Sources/NotificationSession.swift | 2 +- .../Sources/Synchronization/OperationLoop.swift | 2 +- .../Synchronization/Strategies/PushNotificationStrategy.swift | 2 +- .../Sources/E2EIdentity/E2EIEnrollment.swift | 2 +- .../Sources/E2EIdentity/E2EIKeyPackageRotator.swift | 2 +- .../Sources/E2EIdentity/E2EIRepository.swift | 2 +- .../Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift | 2 +- .../Sources/Helpers/MessageExpirationTimer.swift | 2 +- .../Sources/Helpers/MessageLogAttributesBuilder.swift | 2 +- .../Sources/Message Sending/MessageDependencyResolver.swift | 2 +- .../Sources/Message Sending/MessageInfoExtractor.swift | 2 +- .../Sources/Message Sending/MessageSender.swift | 2 +- .../Sources/Notifications/NotificationStreamSync.swift | 2 +- .../Content/ZMLocalNotification+Events.swift | 2 +- .../Notification Types/Content/ZMLocalNotification.swift | 2 +- .../Sources/Notifications/PushNotificationStatus.swift | 2 +- .../Sources/Payloads/Payload+Coding.swift | 2 +- .../Payloads/Processing/ConnectionPayloadProcessor.swift | 2 +- .../Processing/ConversationEventPayloadProcessor.swift | 2 +- .../Payloads/Processing/Helpers/MLSEventProcessor.swift | 2 +- .../Processing/MessageSendingStatusPayloadProcessor.swift | 2 +- .../Assets/AssetClientMessageRequestStrategy.swift | 2 +- .../Assets/AssetV3UploadRequestStrategy.swift | 2 +- .../Link Preview/LinkPreviewAssetUploadRequestStrategy.swift | 2 +- .../Link Preview/LinkPreviewUpdateRequestStrategy.swift | 2 +- .../Availability/AvailabilityRequestStrategy.swift | 2 +- .../Client Message/ClientMessageRequestStrategy.swift | 2 +- .../Connection/ConnectionRequestStrategy.swift | 2 +- .../Actions/CreateGroupConversationActionHandler.swift | 2 +- .../Conversation/ConversationEventProcessor.swift | 2 +- .../Conversation/ConversationParticipantsService.swift | 2 +- .../Conversation/ConversationRequestStrategy.swift | 2 +- .../Request Strategies/Conversation/ConversationService.swift | 2 +- .../Conversation/MLSConversationParticipantsService.swift | 2 +- .../Delivery Receipts/DeliveryReceiptRequestStrategy.swift | 2 +- .../Feature configurations/FeatureConfigRequestStrategy.swift | 2 +- .../Payload/FeatureConfigsPayloadProcessor.swift | 2 +- .../MLS/FetchBackendMLSPublicKeysRequestStrategy.swift | 2 +- .../User Clients/ResetSessionRequestStrategy.swift | 2 +- .../Request Strategies/User/UserProfileRequestStrategy.swift | 2 +- .../Request Strategies/User/UserPropertyRequestStrategy.swift | 2 +- .../Sources/Synchronization/Decoding/EventDecoder+MLS.swift | 2 +- .../Synchronization/Decoding/EventDecoder+Proteus.swift | 2 +- .../Sources/Synchronization/Decoding/EventDecoder.swift | 2 +- .../Tests/Helpers/MessagingTestBase.swift | 2 +- .../Sources/ZMConversation+Conversation.swift | 2 +- wire-ios-share-engine/Sources/ZMMessage+Sendable.swift | 2 +- wire-ios-sync-engine/Source/Calling/CallKitManager.swift | 2 +- .../Calling/MLSConferenceStaleParticipantsRemover.swift | 2 +- .../Source/Calling/WireCallCenterV3+Events.swift | 2 +- .../Source/Calling/WireCallCenterV3+MLS.swift | 2 +- wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift | 2 +- .../Source/Data Model/Conversation+Deletion.swift | 2 +- .../Data Model/Conversation+MessageDestructionTimeout.swift | 2 +- .../Source/Data Model/Conversation+ReadReceiptMode.swift | 2 +- wire-ios-sync-engine/Source/Data Model/Typing.swift | 2 +- .../Source/E2EI/CRL/CertificateRevocationListsChecker.swift | 2 +- .../Push notifications/LocalNotificationDispatcher.swift | 2 +- .../Source/Notifications/VoIPPushManager.swift | 2 +- .../Source/Services/LegacySupportedProtocolsService.swift | 2 +- .../SessionManager/APIMigration/APIMigrationManager.swift | 2 +- .../SessionManager/APIMigration/AccessTokenMigration.swift | 2 +- .../Source/SessionManager/APIVersionResolver.swift | 2 +- .../Source/SessionManager/AVSLogObserver.swift | 2 +- .../BackendEnvironmentProvider+Reachability.swift | 2 +- .../Source/SessionManager/PushTokenService.swift | 2 +- .../Source/SessionManager/SessionFactories.swift | 2 +- .../SessionManager+CallKitManagerDelegate.swift | 2 +- .../SessionManager/SessionManager+EncryptionAtRest.swift | 2 +- .../Source/SessionManager/SessionManager+PushToken.swift | 2 +- .../SessionManager+UserSessionLogoutDelegate.swift | 2 +- .../SessionManager+UserSessionSelfUserClientDelegate.swift | 2 +- .../SessionManager+VoIPPushManagerDelegate.swift | 2 +- .../Source/SessionManager/SessionManager.swift | 2 +- wire-ios-sync-engine/Source/SessionManager/URLActions.swift | 2 +- .../Source/SessionManager/UpdateEventMigrator.swift | 2 +- .../Source/SessionManager/UserSessionLoader.swift | 2 +- .../Source/Synchronization/EventProcessor.swift | 2 +- .../Source/Synchronization/IncrementalSyncObserver.swift | 2 +- .../Synchronization/Strategies/CallingRequestStrategy.swift | 2 +- .../Strategies/EvaluateOneOnOneConversationsStrategy.swift | 2 +- .../Strategies/LabelDownstreamRequestStrategy.swift | 2 +- .../Synchronization/Strategies/LegalHoldRequestStrategy.swift | 2 +- .../RegistationCredentialVerificationStrategy.swift | 2 +- .../Strategies/SelfSupportedProtocolsRequestStrategy.swift | 2 +- .../Strategies/TeamDownloadRequestStrategy.swift | 2 +- .../Synchronization/Strategies/UserClientEventConsumer.swift | 2 +- .../Strategies/UserClientRequestStrategy.swift | 2 +- .../Strategies/UserImageAssetUpdateStrategy.swift | 2 +- wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift | 2 +- .../Source/Synchronization/ZMOperationLoop+PushChannel.swift | 2 +- .../Source/Use cases/AppendMultipartMessageUseCase.swift | 2 +- .../Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift | 2 +- .../Source/Use cases/GetUserClientFingerprintUseCase.swift | 2 +- .../ImportBackupUseCase/ImportLegacyBackupUseCase.swift | 2 +- .../Use cases/LegacyResolveOneOnOneConversationsUseCase.swift | 2 +- .../Source/Use cases/RemoveUserClientUseCase.swift | 2 +- wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift | 2 +- .../Source/UserSession/NSManagedObject+CryptoStack.swift | 2 +- wire-ios-sync-engine/Source/UserSession/OperationStatus.swift | 2 +- wire-ios-sync-engine/Source/UserSession/SyncStatus.swift | 2 +- .../URLActionProcessors/DeepLinkURLActionProcessor.swift | 2 +- .../URLActionProcessors/ImportEventsURLActionProcessor.swift | 2 +- .../Source/UserSession/ZMClientRegistrationStatus.swift | 2 +- .../AppVersionMigrations/AppVersionMigration_4_1_1.swift | 2 +- .../UnknownMessageAppVersionMigration.swift | 2 +- .../UserSession/ZMUserSession/ZMUserSession+AccessToken.swift | 2 +- .../UserSession/ZMUserSession/ZMUserSession+Actions.swift | 2 +- .../ZMUserSession/ZMUserSession+AnalyticsUser.swift | 2 +- .../ZMUserSession+CertificateRevocationLists.swift | 2 +- .../ZMUserSession/ZMUserSession+EncryptionAtRest.swift | 2 +- .../UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift | 2 +- .../UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift | 2 +- .../Source/UserSession/ZMUserSession/ZMUserSession+Push.swift | 2 +- .../ZMUserSession/ZMUserSession+RecurringAction.swift | 2 +- .../ZMUserSession/ZMUserSession+WireCallStateObserver.swift | 2 +- .../Source/UserSession/ZMUserSession/ZMUserSession.swift | 2 +- .../UserSession/ZMUserSession/ZMUserSessionBuilder.swift | 2 +- .../Source/SessionManager/APIMigrationManagerTests.swift | 4 ++-- .../Tests/Source/UserSession/ZMUserSessionTestsBase.swift | 2 +- .../Source/UserSession/ZMUserSessionTests_NetworkState.swift | 4 ++-- wire-ios-system/Source/ExpiringActivity.swift | 2 +- wire-ios-system/Source/TimePoint.swift | 2 +- wire-ios-system/Source/WireLoggerObjC.swift | 2 +- wire-ios-system/Source/ZMSAsserts.swift | 2 +- wire-ios-system/Source/ZMSLog.swift | 2 +- .../Source/Authentication/ZMAccessTokenHandler.swift | 2 +- .../Source/Background/BackgroundActivityFactory.swift | 2 +- .../Source/Logging/WireLoggerObjC_LogRequest.swift | 2 +- wire-ios-transport/Source/Public/ServerCertificateTrust.swift | 2 +- wire-ios-transport/Source/Public/ZMUpdateEvent.swift | 2 +- .../Source/PushChannel/StarscreamPushChannel.swift | 2 +- .../UnauthenticatedTransportSession.swift | 2 +- wire-ios-utilities/Source/Keychain/Keychain.swift | 2 +- .../LegacyNotificationService.swift | 2 +- .../NotificationService.swift | 2 +- .../View Controllers/ShareExtensionViewController.swift | 2 +- .../Calling/Analytics/CallEndedAnalyticsControllerTests.swift | 2 +- .../Debug Report/SettingsDebugReportViewModelTests.swift | 2 +- .../TrackingManager+UIAlertController.swift | 2 +- .../Sources/AnalyticsTrackingManager/TrackingManager.swift | 2 +- wire-ios/Wire-iOS/Sources/AppDelegate.swift | 2 +- wire-ios/Wire-iOS/Sources/AppStateCalculator.swift | 2 +- wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift | 2 +- .../Coordinator/AuthenticationCoordinator.swift | 2 +- .../Sources/Authentication/Helpers/PasscodeRules+Shared.swift | 2 +- .../Authentication/Helpers/RegistrationAnalyticsTracker.swift | 2 +- .../ViewControllers/AuthenticationHostingController.swift | 2 +- .../Sources/Components/Settings/SettingsPropertyFactory.swift | 2 +- wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift | 2 +- .../ConversationDeveloperActionsProvider.swift | 2 +- .../UserClientDeveloperActionsProvider.swift | 2 +- .../DebugActions/DeveloperDebugActionsViewModel.swift | 2 +- .../DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift | 2 +- wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift | 2 +- wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift | 2 +- wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift | 2 +- .../Sources/Helpers/TmpFiles/TemporaryFileService.swift | 2 +- .../Helpers/syncengine/Conversation+Participants.swift | 2 +- wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift | 2 +- .../Sources/Managers/Image/ProfileImagePickerManager.swift | 2 +- .../UserInterface/Blacklist/BlockerViewController.swift | 2 +- .../Calling/Analytics/CallEndedAnalyticsController.swift | 2 +- .../CallParticipantViews/AVSVideoContainerView.swift | 2 +- .../UserInterface/Collections/CollectionsViewController.swift | 2 +- .../UserInterface/Company Login/CompanyLoginController.swift | 2 +- .../Components/NetworkStatus/NetworkStatusView.swift | 2 +- .../Components/ConversationSystemMessageCellDescription.swift | 2 +- ...onContentViewController+CanvasViewControllerDelegate.swift | 2 +- .../Content/ConversationContentViewController+Forward.swift | 2 +- .../ConversationContentViewController+MessageAction.swift | 2 +- .../Content/ConversationContentViewController.swift | 2 +- .../Content/ConversationTableViewDataSource.swift | 2 +- ...Controller+ConversationContentViewControllerDelegate.swift | 2 +- .../Conversation/ConversationViewController.swift | 2 +- .../Conversation/Create/ConversationCreationController.swift | 2 +- .../WireConversationChannelCreationFormViewController.swift | 2 +- .../UserInterface/Conversation/InputBar/AudioRecorder.swift | 2 +- .../InputBar/ConversationInputBarViewController+Camera.swift | 2 +- .../InputBar/ConversationInputBarViewController+Files.swift | 2 +- .../ConversationInputBarViewController+SendButton.swift | 2 +- .../ConversationInputBarViewController.swift | 2 +- .../Conversation/InputBar/Emoji/EmojiRepository.swift | 2 +- .../ViewModel/ConversationListViewControllerViewModel.swift | 2 +- .../DeviceView/DeviceDetailsViewActionsHandler.swift | 2 +- .../E2EIdentity/E2EINotificationActionsHandler.swift | 2 +- .../Sources/UserInterface/E2EIdentity/OAuthUseCase.swift | 2 +- .../GroupDetails/GroupDetailsViewController.swift | 2 +- .../GroupParticipantsDetailViewModel.swift | 2 +- .../GroupDetails/Sections/ParticipantsSectionController.swift | 2 +- .../ZClientViewController+StartUIDelegate.swift | 2 +- .../UserInterface/MainController/ZClientViewController.swift | 2 +- .../ShouldPresentNotificationPermissionHintUseCase.swift | 2 +- .../SelfProfile/ProfileHeaderViewController.swift | 2 +- .../UserInterface/SelfProfile/SelfProfileViewsMonitor.swift | 2 +- .../SettingsCellDescriptorFactory+Account.swift | 2 +- .../Settings/Debug Report/LogFilesProvider.swift | 2 +- .../Settings/Debug Report/SettingsDebugReportViewModel.swift | 2 +- .../Settings/DeviceManagement/ClientListViewController.swift | 2 +- .../Settings/MFMailComposeViewController+Logs.swift | 2 +- .../StartUI/StartUI/SearchResultsViewController.swift | 2 +- .../Devices/OtherUserClientsListViewController.swift | 2 +- .../UserInterface/UserProfile/ProfileActionsFactory.swift | 2 +- .../UserInterface/UserProfile/ProfileViewController.swift | 2 +- .../UserProfile/ProfileViewControllerViewModel.swift | 2 +- .../Analytics/Datadog/WireDatadog+LoggerProtocol.swift | 2 +- wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift | 2 +- .../FileMetaDataGenerator/FileMetaDataGenerator.swift | 2 +- .../WireCommonComponents/Logging/CocoaLumberjackLogger.swift | 2 +- 375 files changed, 378 insertions(+), 378 deletions(-) diff --git a/.github/workflows/test_pr_changes.yml b/.github/workflows/test_pr_changes.yml index df339e1c038..3ddf68901aa 100644 --- a/.github/workflows/test_pr_changes.yml +++ b/.github/workflows/test_pr_changes.yml @@ -64,8 +64,8 @@ jobs: WireCalling: - 'WireCalling/**' - 'wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireCallingAll.xcscheme' - WireLegacyLogging: - - 'WireLegacyLogging/**' + WireLogging: + - 'WireLogging/**' WireDomain: - 'WireDomain/**' wire-ios-data-model: diff --git a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift index 8132172fbd7..46bf53290c4 100644 --- a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift +++ b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift @@ -19,7 +19,7 @@ public import WireFoundation import Foundation -import WireLegacyLogging +import WireLogging /// A service for tracking analytics data generated by the user. diff --git a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift index 2901f5d418a..95a36ca274a 100644 --- a/WireAnalytics/Sources/WireDatadog/WireDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireDatadog.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLegacyLogging +public import WireLogging import CryptoKit import DatadogCore diff --git a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift index 04d14bca321..235e8e5ce8c 100644 --- a/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift +++ b/WireAnalytics/Sources/WireDatadog/WireFakeDatadog.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLegacyLogging +public import WireLogging public final class WireDatadog { diff --git a/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift b/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift index 39fb8cd991b..8ea46020a0e 100644 --- a/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift +++ b/WireAuthentication/Sources/WireAuthentication/Components/DetermineAuthMethodComponent.swift @@ -19,7 +19,7 @@ import NeedleFoundation import SwiftUI import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork internal import WireAuthenticationUI internal import WireAuthenticationLogic diff --git a/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift b/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift index 8fc27b095c6..1e339422615 100644 --- a/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift +++ b/WireAuthentication/Sources/WireAuthentication/Needle.generated.swift @@ -6,7 +6,7 @@ import NeedleFoundation import SwiftUI import WireAuthenticationAPI import WireFoundation -import WireLegacyLogging +import WireLogging import WireMultiBackendUI import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift b/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift index ec273b64f71..d76c613d2f1 100644 --- a/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift +++ b/WireAuthentication/Sources/WireAuthenticationLogic/FetchBackendConfigUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork public struct FetchBackendConfigUseCase: FetchBackendConfigUseCaseProtocol { diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift index d919e4277d5..6eaf4aa82ff 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/DetermineAuthMethod/DetermineAuthMethodViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift index 97c83601cd8..4f8d59c7667 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/LoginViaEmail/LoginViaEmailViewModel.swift @@ -19,7 +19,7 @@ import Foundation import UIKit import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift index 7834e55e0d1..8dbd93f4bd3 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaEmail/ReloginViaEmailViewModel.swift @@ -19,7 +19,7 @@ import Foundation import UIKit import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift index 52d65b95d8d..3a2bed616c1 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/ReloginViaSSO/ReloginViaSSOViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift index 26de20a29c5..38f45fb7817 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Login/VerificationCode/VerificationCodeViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork @MainActor diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift index 70d8028ded1..6d393f4f014 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/PersonalAccountCreation/PersonalAccountCreationViewModel.swift @@ -18,7 +18,7 @@ import SwiftUI import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging import WireNetwork import WireReusableUIComponents diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift index 4ab41e3b3d1..0f3946db89a 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Registration/VerificationEmailCode/VerificationEmailCodeViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import WireAuthenticationAPI -import WireLegacyLogging +import WireLogging @MainActor public final class VerificationEmailCodeViewModel: ObservableObject { diff --git a/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift b/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift index 482955f2725..3571c10d6c0 100644 --- a/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift +++ b/WireAuthentication/Sources/WireAuthenticationUI/Views/Root/Router.swift @@ -19,7 +19,7 @@ import Combine import Foundation import SwiftUI -import WireLegacyLogging +import WireLogging @MainActor package protocol Router { diff --git a/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift b/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift index 181d5992224..d56be431bbb 100644 --- a/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift +++ b/WireBackup/Sources/WireBackup/UseCases/CreateBackupUseCase.swift @@ -18,7 +18,7 @@ public import WireUtilitiesPackage public import WireFoundation -public import WireLegacyLogging +public import WireLogging import Foundation @preconcurrency import KaliumBackup diff --git a/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift b/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift index 9da73cc95c6..c3a269430f9 100644 --- a/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift +++ b/WireBackup/Sources/WireBackup/UseCases/ImportBackupUseCase.swift @@ -17,7 +17,7 @@ // public import Foundation -public import WireLegacyLogging +public import WireLogging public import WireFoundation public import WireUtilitiesPackage diff --git a/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift b/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift index 87556bf224d..e7d2be7fb42 100644 --- a/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift +++ b/WireBackup/Tests/WireBackupTests/UseCases/CreateAndImportBackupUseCaseTests.swift @@ -19,7 +19,7 @@ import WireBackupSupport import WireFoundation import WireFoundationSupport -import WireLegacyLogging +import WireLogging import WireUtilitiesPackage import XCTest diff --git a/WireDomain/Sources/WireDomain/Account/AccountManager.swift b/WireDomain/Sources/WireDomain/Account/AccountManager.swift index 971db252f23..d19930ecb6a 100644 --- a/WireDomain/Sources/WireDomain/Account/AccountManager.swift +++ b/WireDomain/Sources/WireDomain/Account/AccountManager.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public let AccountManagerDidUpdateAccountsNotificationName = Notification .Name("AccountManagerDidUpdateAccountsNotification") diff --git a/WireDomain/Sources/WireDomain/Account/AccountStore.swift b/WireDomain/Sources/WireDomain/Account/AccountStore.swift index 9b376b5cd5e..74f5b4fbbd7 100644 --- a/WireDomain/Sources/WireDomain/Account/AccountStore.swift +++ b/WireDomain/Sources/WireDomain/Account/AccountStore.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift b/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift index aea27b7a3e0..9fbecc47b33 100644 --- a/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift +++ b/WireDomain/Sources/WireDomain/Account/BackendEnvironmentStore.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork public struct BackendEnvironmentStore { diff --git a/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift b/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift index c50f9c864ec..27405b95d1e 100644 --- a/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift +++ b/WireDomain/Sources/WireDomain/AppVersionMigration/AppVersionMigrationService.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// A service that runs interruptible migrations when the app /// is updated from one version to another. diff --git a/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift b/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift index 19348bb2bc8..da65ae74d85 100644 --- a/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift +++ b/WireDomain/Sources/WireDomain/Core Crypto/CoreCryptoKeyMigrationManager.swift @@ -18,7 +18,7 @@ import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging public class CoreCryptoKeyMigrationManager: CoreCryptoKeyMigrationManagerProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift b/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift index 3dc39b09caf..e8d5bf76054 100644 --- a/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift +++ b/WireDomain/Sources/WireDomain/Event Decryption/MLSMessageDecryptor.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct MLSMessageDecryptor: MLSMessageDecryptorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift index da19bc3d0bb..3110f1fef7f 100644 --- a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift +++ b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct UpdateEventDecryptor: UpdateEventDecryptorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift index ac2836c7d63..23dd8233971 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift index b14b9e20c73..3ec62c78a92 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSResetEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct ConversationMLSResetEventProcessor: ConversationMLSResetEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift index 43af11df3d1..4748506d37b 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSWelcomeEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct ConversationMLSWelcomeEventProcessor: ConversationMLSWelcomeEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift index 352f4fddce2..22fea5c8cf9 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationMLSMessageAddEventProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift index 8e7da116e31..2c4b7eca0db 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMessageAddEventProcessor/ConversationProteusMessageAddEventProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct ConversationProteusMessageAddEventProcessor: ConversationProteusMessageAddEventProcessorProtocol, diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift index 114a99ac620..368f592c017 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift @@ -18,7 +18,7 @@ import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public struct ConversationProtobufMessageProcessor: ConversationProtobufMessageProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift index 9017d8cdd3c..4b87a1e42b4 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift index fc8e9c3444f..a6bed111b14 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UpdateEventProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork struct UpdateEventProcessor: UpdateEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift index df1007d168c..de2da7048d9 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserClientRemoveEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct UserClientRemoveEventProcessor: UserClientRemoveEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift index 8e3f55d3eca..0d44746bbb5 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserConnectionEventProcessor.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork struct UserConnectionEventProcessor: UserConnectionEventProcessorProtocol { diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift index bf62a6fe2c2..f88189d0778 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift b/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift index 825bc9d0d85..4b5d6f6d8cc 100644 --- a/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift +++ b/WireDomain/Sources/WireDomain/Extensions/LogAttributes/SyncLogAttributes.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireUtilities /// Sync related logs diff --git a/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift b/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift index 696a01519ad..f670927acb8 100644 --- a/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift +++ b/WireDomain/Sources/WireDomain/Helpers/AppExtensionPushChannelCoordinator.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging public struct YieldRequest { var action: () -> Void diff --git a/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift b/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift index b8a07e376a5..0ebdbb09435 100644 --- a/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public protocol InitiateResetMLSConversationUseCaseProtocol { diff --git a/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift b/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift index be99f077094..6d532500aa4 100644 --- a/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift +++ b/WireDomain/Sources/WireDomain/Helpers/MainAppPushChannelCoordinator.swift @@ -15,7 +15,7 @@ // 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 +import WireLogging // sourcery: AutoMockable public protocol MainAppPushChannelCoordinatorProtocol { diff --git a/WireDomain/Sources/WireDomain/Needle.generated.swift b/WireDomain/Sources/WireDomain/Needle.generated.swift index b8d4a25bc3b..76121bfab3d 100644 --- a/WireDomain/Sources/WireDomain/Needle.generated.swift +++ b/WireDomain/Sources/WireDomain/Needle.generated.swift @@ -6,7 +6,7 @@ import UserNotifications import WireCrypto import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork // swiftlint:disable unused_declaration diff --git a/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift b/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift index de70b203b5c..60581eb30f4 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Builders/Conversation/Models/CallContent.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging struct CallContent: Decodable { diff --git a/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift b/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift index 719c60ff1ea..554ebef8356 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Components/Legacy/SyncEventsStep.swift @@ -21,7 +21,7 @@ import NeedleFoundation import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork protocol SyncEventsDependency: Dependency { diff --git a/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift b/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift index 4230cb8639f..aa7d4bdf982 100644 --- a/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift +++ b/WireDomain/Sources/WireDomain/Notifications/Components/NSEClientScope.swift @@ -19,7 +19,7 @@ import Foundation import NeedleFoundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork protocol NSEClientScopeDependency: Dependency { diff --git a/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift index 5c3d5d18e86..6e2bf6a6df0 100644 --- a/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/GenerateNotificationUseCase.swift @@ -19,7 +19,7 @@ import CallKit import UserNotifications import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift b/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift index 45b105e664e..df344388f99 100644 --- a/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift +++ b/WireDomain/Sources/WireDomain/Notifications/NotificationServiceExtension.swift @@ -19,7 +19,7 @@ import NeedleFoundation import UserNotifications import WireDataModel -import WireLegacyLogging +import WireLogging /// Receives and process a push notification through a flow of several steps: /// 1. Process push notification request (`ProcessNotificationRequestStep`) diff --git a/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift index 3cea0b0a004..3d9a5a8845a 100644 --- a/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/ProcessNotificationRequestUseCase.swift @@ -17,7 +17,7 @@ // import UserNotifications -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol ProcessNotificationUseCaseProtocol { diff --git a/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift index 56be187b6f7..1916c86f875 100644 --- a/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/PullEventsUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift index 3f0c88a3f73..a42796db53c 100644 --- a/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/ShowNotificationUseCase.swift @@ -20,7 +20,7 @@ import CallKit import Foundation import UserNotifications import WireDataModel -import WireLegacyLogging +import WireLogging protocol ShowNotificationUseCaseProtocol { func invoke( diff --git a/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift index ff2d6ded185..8fc5bcdf65f 100644 --- a/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/SyncEventsUseCase.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift b/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift index f4580dbfb8a..655078c1996 100644 --- a/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift +++ b/WireDomain/Sources/WireDomain/Notifications/VerifyUserSessionUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork /// Observes pending events, process them and generates new notifications content. diff --git a/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift b/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift index a396834cd53..f2dc46ab8e6 100644 --- a/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/BackendConfig/BackendConfigRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork final class BackendConfigRepository: BackendConfigRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift index 724db980e62..9ccbf7d55dd 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/LocalStore/ConversationLocalStore.swift @@ -19,7 +19,7 @@ import CoreData import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging public final class ConversationLocalStore: ConversationLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift index 9be0e4892ad..b2aac5b357b 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public final class ConversationRepository: ConversationRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift index ec089972dc8..21d41063e3b 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging public final class ConversationLabelsLocalStore: ConversationLabelsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift index f49a658ff2a..b9ee359da1d 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public class ConversationLabelsRepository: ConversationLabelsRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift index 75602c9c55d..6b66a24335f 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging public final class FeatureConfigLocalStore: FeatureConfigLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift index e8566a61462..dcc057f8d6d 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift @@ -18,7 +18,7 @@ import Combine import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public final class FeatureConfigRepository: FeatureConfigRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift index 7d19a0de0d2..261d71a9bad 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Message/MessageLocalStore.swift @@ -20,7 +20,7 @@ import CoreData import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLegacyLogging +import WireLogging public final class MessageLocalStore: MessageLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift index 2cc874b5927..3119c6856d8 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift @@ -18,7 +18,7 @@ import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireUpdateEventCoding diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift index 0232cf16aa6..cbf3efac68c 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public final class UserLocalStore: UserLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift index fa8cbd86822..96a37a24d07 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork public final class UserRepository: UserRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift index fc5da6f9b53..911948847be 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging public struct UserClientsLocalStore: UserClientsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift b/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift index cd6afb3049a..589d94dfc8f 100644 --- a/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift +++ b/WireDomain/Sources/WireDomain/Services/UnknownMessageProcessingService.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging /// Service responsible for processing stored unknown messages when the app is updated /// and new protobuf message types become available. diff --git a/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift b/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift index ca4dc5d6dc7..517968a8fb4 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/ConsumableNotificationsMigrator.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork typealias IncrementalSyncV1 = IncrementalSync diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift index bad7a672a6a..23ccb7bb2ba 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift index a262223696e..3e43327c79a 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift @@ -20,7 +20,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public typealias CreatePushChannelStateClosure = () -> PushChannelStateProtocol diff --git a/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift b/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift index a078caa9594..1a41d25bea1 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/InitialSync.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLegacyLogging +import WireLogging public struct InitialSync: InitialSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift b/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift index 41c1ce201ee..517706c68a1 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/MLSGroupRepairAgent.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MLSGroupRepairAgentProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift b/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift index 1979838705f..bffbda37f68 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/MLSTransportImpl.swift @@ -17,7 +17,7 @@ // import WireCoreCrypto -import WireLegacyLogging +import WireLogging import WireNetwork final class MLSTransportImpl: MlsTransport { diff --git a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift index 27f5454efa3..8638c2b6a90 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift @@ -18,7 +18,7 @@ import CoreData import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public struct OneOnOneResolver: OneOnOneResolverProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift index 33a4ba148a1..2c88490ff6e 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullAllFeatureConfigsSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork struct PullAllFeatureConfigsSync: PullAllFeatureConfigsSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift index 505dadc594d..4b54a95c52d 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullLastUpdateEventIDSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork struct PullLastUpdateEventIDSync: PullLastUpdateEventIDSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift index 077eb17843a..547e770d495 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullMLSStatusSync.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public struct PullMLSStatusSync: PullMLSStatusSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift index ef15f50499b..ddfd4511ffc 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsSync.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork public struct PullPendingUpdateEventsSync: PullPendingUpdateEventsSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift index 9f5aaebc309..4265740a150 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork /// Closure to generate syncMarker, use for testing diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift index 2409cd84d57..f0e10d14c26 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PullResourcesSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging struct PullResourcesSync: PullResourcesSyncProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift b/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift index f781ea82f70..f61ed485316 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PushChannelState.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // import WireDataModel -import WireLegacyLogging +import WireLogging /// sourcery: AutoMockable public protocol PushChannelStateProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift b/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift index 23c2aae7230..082a5b26a9e 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/PushSupportedProtocolsSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift index 3aad611675b..79b3ab4abf7 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CalculateSupportedProtocolsUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift index 6fc82de2e16..054f8bd136b 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CreateChannelUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift index 23803e1e4ed..95afd6683d7 100644 --- a/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/CreateGroupConversationUseCase.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging import WireNetwork // sourcery: AutoMockable diff --git a/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift index 3fe2e70f1e5..cfc5e8c11e1 100644 --- a/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/IndividualToTeamMigrationUseCase.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireDomainPackage -import WireLegacyLogging +import WireLogging import WireNetwork import WireSystem diff --git a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift b/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift index 40cb662e9af..d43e8d33e70 100644 --- a/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift +++ b/WireLogging/Tests/WireLogging/Network/RequestLogTests.swift @@ -18,7 +18,7 @@ import Foundation import XCTest -@testable import WireLegacyLogging +@testable import WireLogging class RequestLogTests: XCTestCase { diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift b/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift index 5dabef9f8fa..7c5fec36e65 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/DraftsRepository.swift @@ -20,7 +20,7 @@ import Collections @preconcurrency import Combine import Foundation package import UniformTypeIdentifiers -import WireLegacyLogging +import WireLogging package import WireMessagingDomain enum DraftsRepositoryError: Error, Equatable { diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift index bf04c8d66d6..9c523ec3e62 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/AWSClient.swift @@ -22,7 +22,7 @@ package import Foundation import Smithy import SmithyIdentity import SmithyStreams -import WireLegacyLogging +import WireLogging import WireMessagingDomain // sourcery: AutoMockable diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift index 4581ae4037a..16f734260f6 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift @@ -18,7 +18,7 @@ import CellsSDK import Foundation -import WireLegacyLogging +import WireLogging import WireMessagingDomain enum WireCellsNodesAPIError: Error { diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift b/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift index 19b9c64860f..910c503e3aa 100644 --- a/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift +++ b/WireMessaging/Sources/WireMessagingData/WireCells/WireCellsNodeUploadManager.swift @@ -17,7 +17,7 @@ // package import Foundation -import WireLegacyLogging +import WireLogging package import WireMessagingDomain package final actor WireCellsNodeUploadManager: WireCellsNodeUploadManagerProtocol { diff --git a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift index c4fefe78511..62ce6d67b1c 100644 --- a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift +++ b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/ClearPublishedDraftsUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging package struct ClearPublishedDraftsUseCase: WireCellsClearPublishedDraftsUseCaseProtocol { diff --git a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift index 0ba58f4f479..08969f0e242 100644 --- a/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift +++ b/WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/UploadDraftUseCase.swift @@ -18,7 +18,7 @@ package import Foundation package import UniformTypeIdentifiers -import WireLegacyLogging +import WireLogging enum UploadDraftUseCaseError: Error { diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift index 79df3c98ece..31d2a500799 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsCarousel/AttachmentsCarouselViewModel.swift @@ -21,7 +21,7 @@ import UIKit public import WireMessagingDomain import QuickLookThumbnailing import UniformTypeIdentifiers -import WireLegacyLogging +import WireLogging @MainActor public final class AttachmentsCarouselViewModel: ObservableObject { diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift index 86cdcc2be8f..790241b8a52 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/AttachmentsPreviewView/WireCellsAttachmentsPreviewItemViewModel.swift @@ -20,7 +20,7 @@ import Combine import Foundation import SwiftUI import UniformTypeIdentifiers -import WireLegacyLogging +import WireLogging import WireMessagingDomain @MainActor diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift index 6db57c02cab..f583e3239d5 100644 --- a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift +++ b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift @@ -20,7 +20,7 @@ import Combine import SwiftUI import UniformTypeIdentifiers import WireFoundation -import WireLegacyLogging +import WireLogging package import WireMessagingDomain import WireMessagingDomainSupport diff --git a/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift b/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift index b7fe5a108f0..fb2b4b8092d 100644 --- a/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift +++ b/WireNetwork/Sources/WireNetwork/APIs/Rest/UpdateEventsAPI/Event decoding/UpdateEventDecodingProxy+FeatureConfig.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension UpdateEventDecodingProxy { diff --git a/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift b/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift index f3992d22b35..02b5bf2a75c 100644 --- a/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift +++ b/WireNetwork/Sources/WireNetwork/Authentication/AuthenticationManager.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol AuthenticationManagerProtocol { diff --git a/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift b/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift index 9789e70ecfe..352f4396e0a 100644 --- a/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift +++ b/WireNetwork/Sources/WireNetwork/Models/Authorization/DomainRegistrationConfiguration.swift @@ -18,7 +18,7 @@ public import Foundation -import WireLegacyLogging +import WireLogging /// The domain redirect configuration. diff --git a/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift b/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift index 6574ec64e7c..f598fb25fcf 100644 --- a/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift +++ b/WireNetwork/Sources/WireNetwork/Network/NetworkService/NetworkService.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging public import Foundation // sourcery: AutoMockable diff --git a/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift b/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift index 0ea0a5d7993..b8d7929696b 100644 --- a/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift +++ b/WireNetwork/Sources/WireNetwork/Network/NetworkStack/NetworkStack.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging /// High level access to a specific backend with automatic api /// version resolution. diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift index 63b7bf45805..5aa1a595adf 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannel.swift @@ -19,7 +19,7 @@ public import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging public typealias PushChannelV1 = PushChannel public typealias PushChannelV1Procotol = PushChannelProtocol diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift index d0544d9a790..295b23a8646 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/PushChannelV2.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging /// PushChannel using new consumable notifications public final class PushChannelV2: PushChannelV2Protocol { diff --git a/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift b/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift index ff292c0f008..e9521871ea8 100644 --- a/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift +++ b/WireNetwork/Sources/WireNetwork/Network/PushChannel/WebSocket.swift @@ -18,7 +18,7 @@ public import Foundation -import WireLegacyLogging +import WireLogging public actor WebSocket: WebSocketProtocol { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift index 45a6ca75416..b4d254f11bb 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/BackupImportExportBuilder.swift @@ -20,7 +20,7 @@ import SwiftUI import WireDesign import WireDomainPackage import WireFoundation -import WireLegacyLogging +import WireLogging public struct BackupImportExportBuilder { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift index 4c28ce6a474..47f5d2c6ff7 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Export/ExportBackupViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging @MainActor final class ExportBackupViewModel: ObservableObject { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift index c62994b43f4..da54df5e037 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Import/ImportBackupViewModel.swift @@ -19,7 +19,7 @@ import Foundation import WireDomainPackage import WireFoundation -import WireLegacyLogging +import WireLogging @MainActor final class ImportBackupViewModel: ObservableObject { diff --git a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift index dc737cb0cac..9e9e5fd74a1 100644 --- a/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift +++ b/WireUI/Sources/WireSettingsUI/Account/BackupImportExport/Previews/PreviewLogger.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging struct PreviewLogger: LoggerProtocol { diff --git a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift index 3d65daee4dd..4bba1b3129c 100644 --- a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift +++ b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Export/ExportBackupViewModelTests.swift @@ -18,7 +18,7 @@ import WireFoundation import WireFoundationSupport -import WireLegacyLogging +import WireLogging import WireTestingPackage import XCTest diff --git a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift index 31085226dfc..a7868b50727 100644 --- a/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift +++ b/WireUI/Tests/WireSettingsUITests/Account/BackupImportExport/Import/ImportBackupViewModelTestImportBackupViewModelTests.swift @@ -20,7 +20,7 @@ import Foundation import WireDomainPackage import WireFoundation import WireFoundationSupport -import WireLegacyLogging +import WireLogging import WireTestingPackage import XCTest diff --git a/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift b/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift index 4817186514f..e8d86ac1259 100644 --- a/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift +++ b/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift @@ -18,7 +18,7 @@ import Foundation import LocalAuthentication -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable /// An abstraction around authentication via `LAContext`. diff --git a/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift b/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift index a985e662909..e7d3e330864 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import Security -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable protocol EARKeyRepositoryInterface { diff --git a/wire-ios-data-model/Source/Authentication/EAR/EARService.swift b/wire-ios-data-model/Source/Authentication/EAR/EARService.swift index 18f2e4918cc..1b9e7a99865 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARService.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARService.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import LocalAuthentication -import WireLegacyLogging +import WireLogging /// An object that provides encryption at rest. /// diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift index 5164f832e06..74e9424d449 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoConfiguration.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging import WireSystem public struct CoreCryptoConfiguration { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift index 076e97693ff..3921f3e430e 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoKeyProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging import WireSystem public enum CoreCryptoKeyProviderDefaults: String, DefaultsKey { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift index 96a98570fc9..2410b01d8c6 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoLogger.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging final class CoreCryptoLoggerProxy: CoreCryptoLogger { diff --git a/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift b/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift index 5b25aeed20f..2fa58833fbb 100644 --- a/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift +++ b/wire-ios-data-model/Source/Core Crypto/CoreCryptoProvider.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireFoundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol CoreCryptoProviderProtocol { diff --git a/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift b/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift index cf8faf389af..cd49030f6a1 100644 --- a/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift +++ b/wire-ios-data-model/Source/Core Crypto/SafeCoreCrypto.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging // MARK: - Protocols diff --git a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift index deff71293df..ae37eff6209 100644 --- a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift +++ b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol E2EIVerificationStatusServiceInterface { diff --git a/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift b/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift index cba33cb44f0..c56fe79c882 100644 --- a/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift +++ b/wire-ios-data-model/Source/EntityValidation/ConnectionValidator.swift @@ -17,7 +17,7 @@ // import CoreData -import WireLegacyLogging +import WireLogging /// An object responsible for correcting invalid state regarding /// user connections. diff --git a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift index 0d5bd9e07b7..e5c053ac037 100644 --- a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift +++ b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift @@ -17,7 +17,7 @@ // import WireCoreCrypto -import WireLegacyLogging +import WireLogging struct CreateMLSGroupUseCase { diff --git a/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift b/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift index 3de394aa26d..121660046c0 100644 --- a/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift +++ b/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging public protocol MLSActionExecutorProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSClientManager.swift b/wire-ios-data-model/Source/MLS/MLSClientManager.swift index f7f214c423a..295a0f2dcfb 100644 --- a/wire-ios-data-model/Source/MLS/MLSClientManager.swift +++ b/wire-ios-data-model/Source/MLS/MLSClientManager.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MLSClientManagerProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift index 01cb79779fb..5acca97bb82 100644 --- a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging import WireSystem // sourcery: AutoMockable diff --git a/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift b/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift index 74e97a00ad5..e5aa0ea71c5 100644 --- a/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MLSEncryptionServiceInterface { diff --git a/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift b/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift index 88a7a65d342..4d58d67b6ca 100644 --- a/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift +++ b/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MLSGroupVerificationProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSService.swift b/wire-ios-data-model/Source/MLS/MLSService.swift index 2ccb32eeef6..f5b51bebdcc 100644 --- a/wire-ios-data-model/Source/MLS/MLSService.swift +++ b/wire-ios-data-model/Source/MLS/MLSService.swift @@ -20,7 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork // This is only used in tests, so it should be removed. diff --git a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift index f49de446d20..8af515127d1 100644 --- a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift +++ b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireTransport import WireUtilities diff --git a/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift b/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift index 88f7ba2d675..8f46102a564 100644 --- a/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift +++ b/wire-ios-data-model/Source/MLS/OneOnOne/LegacyOneOnOneResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol OneOnOneResolverInterface { diff --git a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift index c31e91e9073..c39bfea5d5c 100644 --- a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift +++ b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneMigrator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol OneOnOneMigratorInterface { diff --git a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift index 8186b156ca8..5ee76c0634e 100644 --- a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift +++ b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol StaleMLSKeyDetectorProtocol { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift index 7d0b1852b62..08e1fb36b9b 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities private let log = ZMSLog(tag: "Backup") diff --git a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift index cc26f71a2fa..424f5e2b469 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import WireData -import WireLegacyLogging +import WireLogging import WireSystem import WireUtilities diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift index 53267593957..9c7e68a6665 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/106-107/CleanupModels107PreAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Removes UserClient duplicates and invalid ParticipantRoles class CleanupModels107PreAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift index bb2078e36ac..8579357acaf 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/PrefillPrimaryKeyAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging class PrefillPrimaryKeyAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift index ca74c1ae533..81a19271214 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/110-111/RemoveDuplicatePreAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging class RemoveDuplicatePreAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift index 75ccf7af514..f52c46b0423 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // Up until model version 2.113, a user was related to their one on one // conversation via the `connection` relationship, ie `user.connection.conversation` diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift index 8be01bc68c0..1953f71ed42 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging final class FixDuplicateOneOnOneConversationsAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift index e79a7f17278..19b266675e1 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/119-120/ForceSyncResourcesPostAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging final class ForceSyncResourcesPostAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift index afff08d94cd..834061498fc 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/130-131/SetCorrectUserTypeAction.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// A new user-type property has been introduced with API v12. /// Before users were either regular or service users. diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift index b5ec332adf3..ff5c698ee98 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift @@ -17,7 +17,7 @@ // import CoreData -import WireLegacyLogging +import WireLogging protocol CoreDataMigratorProtocol { associatedtype DatabaseVersion diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift index 393a60afc91..8c6bb9959e3 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift @@ -19,7 +19,7 @@ import Foundation import WireCrypto import WireCryptobox -import WireLegacyLogging +import WireLogging extension Sequence where Element: NSManagedObject { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift index bec62164d40..e43e12aac1e 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public extension NSManagedObjectContext { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift index 0ad4d6588df..5a1a53c7134 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging private let log = ZMSLog(tag: "Conversations") diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift index 80651077c63..6536a165c18 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities public extension ZMConversation { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift index 69eb94e7e67..6a38f0c0bab 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift @@ -20,7 +20,7 @@ import Foundation import GenericMessageProtocol import WireCoreCrypto import WireCryptobox -import WireLegacyLogging +import WireLogging @objc public enum ZMConversationLegalHoldStatus: Int16 { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift index 3dfe70f7bbb..228cf058ffa 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging private extension ZMConversationMessage { diff --git a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift index c8abf06590b..e022aa577e9 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public extension ZMConversation { diff --git a/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift b/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift index 97a060aca97..aeef662987f 100644 --- a/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift +++ b/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift @@ -18,7 +18,7 @@ import Foundation import LocalAuthentication -import WireLegacyLogging +import WireLogging public final class AppLockController: AppLockType { diff --git a/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift b/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift index 76e93903d5e..46cb57151fe 100644 --- a/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift +++ b/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging private let NSManagedObjectContextFileAssetCacheKey = "zm_fileAssetCache" diff --git a/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift b/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift index 97fecc82b72..e705ca4add8 100644 --- a/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift +++ b/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging private let zmLog = ZMSLog(tag: "GenericMessage") diff --git a/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift b/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift index 68ca59ad061..61341e7db4b 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging /// An asset message (image, file, ...) @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift b/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift index 14dd274e4f9..110248b4788 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox -import WireLegacyLogging +import WireLogging private var zmLog = ZMSLog(tag: "message encryption") diff --git a/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift b/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift index ba8e402c077..8ff4e938412 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging import WireSystem @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift b/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift index 69411a5c268..58f66d43a74 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox -import WireLegacyLogging +import WireLogging @objc(ZMGenericMessageData) @objcMembers diff --git a/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift b/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift index 346d142a963..2a9d40f2c83 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension ZMMessage { @objc diff --git a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift index f0d061fce20..5ed6d39513d 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging public extension ZMOTRMessage { diff --git a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift index 9eff1cf1a8e..d3ed40958dd 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging extension ZMOTRMessage { diff --git a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift index 1638772b1d3..2c4d8b98f65 100644 --- a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift +++ b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift @@ -19,7 +19,7 @@ import CoreLocation import Foundation import WireCryptobox -import WireLegacyLogging +import WireLogging import WireUtilities public let ZMUserClientNumberOfKeysRemainingKey = "numberOfKeysRemaining" diff --git a/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift b/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift index 239c653b0f3..a221d7fe840 100644 --- a/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift +++ b/wire-ios-data-model/Source/Model/ZMEventModel/StoredUpdateEvent/StoredUpdateEvent+Helpers.swift @@ -18,7 +18,7 @@ import CoreData import Foundation -import WireLegacyLogging +import WireLogging public extension StoredUpdateEvent { diff --git a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift index 378af4162a6..14210c11202 100644 --- a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift +++ b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSystem // sourcery: AutoMockable diff --git a/wire-ios-data-model/Source/Proteus/ProteusProvider.swift b/wire-ios-data-model/Source/Proteus/ProteusProvider.swift index 8110c5b793c..5bb2d78f805 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusProvider.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusProvider.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities public typealias KeyStorePerformBlock = (UserClientKeysStore) throws -> T diff --git a/wire-ios-data-model/Source/Proteus/ProteusService.swift b/wire-ios-data-model/Source/Proteus/ProteusService.swift index 6737410e235..f5bfc80332b 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusService.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusService.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging /// A service that provides support for messaging via the Proteus /// end-to-end-encryption protocol. diff --git a/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift b/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift index 18ad8b42750..16a18f1a3de 100644 --- a/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift +++ b/wire-ios-data-model/Source/Repositories/LegacyFeatureRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol LegacyFeatureRepositoryInterface { diff --git a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift index 0795a1fbd70..20edc1ae4ad 100644 --- a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift +++ b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSystem public protocol RemoveLocalConversationUseCaseProtocol { diff --git a/wire-ios-data-model/Source/Utilis/KeychainManager.swift b/wire-ios-data-model/Source/Utilis/KeychainManager.swift index 7ca01343ab0..08149daf53b 100644 --- a/wire-ios-data-model/Source/Utilis/KeychainManager.swift +++ b/wire-ios-data-model/Source/Utilis/KeychainManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol KeychainItemProtocol { diff --git a/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift b/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift index 83fdf6f85d1..7f225335ca7 100644 --- a/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift +++ b/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable @objc diff --git a/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift b/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift index 9834b86892d..459c79139c0 100644 --- a/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift +++ b/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift @@ -17,7 +17,7 @@ // import GenericMessageProtocol -import WireLegacyLogging +import WireLogging public enum UpdateEventSource: String { case pushChannel diff --git a/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift b/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift index 8488a4dc682..926be30cff7 100644 --- a/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift +++ b/wire-ios-data-model/Tests/Source/Model/UserClient/UserClientTests+SafeLogging.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import XCTest @testable import WireDataModel diff --git a/wire-ios-notification-engine/Sources/NotificationSession.swift b/wire-ios-notification-engine/Sources/NotificationSession.swift index 553a2a34177..f12cceea837 100644 --- a/wire-ios-notification-engine/Sources/NotificationSession.swift +++ b/wire-ios-notification-engine/Sources/NotificationSession.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging import WireRequestStrategy public enum NotificationSessionError: LocalizedError { diff --git a/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift b/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift index 314e890eeb4..58791faad24 100644 --- a/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift +++ b/wire-ios-notification-engine/Sources/Synchronization/OperationLoop.swift @@ -19,7 +19,7 @@ import CoreData import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireRequestStrategy import WireTransport diff --git a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift index e415d5e7e50..309add5f118 100644 --- a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift +++ b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy protocol PushNotificationStrategyDelegate: AnyObject { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift index f277d7bf526..39465adebc9 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift @@ -18,7 +18,7 @@ import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging public protocol E2EIEnrollmentInterface { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift index d7bee37d1ca..a157b9158a3 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift @@ -20,7 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol E2EIKeyPackageRotating { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift index 19f217eff40..743e80f0e51 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireCoreCrypto -import WireLegacyLogging +import WireLogging public protocol E2EIRepositoryInterface { diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift b/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift index 65b76822fb3..3addbbfb583 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public struct OAuthParameters { diff --git a/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift b/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift index b2b4804fed2..2185f488a8d 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public class MessageExpirationTimer: ZMMessageTimer, ZMContextChangeTracker { diff --git a/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift b/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift index 9b01edba9eb..f8298b9559d 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift @@ -18,7 +18,7 @@ import CoreData import WireDataModel -import WireLegacyLogging +import WireLogging /// Provides log attributes for messages of supported message types. struct MessageLogAttributesBuilder { diff --git a/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift index bb4192329c5..49b03ebb95f 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MessageDependencyResolverInterface { diff --git a/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift index 6041354a739..16e998b829e 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging enum MessageInfoExtractorError: Error { case missingConversation diff --git a/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift b/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift index 6282e9c72ea..6083f9cb8a0 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging public enum MessageSendError: Error { case missingMessageProtocol diff --git a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift index 06e03d1f475..c89ff0f18da 100644 --- a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift +++ b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public protocol NotificationStreamSyncDelegate: AnyObject { func fetchedEvents(_ events: [ZMUpdateEvent], hasMoreToFetch: Bool) diff --git a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift index 1395f57f4ee..81c4b516012 100644 --- a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift +++ b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification+Events.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging public extension ZMLocalNotification { diff --git a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift index fa1298f72de..113934818b5 100644 --- a/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift +++ b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift @@ -18,7 +18,7 @@ import UserNotifications import WireDataModel -import WireLegacyLogging +import WireLogging /// Defines the various types of local notifications, some of which /// have associated subtypes. diff --git a/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift b/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift index 702e0d5d8b5..096775b4861 100644 --- a/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift +++ b/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging private let zmLog = ZMSLog(tag: "PushNotificationStatus") diff --git a/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift b/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift index f1493fcdea9..6435a8fce20 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // MARK: JSON Decoder / Encoder diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift index 162b2e9ac8f..90b93039d7a 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging final class ConnectionPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift index 8a93aab0706..599c88bc49f 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging enum ConversationEventPayloadProcessorError: Error { case noBackendConversationId diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift index 77b57886307..7e971e6d0f8 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol MLSEventProcessing { diff --git a/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift index 585dcde025f..6da529bedb1 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging final class MessageSendingStatusPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift index 337c4e0cf6e..b40c502f56a 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// The `AssetClientMessageRequestStrategy` for creating requests to insert the genericMessage of a /// `ZMAssetClientMessage` remotely. This is only necessary for the `/assets/v3' endpoint as we diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift index 3ec06bfbcf7..0e8586c28a9 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging /// AssetV3UploadRequestStrategy is responsible for uploading all the assets associated with a asset message /// after they've been preprocessed (downscaled & encrypted). After all the assets have been uploaded diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift index 1838014f86c..7831c933e4d 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewAssetUploadRequestStrategy.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import WireLinkPreview -import WireLegacyLogging +import WireLogging public final class LinkPreviewDetectorHelper: NSObject { fileprivate static var _test_debug_linkPreviewDetector: LinkPreviewDetectorType? diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift index 6af21c3c5be..eb12831899e 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public class LinkPreviewUpdateRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift index d61a60002a4..b44500ea82c 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging public class AvailabilityRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift index 4d72505e050..e5cd6474b00 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Client Message/ClientMessageRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public class ClientMessageRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift index f2565fc3b33..fa8b534bd49 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public class ConnectionRequestStrategy: AbstractRequestStrategy, ZMRequestGeneratorSource, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift index 1878e2fb92f..528cd74e42d 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/Actions/CreateGroupConversationActionHandler.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public final class CreateGroupConversationAction: EntityAction { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift index c33e599bceb..0a9c8a2f020 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationEventProcessor.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public class ConversationEventProcessor: NSObject, LegacyConversationEventProcessorProtocol, ZMEventAsyncConsumer { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift index 04cff06c643..3e636d50fde 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol ConversationParticipantsServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift index f063ebfa37e..9718fe0fea0 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public class ConversationRequestStrategy: AbstractRequestStrategy, ZMRequestGeneratorSource, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift index 51d9348f48b..7f889161a94 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol ConversationServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift index 7c35a4f9539..0856a25629a 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable protocol MLSConversationParticipantsServiceInterface { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift index 47c11988893..4b2f52d7691 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Delivery Receipts/DeliveryReceiptRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging extension ZMUpdateEvent { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift index 6d0e7eb272b..94fa83dcf7d 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/FeatureConfigRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public final class FeatureConfigRequestStrategy: AbstractRequestStrategy { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift index 39f8ea2d12e..1450b405481 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Feature configurations/Payload/FeatureConfigsPayloadProcessor.swift @@ -18,7 +18,7 @@ import Foundation import protocol WireDataModel.LegacyFeatureRepositoryInterface -import WireLegacyLogging +import WireLogging struct FeatureConfigsPayloadProcessor { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift index 7977cac2b67..58e3f1a0651 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public final class FetchBackendMLSPublicKeysRequestStrategy: AbstractRequestStrategy { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift index d1bcbf81dd2..189e852db84 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User Clients/ResetSessionRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging public class ResetSessionRequestStrategy: NSObject, ZMContextChangeTrackerSource { diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift index b6a4d0d0680..70e78f4b7b9 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Request strategy for fetching user profiles and processing user update events. /// diff --git a/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift index fad50fcdf1a..888ee5b9f24 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User/UserPropertyRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireTransport private enum UserProperty: CaseIterable { diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift index 49eb4ad2533..7fbc650886b 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension EventDecoder { diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift index a314b84941b..ccac818cd17 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift @@ -19,7 +19,7 @@ import Foundation import WireCoreCrypto import WireCryptobox -import WireLegacyLogging +import WireLogging private let zmLog = ZMSLog(tag: "EventDecoder") diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift index f70360ee6ef..e83873e2f60 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift @@ -20,7 +20,7 @@ import Foundation import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLegacyLogging +import WireLogging import WireUtilities private let zmLog = ZMSLog(tag: "EventDecoder") diff --git a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift index e882faeb3cf..97a3298862d 100644 --- a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift +++ b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift @@ -19,7 +19,7 @@ import GenericMessageProtocol import WireCryptobox import WireDataModel -import WireLegacyLogging +import WireLogging import WireTesting @testable import WireRequestStrategy diff --git a/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift index 95d52fe5fe4..48ec0204571 100644 --- a/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift +++ b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireRequestStrategy import WireUtilities diff --git a/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift b/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift index 0c748a99a95..f72c2ed0ed4 100644 --- a/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift +++ b/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging private extension ZMMessage { diff --git a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift index 2801e83c424..baf97ba211a 100644 --- a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift +++ b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift @@ -20,7 +20,7 @@ import avs import CallKit import Foundation import Intents -import WireLegacyLogging +import WireLogging import WireRequestStrategy protocol CallKitManagerDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift b/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift index e8a5734eeb4..cc9b096e3f5 100644 --- a/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift +++ b/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireUtilities /// A class responsible for removing stale participants in a MLS conference. diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift index 21702da901e..cfdab0d35ce 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift @@ -18,7 +18,7 @@ import avs import Foundation -import WireLegacyLogging +import WireLogging // MARK: Conversation Changes diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift index 9e98cd4be6a..fd844d4feec 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift @@ -19,7 +19,7 @@ import Combine import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging struct ConferenceParticipantsInfo { let participants: [CallParticipant] diff --git a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift index 74e3740543b..120d8cd0095 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift @@ -19,7 +19,7 @@ import avs import Combine import Foundation -import WireLegacyLogging +import WireLogging /// WireCallCenter is used for making Wire calls and observing their state. There can only be one instance of the /// WireCallCenter. diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift index bb219849aee..3a24bfc9f11 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireSystem public enum ConversationDeletionError: Error { diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift index f3bd97b5702..14325e43124 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+MessageDestructionTimeout.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging private let log = ZMSLog(tag: "ConversationMessageDestructionTimeout") diff --git a/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift b/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift index d3770fc0782..64fd6a9bed9 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+ReadReceiptMode.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public enum ReadReceiptModeError: Error { case invalidOperation diff --git a/wire-ios-sync-engine/Source/Data Model/Typing.swift b/wire-ios-sync-engine/Source/Data Model/Typing.swift index e448c0a078c..71351aa2d83 100644 --- a/wire-ios-sync-engine/Source/Data Model/Typing.swift +++ b/wire-ios-sync-engine/Source/Data Model/Typing.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging class Typing { diff --git a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift index 002d983cbcc..3c571347824 100644 --- a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift +++ b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol CertificateRevocationListsChecking { diff --git a/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift b/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift index 7fcecdb740b..65016c3666f 100644 --- a/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift +++ b/wire-ios-sync-engine/Source/Notifications/Push notifications/LocalNotificationDispatcher.swift @@ -19,7 +19,7 @@ import Foundation import GenericMessageProtocol import UserNotifications -import WireLegacyLogging +import WireLogging /// Creates and cancels local notifications @objcMembers diff --git a/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift b/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift index 4877ebfc0f4..aca30d43121 100644 --- a/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift +++ b/wire-ios-sync-engine/Source/Notifications/VoIPPushManager.swift @@ -20,7 +20,7 @@ import avs import CallKit import Foundation import PushKit -import WireLegacyLogging +import WireLogging public protocol VoIPPushManagerDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift b/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift index 28144634356..c20513f1a81 100644 --- a/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift +++ b/wire-ios-sync-engine/Source/Services/LegacySupportedProtocolsService.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging import WireRequestStrategy // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift b/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift index d268b159958..5f7dfd73cb5 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIMigration/APIMigrationManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol APIMigration { func perform(with session: ZMUserSession, clientID: String) async throws diff --git a/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift b/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift index d0a598ca8e5..34f62769dcb 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIMigration/AccessTokenMigration.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol AccessTokenRenewalObserver { func accessTokenRenewalDidSucceed() diff --git a/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift b/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift index 0b1890cc50a..ece058ac775 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireTransport final class APIVersionResolver { diff --git a/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift b/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift index 33922d00b87..2fbc731896a 100644 --- a/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift @@ -17,7 +17,7 @@ // import avs -import WireLegacyLogging +import WireLogging final class AVSLogObserver: AVSLogger { private var token: Any! diff --git a/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift b/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift index 2a89ae83b79..f8a14819c92 100644 --- a/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift +++ b/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public typealias Reachability = ReachabilityProvider & TearDownCapable diff --git a/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift b/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift index f9de46d5120..b833844e442 100644 --- a/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift +++ b/wire-ios-sync-engine/Source/SessionManager/PushTokenService.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public final class PushTokenService: PushTokenServiceInterface { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift b/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift index 8dac87d2374..2acb2710965 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionFactories.swift @@ -19,7 +19,7 @@ import avs import WireDataModel import WireDomain -import WireLegacyLogging +import WireLogging import WireNetwork open class AuthenticatedSessionFactory { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift index 61cc015e8a1..819c125e767 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift @@ -18,7 +18,7 @@ import CallKit import Foundation -import WireLegacyLogging +import WireLogging import WireSystem enum ConversationLookupError: Error { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift index 7cdbee8e63c..1aa65ba2b9f 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension SessionManager: UserSessionEncryptionAtRestDelegate { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift index 2fed189028f..5cd216c7181 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+PushToken.swift @@ -18,7 +18,7 @@ import Foundation import PushKit -import WireLegacyLogging +import WireLogging extension SessionManager { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift index b0cb9202581..14995131586 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol UserSessionLogoutDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift index 0dc02ad9c11..3a9aaf13f82 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol UserSessionSelfUserClientDelegate: AnyObject { /// Invoked when a client is successfully registered diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift index 40549a5a628..2665c4b997d 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift @@ -18,7 +18,7 @@ import Foundation import PushKit -import WireLegacyLogging +import WireLogging extension SessionManager: VoIPPushManagerDelegate { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift index 6033e62877b..7949da3efce 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift @@ -25,7 +25,7 @@ import WireAnalytics import WireDataModel import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireRequestStrategy import WireTransport diff --git a/wire-ios-sync-engine/Source/SessionManager/URLActions.swift b/wire-ios-sync-engine/Source/SessionManager/URLActions.swift index 7ad7c16d902..f76889999c0 100644 --- a/wire-ios-sync-engine/Source/SessionManager/URLActions.swift +++ b/wire-ios-sync-engine/Source/SessionManager/URLActions.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public enum URLAction: Equatable { diff --git a/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift b/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift index 8b7b521ec24..f367102a229 100644 --- a/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift +++ b/wire-ios-sync-engine/Source/SessionManager/UpdateEventMigrator.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging import WireNetwork import WireTransport diff --git a/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift b/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift index 40c504916b5..ab509b9d788 100644 --- a/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift +++ b/wire-ios-sync-engine/Source/SessionManager/UserSessionLoader.swift @@ -19,7 +19,7 @@ import Foundation import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork protocol UserSessionLoaderDelegate: AnyObject { diff --git a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift index 48dc94f8616..c52dd82b0bd 100644 --- a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift +++ b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift b/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift index 61ac7d81213..1914dfd39f8 100644 --- a/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift +++ b/wire-ios-sync-engine/Source/Synchronization/IncrementalSyncObserver.swift @@ -18,7 +18,7 @@ import Combine import Foundation -import WireLegacyLogging +import WireLogging final class IncrementalSyncObserver: IncrementalSyncObserverProtocol { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift index 8e741bb0b2a..b615d02a3f6 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift @@ -20,7 +20,7 @@ import Combine import Foundation import GenericMessageProtocol import WireDataModel -import WireLegacyLogging +import WireLogging import WireRequestStrategy @objcMembers diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift index 3b175fc5232..c8dbfb171cf 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy final class EvaluateOneOnOneConversationsStrategy: AbstractRequestStrategy { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift index cc431de3cc4..fda8ca3a8d0 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging struct LabelUpdate: Codable, Equatable { let id: UUID diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift index 2d076b5a91e..0e1f0bbb97b 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public class LegalHoldRequestStrategy: AbstractRequestStrategy, ZMSingleRequestTranscoder, ZMEventConsumer { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift index 87cacbda1aa..8066144b014 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging final class RegistationCredentialVerificationStrategy: NSObject { let registrationStatus: RegistrationStatusProtocol diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift index 233e0bd9317..3462cf28da1 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging import WireRequestStrategy public final class SelfSupportedProtocolsRequestStrategy: AbstractRequestStrategy, ZMSingleRequestTranscoder { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift index d72fcc456d3..54a265e3052 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/TeamDownloadRequestStrategy.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging struct TeamListPayload: Decodable { let hasMore: Bool diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift index 1985a5696e0..4e53d7b9d17 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Consumes self user client update events /// diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift index 21222f79445..c925c8f0af8 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift @@ -19,7 +19,7 @@ import Foundation import WireCryptobox import WireDataModel -import WireLegacyLogging +import WireLogging import WireSystem import WireTransport import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift index 5730cb81b44..5b48f7ebf87 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserImageAssetUpdateStrategy.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy enum AssetTransportError: Error { diff --git a/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift b/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift index fe4863211a0..dcd8df17a10 100644 --- a/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift +++ b/wire-ios-sync-engine/Source/Synchronization/SyncAgent.swift @@ -21,7 +21,7 @@ import Foundation import WireDataModel import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireUtilities // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift index c0614e6220a..a98c3a4080e 100644 --- a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift +++ b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork extension ZMOperationLoop: ZMPushChannelConsumer { diff --git a/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift b/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift index 4c9a39c3d2b..c209687037d 100644 --- a/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/AppendMultipartMessageUseCase.swift @@ -19,7 +19,7 @@ import WireAnalytics import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging public protocol AppendMultipartMessageUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift index 46cdb1f8837..d6ac19e3aa8 100644 --- a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging public enum E2EIdentityCertificateUpdateStatus { diff --git a/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift b/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift index 19b2e26b7d3..4dd68c5d17f 100644 --- a/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift b/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift index 7c38115b31f..6b4abcd8ba5 100644 --- a/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/ImportBackupUseCase/ImportLegacyBackupUseCase.swift @@ -21,7 +21,7 @@ import WireCrypto import WireDataModel import WireDomainPackage import WireFoundation -import WireLegacyLogging +import WireLogging import WireSystem import WireUtilitiesPackage diff --git a/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift b/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift index 5f16d6659b0..aecdc25bdc3 100644 --- a/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/LegacyResolveOneOnOneConversationsUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol LegacyResolveOneOnOneConversationsUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift b/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift index 34a0a053809..6a63de4f289 100644 --- a/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/RemoveUserClientUseCase.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol RemoveUserClientUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift index abb99e80a70..bd86f06b8a8 100644 --- a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging // sourcery: AutoMockable public protocol ShareFileUseCaseProtocol { diff --git a/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift b/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift index c7123274876..59794a00319 100644 --- a/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift +++ b/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public extension NSManagedObjectContext { diff --git a/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift b/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift index d172a38b187..15e254ba00a 100644 --- a/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public typealias BackgroundFetchHandler = (_ fetchResult: UIBackgroundFetchResult) -> Void diff --git a/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift b/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift index 87c85635f1e..adb0cb43cf8 100644 --- a/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift @@ -17,7 +17,7 @@ // import WireDomain -import WireLegacyLogging +import WireLogging private let zmLog = ZMSLog(tag: "SyncStatus") diff --git a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift index cd628276898..8a4243cce27 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireRequestStrategy class DeepLinkURLActionProcessor: URLActionProcessor { diff --git a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift index c415d0309ae..d78b7493993 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging enum ImportEventsError: Error { case fileNotFound(String) diff --git a/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift b/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift index 4858447104b..073ab8c2d9f 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireSystem public extension Bundle { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift index 35f4e2467fa..e848c0020ab 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/AppVersionMigration_4_1_1.swift @@ -18,7 +18,7 @@ import Foundation import WireDomain -import WireLegacyLogging +import WireLogging /// **Issue:** some users had conversations in their database that weren't /// fully up do date with the backend. diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift index e2b90af646c..b81566301d0 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/AppVersionMigrations/UnknownMessageAppVersionMigration.swift @@ -19,7 +19,7 @@ import GenericMessageProtocol import WireDataModel import WireDomain -import WireLegacyLogging +import WireLogging import WireNetwork /// This migration should be used to re-process events which were received before but couldn't be deserialized due to diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift index f108d977acf..87bb25471ad 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension ZMUserSession: AccessTokenRenewing { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift index 3c31b41a01d..c66bbf07537 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Actions.swift @@ -18,7 +18,7 @@ import Foundation import GenericMessageProtocol -import WireLegacyLogging +import WireLogging @objc public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift index 5fc6d13a89b..93de0949802 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift @@ -21,7 +21,7 @@ import GenericMessageProtocol import WireAnalytics import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging extension ZMUserSession: AnalyticsEventTrackerProvider { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift index 850e0db0c3e..a8aaa9dd5af 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift index 6cd237ba263..91e92c80b99 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import WireDataModel -import WireLegacyLogging +import WireLogging public protocol UserSessionEncryptionAtRestInterface { var encryptMessagesAtRest: Bool { get } diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift index 96503a227fc..ad4d317f5d1 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift index 6767aea9d2d..ff40f14817a 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging public extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift index 87e600c68a9..b7087113403 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift @@ -19,7 +19,7 @@ import Foundation import UserNotifications import WireDomain -import WireLegacyLogging +import WireLogging import WireRequestStrategy import WireTransport diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift index 39613169e6b..2aaa2beb588 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift index 1af5420264d..9ebdadcd0c9 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+WireCallStateObserver.swift @@ -19,7 +19,7 @@ import Foundation import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging extension ZMUserSession: WireCallCenterCallStateObserver { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift index f85ff793aeb..8662c99bbf1 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift @@ -23,7 +23,7 @@ import Foundation import WireCoreCrypto import WireDataModel import WireDomain -import WireLegacyLogging +import WireLogging import WireNetwork import WireRequestStrategy import WireSystem diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift index 4396ecb5014..c510d519f42 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSessionBuilder.swift @@ -20,7 +20,7 @@ import Foundation import WireDataModel import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireRequestStrategy import WireUtilities diff --git a/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift b/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift index cfb3495a2c7..1b05a21172b 100644 --- a/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift +++ b/wire-ios-sync-engine/Tests/Source/SessionManager/APIMigrationManagerTests.swift @@ -19,11 +19,11 @@ import Foundation import WireDataModelSupport import WireDomain -import WireLegacyLoggingSupport +import WireLoggingSupport import WireNetwork import XCTest -@testable import WireLegacyLogging +@testable import WireLogging @testable import WireSyncEngine @testable import WireSyncEngineSupport @testable import WireTransport diff --git a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift index 1c4ac2b0e7f..20054bcac4d 100644 --- a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift +++ b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTestsBase.swift @@ -19,7 +19,7 @@ import Combine import WireDataModelSupport import WireDomain -import WireLegacyLoggingSupport +import WireLoggingSupport import WireNetwork import WireRequestStrategySupport import WireTransportSupport diff --git a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift index 90f1f2176db..1a9453f94b2 100644 --- a/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift +++ b/wire-ios-sync-engine/Tests/Source/UserSession/ZMUserSessionTests_NetworkState.swift @@ -18,10 +18,10 @@ import WireDataModelSupport import WireDomain -import WireLegacyLoggingSupport +import WireLoggingSupport import XCTest -@testable import WireLegacyLogging +@testable import WireLogging @testable import WireSyncEngine @testable import WireSyncEngineSupport diff --git a/wire-ios-system/Source/ExpiringActivity.swift b/wire-ios-system/Source/ExpiringActivity.swift index a01941f09f2..6a500ebc6bb 100644 --- a/wire-ios-system/Source/ExpiringActivity.swift +++ b/wire-ios-system/Source/ExpiringActivity.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging protocol ExpiringActivityInterface { diff --git a/wire-ios-system/Source/TimePoint.swift b/wire-ios-system/Source/TimePoint.swift index 48bf8322162..a606888b16f 100644 --- a/wire-ios-system/Source/TimePoint.swift +++ b/wire-ios-system/Source/TimePoint.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Records the passage of time since its creation. It also stores the callstack at creation time. @objc(ZMSTimePoint) @objcMembers diff --git a/wire-ios-system/Source/WireLoggerObjC.swift b/wire-ios-system/Source/WireLoggerObjC.swift index fe726f503a9..7d22c45f311 100644 --- a/wire-ios-system/Source/WireLoggerObjC.swift +++ b/wire-ios-system/Source/WireLoggerObjC.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Class to proxy WireLogger methods to Objective-C @objcMembers diff --git a/wire-ios-system/Source/ZMSAsserts.swift b/wire-ios-system/Source/ZMSAsserts.swift index 75999e13375..21bedf7eb6b 100644 --- a/wire-ios-system/Source/ZMSAsserts.swift +++ b/wire-ios-system/Source/ZMSAsserts.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging /// Reports an error and terminates the application public func fatal( diff --git a/wire-ios-system/Source/ZMSLog.swift b/wire-ios-system/Source/ZMSLog.swift index 7e736f87667..2956ebd5e38 100644 --- a/wire-ios-system/Source/ZMSLog.swift +++ b/wire-ios-system/Source/ZMSLog.swift @@ -18,7 +18,7 @@ import Foundation import os.log -import WireLegacyLogging +import WireLogging import ZIPFoundation /// Represents an entry to be logged. diff --git a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift index 122a20c5d2a..107e1a9c271 100644 --- a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift +++ b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging @objc public extension ZMAccessTokenHandler { diff --git a/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift b/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift index 202ce7250b5..a092da175d5 100644 --- a/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift +++ b/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireUtilities /// Manages the creation and lifecycle of background tasks. diff --git a/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift b/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift index 5497c01bda1..b39fa596fec 100644 --- a/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift +++ b/wire-ios-transport/Source/Logging/WireLoggerObjC_LogRequest.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging extension WireLoggerObjC { static func logRequest(_ request: NSURLRequest) { diff --git a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift index c90c9aa53fa..aaf023b3752 100644 --- a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift +++ b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift @@ -18,7 +18,7 @@ import Foundation import WireFoundation -import WireLegacyLogging +import WireLogging public final class ServerCertificateTrust: NSObject, BackendTrustProvider { diff --git a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift index 4c93b8a9d7a..1ed589fd698 100644 --- a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift +++ b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities @objc diff --git a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift index 8c4703873b7..5eddf73d131 100644 --- a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift +++ b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift @@ -18,7 +18,7 @@ import Foundation import Starscream -import WireLegacyLogging +import WireLogging @objcMembers final class StarscreamPushChannel: NSObject, PushChannelType { diff --git a/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift b/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift index 6e2d128f4b3..ebf6b308f7c 100644 --- a/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift +++ b/wire-ios-transport/Source/TransportSession/Unauthenticated Session/UnauthenticatedTransportSession.swift @@ -18,7 +18,7 @@ import CoreFoundation import Security -import WireLegacyLogging +import WireLogging public enum EnqueueResult { case success diff --git a/wire-ios-utilities/Source/Keychain/Keychain.swift b/wire-ios-utilities/Source/Keychain/Keychain.swift index 94f3c10a7a7..636d90eb491 100644 --- a/wire-ios-utilities/Source/Keychain/Keychain.swift +++ b/wire-ios-utilities/Source/Keychain/Keychain.swift @@ -19,7 +19,7 @@ import Foundation import LocalAuthentication import Security -import WireLegacyLogging +import WireLogging public protocol KeychainItem { associatedtype Value diff --git a/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift b/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift index 456128cddec..1316c1886cc 100644 --- a/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift +++ b/wire-ios/Wire Notification Service Extension/LegacyNotificationService.swift @@ -22,7 +22,7 @@ import UserNotifications import WireCommonComponents import WireDataModel import WireDomain -import WireLegacyLogging +import WireLogging import WireNotificationEngine import WireRequestStrategy import WireSyncEngine diff --git a/wire-ios/Wire Notification Service Extension/NotificationService.swift b/wire-ios/Wire Notification Service Extension/NotificationService.swift index 5fad79a4da1..ae56fea08e7 100644 --- a/wire-ios/Wire Notification Service Extension/NotificationService.swift +++ b/wire-ios/Wire Notification Service Extension/NotificationService.swift @@ -21,7 +21,7 @@ import UserNotifications import WireCommonComponents import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireTransport import WireUtilities diff --git a/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift b/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift index e0f7c42ee1c..fe41b1585ec 100644 --- a/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift +++ b/wire-ios/Wire-iOS Share Extension/Sources/View Controllers/ShareExtensionViewController.swift @@ -28,7 +28,7 @@ import WireDesign import WireDomain import WireFoundation import WireLinkPreview -import WireLegacyLogging +import WireLogging import WireNetwork import WireShareEngine import WireUtilities diff --git a/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift b/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift index f04a2615622..0ff7c3da0a5 100644 --- a/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift +++ b/wire-ios/Wire-iOS Tests/Calling/Analytics/CallEndedAnalyticsControllerTests.swift @@ -19,7 +19,7 @@ import WireDataModelSupport import WireFoundation import WireFoundationSupport -import WireLegacyLogging +import WireLogging import XCTest @testable import Wire diff --git a/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift b/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift index ddb49bfa9cd..2a1ad9fb35c 100644 --- a/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift +++ b/wire-ios/Wire-iOS Tests/Settings/Debug Report/SettingsDebugReportViewModelTests.swift @@ -17,7 +17,7 @@ // import WireDataModelSupport -import WireLegacyLoggingSupport +import WireLoggingSupport import WireSyncEngineSupport import XCTest diff --git a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift index 3cec3d431ee..4df3010e322 100644 --- a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift +++ b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager+UIAlertController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireSystem extension TrackingManager { diff --git a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift index 0ca94ae5e3b..cb1dc6aa058 100644 --- a/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift +++ b/wire-ios/Wire-iOS/Sources/AnalyticsTrackingManager/TrackingManager.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLegacyLogging +import WireLogging import WireSyncEngine struct TrackingManager: TrackingInterface { diff --git a/wire-ios/Wire-iOS/Sources/AppDelegate.swift b/wire-ios/Wire-iOS/Sources/AppDelegate.swift index 7477d0f6299..697ace67232 100644 --- a/wire-ios/Wire-iOS/Sources/AppDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/AppDelegate.swift @@ -25,7 +25,7 @@ import WireCoreCrypto import WireCountly import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift index 5e5ac63d1c1..10af2ac278e 100644 --- a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift +++ b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift b/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift index 2febab03ff4..722c66f9d54 100644 --- a/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift +++ b/wire-ios/Wire-iOS/Sources/AuthenticatedRouter.swift @@ -19,7 +19,7 @@ import UIKit import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift index d52a7e9a047..4c06ee13de9 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift @@ -19,7 +19,7 @@ import UIKit import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift index e95c2a0947f..cb0a376615b 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities extension PasswordRuleSet { diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift index 7ea3d00d393..49eecb17096 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/RegistrationAnalyticsTracker.swift @@ -20,7 +20,7 @@ import UIKit import WireAnalytics import WireAuthenticationAPI import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift b/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift index 605d038607a..ec8bdb63e54 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Interface/ViewControllers/AuthenticationHostingController.swift @@ -21,7 +21,7 @@ import Foundation import SwiftUI import WireAuthentication import WireDomain -import WireLegacyLogging +import WireLogging import WireSyncEngine // A temporary bridging object to allow the new WireAuthentication flow inside diff --git a/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift b/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift index 3ba26a74a3a..652e7dfd884 100644 --- a/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift +++ b/wire-ios/Wire-iOS/Sources/Components/Settings/SettingsPropertyFactory.swift @@ -19,7 +19,7 @@ import avs import WireCommonComponents import WireFoundation -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireUtilities diff --git a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift index de877ef8505..5a1339ecc34 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift @@ -20,7 +20,7 @@ import MessageUI import UIKit import WireCommonComponents import WireDataModel -import WireLegacyLogging +import WireLogging import WireSystem /// Presents debug alerts diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift index 570ed8ad9a4..5ec77d50225 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireUtilities struct ConversationDeveloperActionsProvider: DeveloperToolsContextItemsProvider { diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift index c4f29b643a6..377c0c2f519 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging /// Provides debug actions for UserClientDetails struct UserClientDeveloperItemsProvider: DeveloperToolsContextItemsProvider { diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift index f483d9c18a5..8c0f7e91633 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift @@ -21,7 +21,7 @@ import SwiftUI import WireDataModel import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift index 3d4d36311e3..ba7716d5f3a 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSyncEngine final class DeveloperE2eiViewModel: ObservableObject { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift b/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift index 5373a60ee4e..e239e57447e 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift @@ -17,7 +17,7 @@ // import LocalAuthentication -import WireLegacyLogging +import WireLogging import WireSystem enum AuthenticationType: CaseIterable { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift b/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift index 9a88146160f..1cb5459373a 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireSystem /// An object that tracks performance issues in the application for debugging purposes. diff --git a/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift b/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift index 39e0c861afa..92afde84a8c 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireSystem protocol SaveFileActions { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift b/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift index a202bfba94a..816167e31c6 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSystem protocol TemporaryFileServiceInterface { diff --git a/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift b/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift index c7d8d6e4aff..8b27053aa49 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireSyncEngine extension GroupDetailsConversation where Self: ZMConversation { diff --git a/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift b/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift index 09a97d10281..0e9c6444f0a 100644 --- a/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift +++ b/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift @@ -20,7 +20,7 @@ import avs import Foundation import WireCommonComponents import WireDesign -import WireLegacyLogging +import WireLogging import WireSyncEngine // MARK: - LaunchSequenceOperation diff --git a/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift b/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift index 7e3d815fac8..eddbcb6fa8e 100644 --- a/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift +++ b/wire-ios/Wire-iOS/Sources/Managers/Image/ProfileImagePickerManager.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSyncEngine final class ProfileImagePickerManager: ImagePickerManager { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift index 1419e96a653..56c6470ea63 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Blacklist/BlockerViewController.swift @@ -18,7 +18,7 @@ import MessageUI import UIKit -import WireLegacyLogging +import WireLogging import WireMultiBackendUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift index f426f3f57c6..75b167af7ba 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/Analytics/CallEndedAnalyticsController.swift @@ -18,7 +18,7 @@ import WireAnalytics import WireFoundation -import WireLegacyLogging +import WireLogging import WireSyncEngine final class CallEndedAnalyticsController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift index ce2e8f0059e..b2a1b80f657 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallParticipantViews/AVSVideoContainerView.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging /// A placeholder container for AVSVideo to start the rendering only if the view is instantiated and setup. final class AVSVideoContainerView: UIView { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift index 27808492dae..f57c4e14f8c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift index 4e7a165e296..b8f2dfdadad 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Company Login/CompanyLoginController.swift @@ -18,7 +18,7 @@ import UIKit import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireTransport diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift index d93f0751b59..2a912a8b6dd 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift @@ -18,7 +18,7 @@ import UIKit import WireDesign -import WireLegacyLogging +import WireLogging import WireSystem enum NetworkStatusViewState { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift index 4b25000cf0a..16f2906d1c5 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationSystemMessageCellDescription.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine enum ConversationSystemMessageCellDescription { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift index a20d8a8ea10..e51b0927000 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+CanvasViewControllerDelegate.swift @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import WireLegacyLogging +import WireLogging import WireSyncEngine extension ConversationContentViewController: CanvasViewControllerDelegate { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift index 91fbae8843b..9b097f4742f 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+Forward.swift @@ -19,7 +19,7 @@ import UIKit import WireCommonComponents import WireDesign -import WireLegacyLogging +import WireLogging import WireSyncEngine extension ZMConversation: ShareDestination { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift index beb8623a5a5..0ceda253fab 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine extension ConversationContentViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift index c206dc6438c..cb5a8e0e923 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift @@ -21,7 +21,7 @@ import WireCommonComponents import WireDataModel import WireDesign import WireFoundation -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireMessagingUI import WireRequestStrategy diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift index 7f772d41886..16e6ef8a2cc 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationTableViewDataSource.swift @@ -19,7 +19,7 @@ import DifferenceKit import WireDataModel import WireFoundation -import WireLegacyLogging +import WireLogging import WireMessagingUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift index fc557ca0428..75126c9363b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ConversationContentViewControllerDelegate.swift @@ -19,7 +19,7 @@ import UIKit import UniformTypeIdentifiers import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift index d316acf7131..d3deb546df5 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift @@ -20,7 +20,7 @@ import UIKit import WireCommonComponents import WireDesign import WireDomain -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift index f2bd4e12233..7fa6549270b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift @@ -21,7 +21,7 @@ import WireCommonComponents import WireDataModel import WireDesign import WireDomain -import WireLegacyLogging +import WireLogging import WireNetwork import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift index 3f92a1fba92..41ebc336c97 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/WireConversationChannelCreationFormViewController.swift @@ -19,7 +19,7 @@ import SwiftUI import UIKit import WireDomain -import WireLegacyLogging +import WireLogging import WireMessagingDomain import WireMessagingUI import WireNetwork diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift index f6ed4c9cfde..a12bd2ce8d0 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift @@ -19,7 +19,7 @@ import avs import Foundation import MediaPlayer -import WireLegacyLogging +import WireLogging import WireSyncEngine enum PlayingState: UInt, CustomStringConvertible { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift index 9e880c8cd46..526657b7632 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Camera.swift @@ -20,7 +20,7 @@ import FLAnimatedImage import MobileCoreServices import Photos import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift index 0948b5630f9..e55dec704b5 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+Files.swift @@ -18,7 +18,7 @@ import Foundation import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireMessagingAssembly import WireSyncEngine import WireUtilitiesPackage diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift index a8e3a5671a3..53044158a90 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController+SendButton.swift @@ -18,7 +18,7 @@ import UIKit import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireSyncEngine extension ConversationInputBarViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift index 6115b424223..539e45504db 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/ConversationInputBarViewController/ConversationInputBarViewController.swift @@ -25,7 +25,7 @@ import UIKit import WireCommonComponents import WireDesign import WireFoundation -import WireLegacyLogging +import WireLogging import WireMessagingAssembly import WireMessagingDomain import WireMessagingUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift index 7bcc8ff1881..22eff324fcc 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/Emoji/EmojiRepository.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireUtilities protocol EmojiRepositoryInterface { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift index 6b353deff01..e023fbdd98d 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/ConversationList/Container/ViewModel/ConversationListViewControllerViewModel.swift @@ -23,7 +23,7 @@ import WireCommonComponents import WireDataModel import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift b/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift index 9e7e2a5567b..5d20524847c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine final class DeviceDetailsViewActionsHandler: DeviceDetailsViewActions, ObservableObject { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift index ba8295242b8..ff0e6ff2a6b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift @@ -17,7 +17,7 @@ // import Foundation -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift index 18e6008b826..e7bd91ed26b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift @@ -19,7 +19,7 @@ import AppAuth import Foundation import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireRequestStrategy import WireSystem import WireUtilities diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift index aa96a491aff..28d25c134de 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift @@ -20,7 +20,7 @@ import SwiftUI import UIKit import WireDesign import WireDomain -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingDomain diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift index 4560f96308f..c64ac36b2c4 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine private extension String { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift index 9f17de3a1ee..39458643647 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift @@ -18,7 +18,7 @@ import UIKit import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine enum ParticipantsRowType { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift index 77331bd5518..855fb03c94c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift @@ -17,7 +17,7 @@ // import WireDataModel -import WireLegacyLogging +import WireLogging extension ZClientViewController: StartUIDelegate { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift index 9f40f8a01d6..4571c135e8f 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift @@ -25,7 +25,7 @@ import WireCallingAssembly import WireCommonComponents import WireDesign import WireFoundation -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireMessagingAssembly import WireMessagingDomain diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift b/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift index 50c99f470a8..7c88e90a136 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/PermissionDeniedHint/NotificationAuthorizationStatusDeniedUseCases/ShouldPresentNotificationPermissionHintUseCase.swift @@ -18,7 +18,7 @@ import UserNotifications import WireFoundation -import WireLegacyLogging +import WireLogging import WireUtilities struct ShouldPresentNotificationPermissionHintUseCase< diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift index cbe3b7c8327..9c5131f0cb9 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift @@ -20,7 +20,7 @@ import SwiftUI import UIKit import WireCommonComponents import WireDesign -import WireLegacyLogging +import WireLogging import WireSyncEngine final class ProfileHeaderViewController: UIViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift index 08e72db29ce..662da4ec8c7 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/SelfProfileViewsMonitor.swift @@ -17,7 +17,7 @@ // import WireFoundation -import WireLegacyLogging +import WireLogging import WireSyncEngine protocol SelfProfileViewsMonitor { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift index 273cb7078e2..3a29a366d8f 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsCellDescriptorFactory+Account.swift @@ -23,7 +23,7 @@ import WireDataModel import WireDesign import WireDomain import WireFoundation -import WireLegacyLogging +import WireLogging import WireNetwork import WireSettingsUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift index f3528100f9c..693eb798c11 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/LogFilesProvider.swift @@ -19,7 +19,7 @@ import UIKit import WireCommonComponents import WireDomain -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireSystem import ZIPFoundation diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift index bf01bf5cb65..478991ce86a 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/Debug Report/SettingsDebugReportViewModel.swift @@ -18,7 +18,7 @@ import MessageUI import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireSyncEngine final class SettingsDebugReportViewModel: SettingsDebugReportViewModelProtocol { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift index 53e300fa120..654e24323e0 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift @@ -19,7 +19,7 @@ import SwiftUI import WireCommonComponents import WireDesign -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireReusableUIComponents import WireSettingsUI diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift index e49afe63f09..3e82b0689bb 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift @@ -19,7 +19,7 @@ import Foundation import MessageUI import WireCommonComponents -import WireLegacyLogging +import WireLogging import WireSystem extension MFMailComposeViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift index 0aea78d0ad2..0be78a819cf 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/StartUI/StartUI/SearchResultsViewController.swift @@ -17,7 +17,7 @@ // import UIKit -import WireLegacyLogging +import WireLogging import WireSyncEngine enum SearchGroup: Int { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift index 64cd5df1f96..f5086eca91d 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift @@ -18,7 +18,7 @@ import SwiftUI import WireDesign -import WireLegacyLogging +import WireLogging import WireSyncEngine final class OtherUserClientsListViewController: UIViewController, diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift index 92a2eed44e9..f567e3f1458 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift @@ -20,7 +20,7 @@ import Foundation import WireCommonComponents import WireDataModel import WireDesign -import WireLegacyLogging +import WireLogging import WireSyncEngine /// The actions that can be performed from the profile details or devices. diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift index 31d5cdd0495..81259fbda7c 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift @@ -19,7 +19,7 @@ import UIKit import WireDataModel import WireDesign -import WireLegacyLogging +import WireLogging import WireMainNavigationUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift index ea5b5b0dfdb..54260171b0e 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift @@ -18,7 +18,7 @@ import Foundation import WireDataModel -import WireLegacyLogging +import WireLogging import WireSyncEngine import WireSystem diff --git a/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift b/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift index 5c3ca96fcaa..d18eb5d9f83 100644 --- a/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift +++ b/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift @@ -18,7 +18,7 @@ import WireAnalytics import WireDatadog -import WireLegacyLogging +import WireLogging import WireSystem extension WireDatadog: LoggerProtocol { diff --git a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift index 8519db54a70..fc302a1d0a7 100644 --- a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift +++ b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift @@ -18,7 +18,7 @@ import Foundation import os -import WireLegacyLogging +import WireLogging import WireSystem /// Namespace for analytics tools. diff --git a/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift b/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift index 360c53aedda..9de0966b089 100644 --- a/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift +++ b/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift @@ -20,7 +20,7 @@ import AVFoundation import Foundation import MobileCoreServices import WireDataModel -import WireLegacyLogging +import WireLogging private let zmLog = ZMSLog(tag: "UI") diff --git a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift index c838face6c4..f35b3937a59 100644 --- a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift +++ b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift @@ -18,7 +18,7 @@ import CocoaLumberjackSwift import Foundation -import WireLegacyLogging +import WireLogging import WireSystem /// Logger to write logs to fileSystem via CocoaLumberjack From f8876728b5ce7e01a32a33efd2460fb81d5f0c44 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:25:11 +0100 Subject: [PATCH 25/37] create WireLogging --- WireLogging/Package.swift | 22 ++++- .../WireLegacyLogging/AggregatedLogger.swift | 1 + .../WireLegacyLogging/LogAttributes.swift | 6 ++ .../WireLegacyLogging/LoggerProtocol.swift | 5 +- .../WireLegacyLogging/SystemLogger.swift | 1 + .../WireLogger+Instances.swift | 1 + .../Sources/WireLogging/Placeholder.swift | 17 ++++ .../Sourcery/AutoMockable.stencil | 1 + .../WireLoggingSupport/Sourcery/sourcery.yml | 8 ++ .../WireLoggingSupport/WireLogging.swift | 21 ++++ .../Tests/TestPlans/AllTests.xctestplan | 16 +-- .../Network/RequestLogTests.swift | 3 +- .../WireLoggingTestsPlaceholder.swift | 17 ++++ .../xcschemes/WireLoggingAll.xcscheme | 98 ------------------- 14 files changed, 108 insertions(+), 109 deletions(-) create mode 100644 WireLogging/Sources/WireLogging/Placeholder.swift create mode 120000 WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil create mode 100644 WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml create mode 100644 WireLogging/Sources/WireLoggingSupport/WireLogging.swift rename WireLogging/Tests/{WireLogging => WireLegacyLoggingTests}/Network/RequestLogTests.swift (98%) create mode 100644 WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift delete mode 100644 wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift index 2a156fe8bec..d8292f128df 100644 --- a/WireLogging/Package.swift +++ b/WireLogging/Package.swift @@ -4,21 +4,39 @@ import Foundation import PackageDescription let package = Package( - name: "WireLegacyLogging", + name: "WireLogging", platforms: [.iOS("16.4"), .macOS(.v12)], products: [ + .library(name: "WireLogging", targets: ["WireLogging"]), + .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: [ + .target(name: "WireLogging"), + .target( + name: "WireLoggingSupport", + dependencies: ["WireLogging"], + plugins: [ + .plugin(name: "SourceryPlugin", package: "WirePlugins") + ] + ), + .testTarget( + name: "WireLoggingTests", + dependencies: ["WireLogging", "WireLoggingSupport"] + ), + .target(name: "WireLegacyLogging"), .target( name: "WireLegacyLoggingSupport", dependencies: ["WireLegacyLogging"], - plugins: [.plugin(name: "SourceryPlugin", package: "WirePlugins")] + plugins: [ + .plugin(name: "SourceryPlugin", package: "WirePlugins") + ] ), .testTarget( name: "WireLegacyLoggingTests", diff --git a/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift b/WireLogging/Sources/WireLegacyLogging/AggregatedLogger.swift index d7b33e757ef..584fa2dfdf6 100644 --- a/WireLogging/Sources/WireLegacyLogging/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/WireLegacyLogging/LogAttributes.swift b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift index 46156742f9c..d33e973b788 100644 --- a/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift +++ b/WireLogging/Sources/WireLegacyLogging/LogAttributes.swift @@ -50,14 +50,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/WireLegacyLogging/LoggerProtocol.swift b/WireLogging/Sources/WireLegacyLogging/LoggerProtocol.swift index 01e1004dc1f..51bb3dcdcf7 100644 --- a/WireLogging/Sources/WireLegacyLogging/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/WireLegacyLogging/SystemLogger.swift b/WireLogging/Sources/WireLegacyLogging/SystemLogger.swift index 7484890299d..e7774ea7ed1 100644 --- a/WireLogging/Sources/WireLegacyLogging/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/WireLegacyLogging/WireLogger+Instances.swift b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift index 8dfe17ab0ab..56b72febcca 100644 --- a/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift +++ b/WireLogging/Sources/WireLegacyLogging/WireLogger+Instances.swift @@ -66,4 +66,5 @@ public extension WireLogger { static let supportedProtocols = WireLogger(tag: "supported-protocols") static let search = WireLogger(tag: "search") static let wireCells = WireLogger(tag: "wire-cells") + } diff --git a/WireLogging/Sources/WireLogging/Placeholder.swift b/WireLogging/Sources/WireLogging/Placeholder.swift new file mode 100644 index 00000000000..89c90917712 --- /dev/null +++ b/WireLogging/Sources/WireLogging/Placeholder.swift @@ -0,0 +1,17 @@ +// +// 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/. +// diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil b/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil new file mode 120000 index 00000000000..384e2627f10 --- /dev/null +++ b/WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil @@ -0,0 +1 @@ +../../../../WirePlugins/Plugins/SourceryPlugin/Stencils/AutoMockable.stencil \ No newline at end of file diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml new file mode 100644 index 00000000000..408bf4aa4c3 --- /dev/null +++ b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml @@ -0,0 +1,8 @@ +sources: +- ${PACKAGE_ROOT_DIR}/Sources/WireLogging +templates: +- ${TARGET_DIR}/Sourcery/AutoMockable.stencil +output: + ${DERIVED_SOURCES_DIR} +args: + autoMockablePublicImports: ["Foundation"] diff --git a/WireLogging/Sources/WireLoggingSupport/WireLogging.swift b/WireLogging/Sources/WireLoggingSupport/WireLogging.swift new file mode 100644 index 00000000000..74d5741b771 --- /dev/null +++ b/WireLogging/Sources/WireLoggingSupport/WireLogging.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/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index a3a5993f77c..4a5c96a28d8 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,22 +1,26 @@ { "configurations" : [ { - "id" : "8DA8C849-71C0-4072-92BA-9AF39BAA1039", - "name" : "Test Scheme Action", + "id" : "558E1A72-E387-4C4E-A2A8-B2BCD04FDEAF", + "name" : "Configuration 1", "options" : { } } ], "defaultOptions" : { - "performanceAntipatternCheckerEnabled" : true + "language" : "en", + "region" : "DE", + "threadSanitizerEnabled" : true, + "undefinedBehaviorSanitizerEnabled" : true }, "testTargets" : [ { + "parallelizable" : false, "target" : { - "containerPath" : "container:WireLegacyLogging", - "identifier" : "WireLegacyLoggingTests", - "name" : "WireLegacyLoggingTests" + "containerPath" : "container:WireLogging", + "identifier" : "WireLoggingTests", + "name" : "WireLoggingTests" } } ], 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 d43e8d33e70..4e8d656f1de 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..89c90917712 --- /dev/null +++ b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift @@ -0,0 +1,17 @@ +// +// 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/. +// diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme deleted file mode 100644 index 0052c23b765..00000000000 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 6cc2dd0d13e9c255cc82023b22b1ecd06d4faa05 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:32:50 +0100 Subject: [PATCH 26/37] few more fixes --- .../WireLoggingSupport/Sourcery/sourcery.yml | 2 +- .../Tests/TestPlans/AllTests.xctestplan | 12 +- .../WireLoggingTestsPlaceholder.swift | 12 ++ .../xcschemes/WireLoggingAll.xcscheme | 136 ++++++++++++++++++ 4 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme diff --git a/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml b/WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml index 408bf4aa4c3..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"] + autoMockableImports: ["Foundation"] diff --git a/WireLogging/Tests/TestPlans/AllTests.xctestplan b/WireLogging/Tests/TestPlans/AllTests.xctestplan index 4a5c96a28d8..1d2c64be5d6 100644 --- a/WireLogging/Tests/TestPlans/AllTests.xctestplan +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -1,7 +1,7 @@ { "configurations" : [ { - "id" : "558E1A72-E387-4C4E-A2A8-B2BCD04FDEAF", + "id" : "5D82ECB3-F716-4EAB-8FE5-C380EE8B8618", "name" : "Configuration 1", "options" : { @@ -11,17 +11,25 @@ "defaultOptions" : { "language" : "en", "region" : "DE", + "testExecutionOrdering" : "random", "threadSanitizerEnabled" : true, "undefinedBehaviorSanitizerEnabled" : true }, "testTargets" : [ { - "parallelizable" : false, "target" : { "containerPath" : "container:WireLogging", "identifier" : "WireLoggingTests", "name" : "WireLoggingTests" } + }, + { + "parallelizable" : false, + "target" : { + "containerPath" : "container:WireLogging", + "identifier" : "WireLegacyLoggingTests", + "name" : "WireLegacyLoggingTests" + } } ], "version" : 1 diff --git a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift index 89c90917712..bc9be2bc875 100644 --- a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift +++ b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift @@ -15,3 +15,15 @@ // 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/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme new file mode 100644 index 00000000000..dd3255a0dd6 --- /dev/null +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a8a2ab7e74e5763cfaf028cba1264059acf09ce9 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:36:25 +0100 Subject: [PATCH 27/37] fix build errors in WireAnalytics --- WireAnalytics/Package.swift | 6 +++-- .../WireAnalytics/WireLegacyLogging.swift | 21 ++++++++++++++++++ .../WireDatadog/WireLegacyLogging.swift | 22 +++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 WireAnalytics/Sources/WireAnalytics/WireLegacyLogging.swift create mode 100644 WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift diff --git a/WireAnalytics/Package.swift b/WireAnalytics/Package.swift index 3f144b8a49c..59b77729ae3 100644 --- a/WireAnalytics/Package.swift +++ b/WireAnalytics/Package.swift @@ -29,6 +29,7 @@ let package = Package( name: "WireAnalytics", dependencies: [ "WireFoundation", + "WireLogging", .product(name: "WireLegacyLogging", package: "WireLogging") ] ), @@ -51,6 +52,7 @@ let package = Package( .target( name: "WireDatadog", dependencies: datadogDependencies() + [ + "WireLogging", .product(name: "WireLegacyLogging", package: "WireLogging") ], sources: datadogFiles() @@ -103,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..aabce498dc4 --- /dev/null +++ b/WireAnalytics/Sources/WireDatadog/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 WireLogLevel = WireLegacyLogging.WireLogLevel From 0c72b83f70bc87e92d1678767de44810048dab2a Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:44:40 +0100 Subject: [PATCH 28/37] move WireLogLevel --- .../Sources/WireDatadog/WireLegacyLogging.swift | 1 - .../Sources/WireLogging/Placeholder.swift | 17 ----------------- .../WireLogMessage/WireLogLevel.swift | 0 3 files changed, 18 deletions(-) delete mode 100644 WireLogging/Sources/WireLogging/Placeholder.swift rename WireLogging/Sources/{WireLegacyLogging => WireLogging}/WireLogMessage/WireLogLevel.swift (100%) diff --git a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift index aabce498dc4..f7df465066d 100644 --- a/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift +++ b/WireAnalytics/Sources/WireDatadog/WireLegacyLogging.swift @@ -19,4 +19,3 @@ public import WireLegacyLogging public typealias WireLogger = WireLegacyLogging.WireLogger -public typealias WireLogLevel = WireLegacyLogging.WireLogLevel diff --git a/WireLogging/Sources/WireLogging/Placeholder.swift b/WireLogging/Sources/WireLogging/Placeholder.swift deleted file mode 100644 index 89c90917712..00000000000 --- a/WireLogging/Sources/WireLogging/Placeholder.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// 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/. -// diff --git a/WireLogging/Sources/WireLegacyLogging/WireLogMessage/WireLogLevel.swift b/WireLogging/Sources/WireLogging/WireLogMessage/WireLogLevel.swift similarity index 100% rename from WireLogging/Sources/WireLegacyLogging/WireLogMessage/WireLogLevel.swift rename to WireLogging/Sources/WireLogging/WireLogMessage/WireLogLevel.swift From ecc86bc596a5dcf1fad995296671a376242c65a6 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:55:36 +0100 Subject: [PATCH 29/37] fix build errors --- .../WireLegacyLogging.swift | 21 ++++++++++++++++ .../WireLegacyLogging.swift | 21 ++++++++++++++++ WireBackup/Package.swift | 1 + .../WireBackup/WireLegacyLogging.swift | 22 +++++++++++++++++ .../WireDomain/WireLegacyLogging.swift | 24 +++++++++++++++++++ .../WireLegacyLogging.swift | 21 ++++++++++++++++ WireNetwork/Package.swift | 5 ++-- .../WireNetwork/WireLegacyLogging.swift | 21 ++++++++++++++++ .../WireSettingsUI/WireLegacyLogging.swift | 24 +++++++++++++++++++ .../WireLegacyLogging.swift | 21 ++++++++++++++++ 10 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 WireAuthentication/Sources/WireAuthenticationLogic/WireLegacyLogging.swift create mode 100644 WireAuthentication/Sources/WireAuthenticationUI/WireLegacyLogging.swift create mode 100644 WireBackup/Sources/WireBackup/WireLegacyLogging.swift create mode 100644 WireDomain/Sources/WireDomain/WireLegacyLogging.swift create mode 100644 WireMessaging/Sources/WireMessagingDomain/WireLegacyLogging.swift create mode 100644 WireNetwork/Sources/WireNetwork/WireLegacyLogging.swift create mode 100644 WireUI/Sources/WireSettingsUI/WireLegacyLogging.swift create mode 100644 WireUI/Tests/WireSettingsUITests/WireLegacyLogging.swift 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 b25cb3f3b3b..88d627c44d8 100644 --- a/WireBackup/Package.swift +++ b/WireBackup/Package.swift @@ -21,6 +21,7 @@ let package = Package( dependencies: [ "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/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/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 3e21af6baea..d58ffeafa10 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"), "WireFoundation", - .product(name: "WireLegacyLogging", package: "WireLogging"), - .product(name: "WireCrypto", package: "WireFoundation") + "WireLogging", + .product(name: "WireLegacyLogging", 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/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 From b5e3f14f4d5374aaf40a9c6f3f7edce24d63fd8d Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 16:58:32 +0100 Subject: [PATCH 30/37] fix more errors --- .../Source/Logging/WireLegacyLogging.swift | 21 +++++++++++++++++++ .../Source/WireLegacyLogging.swift | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 wire-ios-system/Source/Logging/WireLegacyLogging.swift create mode 100644 wire-ios-utilities/Source/WireLegacyLogging.swift 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-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 From 99aa84fc1e8c3165f1ce1beac9c4b288f0429d9d Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 17:52:57 +0100 Subject: [PATCH 31/37] fix more errors --- .../Synchronization/IncrementalSyncV2.swift | 2 +- .../PullPendingUpdateEventsV2Sync.swift | 2 +- .../Source/Utilis/WireLegacyLogging.swift | 24 +++ .../WireDataModel.xcodeproj/project.pbxproj | 204 ++---------------- .../Base.lproj/LaunchScreen.storyboard | 25 --- .../Sources/WireLegacyLogging.swift | 22 ++ .../project.pbxproj | 75 +------ .../Sources/Helpers/WireLegacyLogging.swift | 24 +++ .../project.pbxproj | 139 +++--------- .../Sources/WireLegacyLogging.swift | 21 ++ .../WireShareEngine.xcodeproj/project.pbxproj | 94 +------- .../Source/Utility/WireLegacyLogging.swift | 23 ++ .../WireSyncEngine.xcodeproj/project.pbxproj | 47 +--- .../Source/Logging/WireLegacyLogging.swift | 22 ++ .../WireLegacyLogging.swift | 21 ++ .../WireLegacyLogging.swift | 21 ++ .../Sources/Helpers/WireLegacyLogging.swift | 24 +++ .../WireLegacyLogging.swift | 28 +++ 18 files changed, 305 insertions(+), 513 deletions(-) create mode 100644 wire-ios-data-model/Source/Utilis/WireLegacyLogging.swift delete mode 100644 wire-ios-notification-engine/Sources/Base.lproj/LaunchScreen.storyboard create mode 100644 wire-ios-notification-engine/Sources/WireLegacyLogging.swift create mode 100644 wire-ios-request-strategy/Sources/Helpers/WireLegacyLogging.swift create mode 100644 wire-ios-share-engine/Sources/WireLegacyLogging.swift create mode 100644 wire-ios-sync-engine/Source/Utility/WireLegacyLogging.swift create mode 100644 wire-ios-transport/Source/Logging/WireLegacyLogging.swift create mode 100644 wire-ios/Wire Notification Service Extension/WireLegacyLogging.swift create mode 100644 wire-ios/Wire-iOS Share Extension/WireLegacyLogging.swift create mode 100644 wire-ios/Wire-iOS/Sources/Helpers/WireLegacyLogging.swift create mode 100644 wire-ios/WireCommonComponents/WireLegacyLogging.swift diff --git a/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift b/WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift index 3e43327c79a..22fe64ec1c0 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: WireLegacyLogging.LogAttributes { + private var logAttributes: LogAttributes { .incrementalSyncV3 } diff --git a/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift b/WireDomain/Sources/WireDomain/Synchronization/PullPendingUpdateEventsV2Sync.swift index 4265740a150..4621c18b5e7 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: WireLegacyLogging.LogAttributes { + private var logAttributes: LogAttributes { .incrementalSyncV3 + .newNSE } 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 ebf66c9a547..e2cb05f5dfb 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 010093B32D4BA2F400429015 /* ZMConversationTests_SystemMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010093B22D4BA2DB00429015 /* ZMConversationTests_SystemMessages.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 */; }; @@ -20,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 */; }; 0158DF212C594B3600C7BFFD /* ZMEventModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0158DF1A2C594B1600C7BFFD /* ZMEventModel.xcdatamodeld */; }; 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 /* 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 */; }; @@ -60,12 +57,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 +85,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 */; }; @@ -212,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 */; }; @@ -233,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,10 +245,7 @@ 5950B0352E2EA1070051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0342E2EA1070051B07A /* GenericMessageProtocol */; }; 5950B0372E2EA1220051B07A /* GenericMessageProtocol in Frameworks */ = {isa = PBXBuildFile; productRef = 5950B0362E2EA1220051B07A /* GenericMessageProtocol */; }; 59537CDB2CFF8F2B00920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLegacyLogging */; }; - 5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */; }; - 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; }; 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 */; }; @@ -302,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 */; }; @@ -323,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 */; }; @@ -346,7 +332,6 @@ 63B1336E29A503D100009D84 /* StaleMLSKeyMaterialDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1335329A503D000009D84 /* StaleMLSKeyMaterialDetector.swift */; }; 63B1337329A798C800009D84 /* ProteusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63B1337229A798C800009D84 /* ProteusProvider.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 */; }; @@ -356,17 +341,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 */; }; @@ -454,7 +436,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 */; }; @@ -463,7 +444,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 */; }; @@ -472,7 +452,6 @@ E6A239902B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A2398F2B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift */; }; E6A239932B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A239922B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift */; }; E6A5BBA62B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A5BBA52B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift */; }; - E6A5BBAE2B0E564200ACC236 /* WireDataModelBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */; }; E6BB79592C36EBE0003B821B /* store2-118-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = E6BB79582C36EBE0003B821B /* store2-118-0.wiredatabase */; }; E6BDA1152B1642A400488D92 /* store2-110-0.wiredatabase in Resources */ = {isa = PBXBuildFile; fileRef = E6BDA1142B1642A400488D92 /* store2-110-0.wiredatabase */; }; E6BFE8382B3320C7000F0FBE /* DatabaseMigrationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BFE8372B3320C7000F0FBE /* DatabaseMigrationHelper.swift */; }; @@ -505,7 +484,6 @@ EE032B3129A62CA600E1DDF3 /* ProteusSessionID.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE032B2F29A62CA600E1DDF3 /* ProteusSessionID.swift */; }; EE032B3229A62CA600E1DDF3 /* ProteusSessionID+Mapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE032B3029A62CA600E1DDF3 /* ProteusSessionID+Mapping.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 */; }; @@ -519,7 +497,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 */; }; @@ -544,7 +521,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 */; }; @@ -593,11 +569,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 */; }; @@ -611,21 +584,13 @@ F9331C521CB3BC6800139ECC /* CryptoBoxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9331C501CB3BC6800139ECC /* CryptoBoxTests.swift */; }; F9331C561CB3BCF300139ECC /* OtrBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9331C541CB3BCDA00139ECC /* OtrBaseTest.swift */; }; F9331C5C1CB3BF9F00139ECC /* UserClientKeyStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9331C5B1CB3BF9F00139ECC /* UserClientKeyStoreTests.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 */; }; @@ -662,12 +627,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 */; }; - F9A706BD1CAEE01D00C2F5FE /* CryptoBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A706431CAEE01D00C2F5FE /* CryptoBox.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 */; }; @@ -694,7 +653,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, ); }; }; @@ -771,7 +729,6 @@ /* Begin PBXFileReference section */ 010093B22D4BA2DB00429015 /* ZMConversationTests_SystemMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZMConversationTests_SystemMessages.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 = ""; }; @@ -781,7 +738,6 @@ 013887AD2B9A5CA800323DD0 /* CoreDataMigrationActionFactoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataMigrationActionFactoryTests.swift; sourceTree = ""; }; 01423BC72DB00D8200C49567 /* zmessaging2.125.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.125.0.xcdatamodel; 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 = ""; }; 0153CA842B8540F0000000CA /* zmessaging2.114.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.114.0.xcdatamodel; sourceTree = ""; }; 0153CA8F2B855456000000CA /* store2-113-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-113-0.wiredatabase"; sourceTree = ""; }; 01586D3F2CAECE8B00C3BCE1 /* zmessaging2.119.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.119.0.xcdatamodel; sourceTree = ""; }; @@ -794,7 +750,6 @@ 0158DF1F2C594B1600C7BFFD /* ZMEventModel3.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel3.0.xcdatamodel; sourceTree = ""; }; 0158DF202C594B1600C7BFFD /* ZMEventModel4.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ZMEventModel4.0.xcdatamodel; 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 = ""; }; 0176BDCF2D515224002C33DE /* zmessaging2.122.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.122.0.xcdatamodel; 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 = ""; }; @@ -831,12 +786,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 = ""; }; @@ -861,13 +814,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 = ""; }; @@ -911,7 +862,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 = ""; }; @@ -983,7 +933,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 = ""; }; @@ -1004,7 +953,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 = ""; }; @@ -1019,10 +967,7 @@ 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsSelfUserE2EICertifiedUseCaseTests.swift; sourceTree = ""; }; 5930D9C22D43BC33009E3514 /* zmessaging2.121.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.121.0.xcdatamodel; 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 = ""; }; @@ -1064,7 +1009,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 = ""; }; @@ -1086,7 +1030,6 @@ 6391A7FE2A6FDB9100832665 /* store2-107-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-107-0.wiredatabase"; sourceTree = ""; }; 6398545E2B346A0700AA10DE /* zmessaging2.112.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.112.0.xcdatamodel; 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 = ""; }; @@ -1109,7 +1052,6 @@ 63B1335329A503D000009D84 /* StaleMLSKeyMaterialDetector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaleMLSKeyMaterialDetector.swift; sourceTree = ""; }; 63B1337229A798C800009D84 /* ProteusProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusProvider.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 = ""; }; @@ -1119,7 +1061,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 = ""; }; @@ -1127,11 +1068,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 = ""; }; @@ -1220,7 +1159,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 = ""; }; @@ -1229,7 +1167,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 = ""; }; @@ -1237,7 +1174,6 @@ E6A2398F2B7F6F50004E48C2 /* MockActorOneOnOneMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockActorOneOnOneMigrator.swift; sourceTree = ""; }; E6A239922B7F6F82004E48C2 /* MockActorOneOnOneProtocolSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockActorOneOnOneProtocolSelector.swift; sourceTree = ""; }; E6A5BBA52B0E33DB00ACC236 /* CoreDataMessagingMigrationVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataMessagingMigrationVersion.swift; sourceTree = ""; }; - E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireDataModelBundle.swift; sourceTree = ""; }; E6BB79552C36DDA9003B821B /* zmessaging2.118.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.118.0.xcdatamodel; sourceTree = ""; }; E6BB79582C36EBE0003B821B /* store2-118-0.wiredatabase */ = {isa = PBXFileReference; lastKnownFileType = file; path = "store2-118-0.wiredatabase"; sourceTree = ""; }; E6BDA1132B16421300488D92 /* zmessaging2.110.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = zmessaging2.110.0.xcdatamodel; sourceTree = ""; }; @@ -1302,7 +1238,6 @@ EE032B2F29A62CA600E1DDF3 /* ProteusSessionID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProteusSessionID.swift; sourceTree = ""; }; EE032B3029A62CA600E1DDF3 /* ProteusSessionID+Mapping.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ProteusSessionID+Mapping.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 = ""; }; @@ -1316,7 +1251,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 = ""; }; @@ -1343,7 +1277,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 = ""; }; @@ -1396,11 +1329,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 = ""; }; @@ -1413,21 +1343,13 @@ F9331C501CB3BC6800139ECC /* CryptoBoxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CryptoBoxTests.swift; sourceTree = ""; }; F9331C541CB3BCDA00139ECC /* OtrBaseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OtrBaseTest.swift; sourceTree = ""; }; F9331C5B1CB3BF9F00139ECC /* UserClientKeyStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserClientKeyStoreTests.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 = ""; }; @@ -1466,12 +1388,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 = ""; }; - F9A706431CAEE01D00C2F5FE /* CryptoBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CryptoBox.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 = ""; }; @@ -1507,7 +1423,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 = ""; }; @@ -1581,6 +1496,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 = ( @@ -1616,6 +1546,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 = ""; }; @@ -2317,24 +2248,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 = ( @@ -2584,46 +2497,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 */, - F9A706431CAEE01D00C2F5FE /* CryptoBox.swift */, - 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 */, - E6A5BBAD2B0E564200ACC236 /* WireDataModelBundle.swift */, - 1657FA9B2D9C432200A7B337 /* CoreCryptoContextProtocolExt.swift */, - E66029D12BDA43E10033C524 /* SearchUsersCache.swift */, - ); - path = Utilis; - sourceTree = ""; - }; F9A706CC1CAEE30700C2F5FE /* en.lproj */ = { isa = PBXGroup; children = ( @@ -2997,7 +2870,7 @@ F9A705D41CAEE01D00C2F5FE /* Model */, EE7F02202A80D5A700FE5695 /* Repositories */, F9A7061B1CAEE01D00C2F5FE /* Notifications */, - F9A706421CAEE01D00C2F5FE /* Utilis */, + 5961324E2EB9120D00BF6B25 /* Utilis */, F9C9A60C1CAD76A50039E10C /* WireDataModel.h */, F9C9A7371CAE6D890039E10C /* ConversationList */, 599EA3D12C246897009319D4 /* ConversationSearch */, @@ -3217,29 +3090,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 */, ); @@ -3290,6 +3157,7 @@ 5908C7982E85724300882DD1 /* Teams */, 5908C79E2E85729D00882DD1 /* UnknownMessage */, 594C4E2D2CCAAB6900F13D03 /* AccountImageSource */, + 5961324E2EB9120D00BF6B25 /* Utilis */, 596B91642EA795640010C93D /* User */, 596B91912EA7956C0010C93D /* UserClient */, 59AE1CA22E9D3A1900AF053A /* FeatureConfig */, @@ -3546,7 +3414,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 */, @@ -3591,8 +3458,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 */, @@ -3602,14 +3467,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 */, @@ -3621,18 +3484,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 */, @@ -3643,17 +3502,13 @@ 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 */, - F9A706BD1CAEE01D00C2F5FE /* CryptoBox.swift in Sources */, EE3EFE9725305A84009499E5 /* ModifiedObjects+Mergeable.swift in Sources */, EE42938A252C437900E70670 /* Notification.Name+ManagedObjectObservation.swift in Sources */, 16AD86BA1F75426C00E4C797 /* NSManagedObjectContext+NotificationContext.swift in Sources */, @@ -3664,13 +3519,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 */, @@ -3681,7 +3532,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 */, @@ -3725,24 +3575,19 @@ 63B1336629A503D100009D84 /* SendCommitBundleAction.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 */, EE79699629D4684C00075E38 /* CryptoboxMigrationManager.swift 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 */, 63CA8215240812620073426A /* ZMClientMessage+Composite.swift in Sources */, 013887A82B9A5C6B00323DD0 /* RemoveDuplicatePreAction.swift in Sources */, - E6A5BBAE2B0E564200ACC236 /* WireDataModelBundle.swift in Sources */, F9A706A91CAEE01D00C2F5FE /* StringKeyPath.swift in Sources */, 63298D9A2434D04D006B6018 /* GenericMessage+External.swift in Sources */, A90676EA238EB05F006417AC /* Action.swift in Sources */, @@ -3763,13 +3608,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 */, @@ -3780,7 +3622,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 */, @@ -3803,7 +3644,6 @@ 63B1335729A503D100009D84 /* MLSActionsProvider.swift in Sources */, EEC794F42A384421008E1A3B /* MLSDecryptionService.swift in Sources */, 0158DF212C594B3600C7BFFD /* ZMEventModel.xcdatamodeld in Sources */, - 5966D8362BD6AF1700305BBC /* UserPropertyNormalizationResult.swift in Sources */, 1672A6282344F10700380537 /* FolderList.swift in Sources */, 54E3EE3F1F6169A800A261E3 /* ZMAssetClientMessage+FileMessageData.swift in Sources */, 599EA3D02C246886009319D4 /* FilterConversationsUseCase.swift in Sources */, @@ -3812,7 +3652,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 */, @@ -3831,7 +3670,6 @@ 165124D221886EDB006A3C75 /* ZMOTRMessage+Quotes.swift in Sources */, 6308F8A42A273C680072A177 /* FetchMLSSubconversationGroupInfoAction.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 */, @@ -3846,14 +3684,11 @@ EE68EEC9252DC4450013B242 /* ChangeDetector.swift in Sources */, 63B1335629A503D100009D84 /* MLSGroup.swift in Sources */, EE032B3229A62CA600E1DDF3 /* ProteusSessionID+Mapping.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 */, @@ -3870,7 +3705,6 @@ 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 */, @@ -3879,12 +3713,10 @@ 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; }; diff --git a/wire-ios-notification-engine/Sources/Base.lproj/LaunchScreen.storyboard b/wire-ios-notification-engine/Sources/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 865e9329f37..00000000000 --- a/wire-ios-notification-engine/Sources/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 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-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index 94f007f429f..dadd43aab42 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -8,14 +8,8 @@ /* Begin PBXBuildFile section */ 067ECB3E2487A93D00701956 /* WireNotificationEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 067ECB3C2487A93D00701956 /* WireNotificationEngine.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 067ECB602487ABF700701956 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06604297247FE76A00A5F161 /* AppDelegate.swift */; }; - 069712912497B96E00C32169 /* OperationLoop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06394AA12497B24600380494 /* OperationLoop.swift */; }; - 069712972497C1BF00C32169 /* NotificationSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 069712952497C1BC00C32169 /* NotificationSession.swift */; }; - 069712992497C2B900C32169 /* AuthenticationStatusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 069712982497C2B900C32169 /* AuthenticationStatusProvider.swift */; }; - 0697129D2497CAC200C32169 /* PushNotificationStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0697129C2497CAC200C32169 /* PushNotificationStrategy.swift */; }; 06DE7AB72DE4D8A100D79D99 /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06DE7AB62DE4D8A100D79D99 /* WireDomain.framework */; }; 06DE7ABF2DE4E39200D79D99 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 06DE7ABE2DE4E39200D79D99 /* WireFoundation */; }; - 3431F0872E795487007BA692 /* LegacyNotificationSessionLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */; }; 3431F0892E795B90007BA692 /* WireNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = 3431F0882E795B90007BA692 /* WireNetwork */; }; 591B6E262C8B097B009F8A7B /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE668BC52954BA4C00D939E7 /* WireRequestStrategy.framework */; }; 591B6E2C2C8B0983009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */; }; @@ -23,9 +17,6 @@ 59537D8D2CFF9FB300920B59 /* WireLegacyLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D8C2CFF9FB300920B59 /* WireLegacyLogging */; }; 630A582D29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */; }; EE0BA28A29D59B1D004E93B5 /* NotificationSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */; }; - EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */; }; - EE32460028229F6B00F2A84A /* ClientRegistrationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */; }; - EE32460228229FDF00F2A84A /* AuthenticationStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE32460128229FDF00F2A84A /* AuthenticationStatus.swift */; }; EE761669299E60C9005DB75F /* WireNotificationEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 067ECB3A2487A93D00701956 /* WireNotificationEngine.framework */; }; EE9AEC982BD159C700F7853F /* WireNotificationEngine.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC972BD159C700F7853F /* WireNotificationEngine.docc */; }; EEC80B4329B6053200099727 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC80B4229B6053200099727 /* AppDelegate.swift */; }; @@ -53,16 +44,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 06394AA12497B24600380494 /* OperationLoop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperationLoop.swift; sourceTree = ""; }; - 06604297247FE76A00A5F161 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 066042A0247FE76C00A5F161 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 066042A5247FE76C00A5F161 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 067ECB3A2487A93D00701956 /* WireNotificationEngine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireNotificationEngine.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 067ECB3C2487A93D00701956 /* WireNotificationEngine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WireNotificationEngine.h; sourceTree = ""; }; 067ECB3D2487A93D00701956 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 069712952497C1BC00C32169 /* NotificationSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSession.swift; sourceTree = ""; }; - 069712982497C2B900C32169 /* AuthenticationStatusProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStatusProvider.swift; sourceTree = ""; }; - 0697129C2497CAC200C32169 /* PushNotificationStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushNotificationStrategy.swift; sourceTree = ""; }; 06BD1D2F2487B01C002F82A6 /* wire-ios-notification-engine.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "wire-ios-notification-engine.xcconfig"; sourceTree = ""; }; 06BD1D302487B01C002F82A6 /* version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = version.xcconfig; sourceTree = ""; }; 06BD1D322487B01C002F82A6 /* ios-test-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ios-test-target.xcconfig"; sourceTree = ""; }; @@ -74,13 +58,9 @@ 06BD1D392487B01C002F82A6 /* project-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "project-debug.xcconfig"; sourceTree = ""; }; 06BD1D3B2487B01C002F82A6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 06DE7AB62DE4D8A100D79D99 /* WireDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyNotificationSessionLoader.swift; sourceTree = ""; }; 59B170E52BCE70E200575995 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 630A582C29AF9F3E00E26C4D /* BaseNotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseNotificationSessionTests.swift; sourceTree = ""; }; EE0BA28929D59B1D004E93B5 /* NotificationSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSessionTests.swift; sourceTree = ""; }; - EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationStatusDirectory.swift; sourceTree = ""; }; - EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientRegistrationStatus.swift; sourceTree = ""; }; - EE32460128229FDF00F2A84A /* AuthenticationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStatus.swift; sourceTree = ""; }; EE668BC52954BA4C00D939E7 /* WireRequestStrategy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireRequestStrategy.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EE67F6FB296F09A0001D7C88 /* WireTesting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTesting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EE761665299E60C9005DB75F /* WireNotificationEngineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireNotificationEngineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -96,6 +76,14 @@ /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 596133042EB9138500BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Assets.xcassets, + Info.plist, + ); + target = 067ECB392487A93D00701956 /* WireNotificationEngine */; + }; 59D264212CF721B40005317F /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( @@ -106,6 +94,7 @@ /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ + 596132F72EB9138500BF6B25 /* Sources */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (596133042EB9138500BF6B25 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Sources; sourceTree = ""; }; 59D2641F2CF721A00005317F /* Tests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59D264212CF721B40005317F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Tests; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ @@ -159,7 +148,7 @@ children = ( EE9AEC972BD159C700F7853F /* WireNotificationEngine.docc */, 06BD1D2D2487B01C002F82A6 /* Resources */, - 06604296247FE76A00A5F161 /* Sources */, + 596132F72EB9138500BF6B25 /* Sources */, 59D2641F2CF721A00005317F /* Tests */, 067ECB3B2487A93D00701956 /* WireNotificationEngine */, EE761670299E614B005DB75F /* WireNotificationEngineTests */, @@ -183,23 +172,6 @@ name = Products; sourceTree = ""; }; - 06604296247FE76A00A5F161 /* Sources */ = { - isa = PBXGroup; - children = ( - 0697129A2497CA8F00C32169 /* Synchronization */, - 06604297247FE76A00A5F161 /* AppDelegate.swift */, - EE3245FD28229E8600F2A84A /* ApplicationStatusDirectory.swift */, - 069712982497C2B900C32169 /* AuthenticationStatusProvider.swift */, - EE32460128229FDF00F2A84A /* AuthenticationStatus.swift */, - EE3245FF28229F6B00F2A84A /* ClientRegistrationStatus.swift */, - 069712952497C1BC00C32169 /* NotificationSession.swift */, - 3431F0862E795487007BA692 /* LegacyNotificationSessionLoader.swift */, - 066042A0247FE76C00A5F161 /* Assets.xcassets */, - 066042A5247FE76C00A5F161 /* Info.plist */, - ); - path = Sources; - sourceTree = ""; - }; 067ECB3B2487A93D00701956 /* WireNotificationEngine */ = { isa = PBXGroup; children = ( @@ -209,23 +181,6 @@ path = WireNotificationEngine; sourceTree = ""; }; - 0697129A2497CA8F00C32169 /* Synchronization */ = { - isa = PBXGroup; - children = ( - 06394AA12497B24600380494 /* OperationLoop.swift */, - 0697129B2497CA9A00C32169 /* Strategies */, - ); - path = Synchronization; - sourceTree = ""; - }; - 0697129B2497CA9A00C32169 /* Strategies */ = { - isa = PBXGroup; - children = ( - 0697129C2497CAC200C32169 /* PushNotificationStrategy.swift */, - ); - path = Strategies; - sourceTree = ""; - }; 06BD1D2D2487B01C002F82A6 /* Resources */ = { isa = PBXGroup; children = ( @@ -309,6 +264,7 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( + 596132F72EB9138500BF6B25 /* Sources */, 59D2641F2CF721A00005317F /* Tests */, ); name = WireNotificationEngine; @@ -427,16 +383,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 067ECB602487ABF700701956 /* AppDelegate.swift in Sources */, - EE32460228229FDF00F2A84A /* AuthenticationStatus.swift in Sources */, - EE32460028229F6B00F2A84A /* ClientRegistrationStatus.swift in Sources */, - 069712912497B96E00C32169 /* OperationLoop.swift in Sources */, EE9AEC982BD159C700F7853F /* WireNotificationEngine.docc in Sources */, - 3431F0872E795487007BA692 /* LegacyNotificationSessionLoader.swift in Sources */, - 0697129D2497CAC200C32169 /* PushNotificationStrategy.swift in Sources */, - 069712992497C2B900C32169 /* AuthenticationStatusProvider.swift in Sources */, - 069712972497C1BF00C32169 /* NotificationSession.swift in Sources */, - EE3245FE28229E8600F2A84A /* ApplicationStatusDirectory.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; 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 51a8675d090..a4bfea9acd7 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 0106AC982C9CBCE40022E2CF /* MessageInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0106AC962C9CB7F90022E2CF /* MessageInfo.swift */; }; 01F5AED02CAD892000B01069 /* ProteusMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F5AECF2CAD892000B01069 /* ProteusMessageTests.swift */; }; 06025662248E467B00E060E1 /* NotificationStreamSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06025661248E467B00E060E1 /* NotificationStreamSync.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 */; }; @@ -22,7 +21,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 */; }; @@ -33,12 +31,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 */; }; @@ -60,8 +56,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 */; }; @@ -145,7 +139,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 */; }; @@ -216,7 +209,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 */; }; @@ -229,7 +221,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 */; }; @@ -247,7 +238,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 */; }; @@ -256,10 +246,6 @@ CB5A461D2D940BB700D469F1 /* Payload+ConversationGroupType.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5A461C2D940BA600D469F1 /* Payload+ConversationGroupType.swift */; }; CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEA58F192B71179D006DEE32 /* WireRequestStrategySupport.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 */; }; @@ -293,9 +279,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 */; }; @@ -363,7 +346,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 */; }; @@ -389,13 +371,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 */; }; - F18401D92073BE0800E9F4CC /* EncryptionSessionDirectory+UpdateEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18401992073BE0800E9F4CC /* EncryptionSessionDirectory+UpdateEvents.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 */; }; @@ -469,9 +444,6 @@ 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 = ""; }; 06025661248E467B00E060E1 /* NotificationStreamSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationStreamSync.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 = ""; }; @@ -479,7 +451,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 = ""; }; @@ -492,7 +463,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 = ""; }; @@ -535,7 +505,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 = ""; }; @@ -658,7 +627,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 = ""; }; @@ -719,7 +687,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 = ""; }; @@ -732,7 +699,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 = ""; }; @@ -751,16 +717,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 = ""; }; @@ -795,9 +757,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 = ""; }; @@ -868,7 +827,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 = ""; }; @@ -907,13 +865,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 = ""; }; - F18401992073BE0800E9F4CC /* EncryptionSessionDirectory+UpdateEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EncryptionSessionDirectory+UpdateEvents.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 /* MessagingTest+Encryption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MessagingTest+Encryption.swift"; sourceTree = ""; }; @@ -934,10 +885,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 +938,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 = ""; }; @@ -1343,7 +1322,7 @@ 067197632AE9502C00D96598 /* E2EIdentity */, 1623F8D62AE7FB5F004F0319 /* APIs */, 168D7CA326FB0CCF00789960 /* Entity Actions */, - F963E8D81D955D4600098AD3 /* Helpers */, + 596132982EB912A800BF6B25 /* Helpers */, 16229481221EBB8000A98679 /* Image Preprocessing */, 1623F8D12AE66F0A004F0319 /* Message Sending */, 06ADE9FE2BD1521A008BA0B3 /* User Client */, @@ -2093,38 +2072,6 @@ path = "zmc-config"; sourceTree = ""; }; - F963E8D81D955D4600098AD3 /* Helpers */ = { - isa = PBXGroup; - children = ( - F18401962073BE0800E9F4CC /* ZMStrategyConfigurationOption.h */, - F18401942073BE0800E9F4CC /* MessageExpirationTimer.swift */, - F18401972073BE0800E9F4CC /* MessageExpirationTimerTests.swift */, - F18401932073BE0800E9F4CC /* ZMMessage+Dependency.swift */, - F18401992073BE0800E9F4CC /* EncryptionSessionDirectory+UpdateEvents.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 */ @@ -2144,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 */, @@ -2162,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; }; @@ -2191,6 +2135,7 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( + 596132982EB912A800BF6B25 /* Helpers */, CB2D09132D2BEB54006E05B8 /* Calling */, ); name = WireRequestStrategy; @@ -2425,7 +2370,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 */, @@ -2456,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 */, @@ -2487,14 +2430,11 @@ 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 */, - F18401D92073BE0800E9F4CC /* EncryptionSessionDirectory+UpdateEvents.swift in Sources */, EEDBD0A92A7B7F0C00F3956F /* SelfUserRequestStrategy.swift in Sources */, F18401C72073BE0800E9F4CC /* AssetV3PreviewDownloadStrategy.swift in Sources */, 16367F1E26FDB0740028AF8B /* Payload+Connection.swift in Sources */, @@ -2504,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 */, @@ -2513,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 */, @@ -2558,7 +2494,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 */, @@ -2566,8 +2501,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 */, @@ -2587,7 +2520,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 */, @@ -2601,8 +2533,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 */, @@ -2627,7 +2557,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 */, @@ -2670,12 +2599,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 */, @@ -2715,7 +2642,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 */, @@ -2738,7 +2664,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 */, @@ -2772,7 +2697,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 */, @@ -2780,7 +2704,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 */, 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 78859706e42..37448543c0c 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -9,15 +9,7 @@ /* 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 */; }; @@ -32,17 +24,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 */ @@ -64,15 +45,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 = ""; }; @@ -99,20 +72,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 = ( @@ -123,6 +92,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 */ @@ -164,7 +134,7 @@ isa = PBXGroup; children = ( EE9AEC952BD159A900F7853F /* WireShareEngine.docc */, - F1DABF961E9B8B6100AD2324 /* Sources */, + 596132D12EB912F100BF6B25 /* Sources */, 59D264222CF721F70005317F /* Tests */, 5470D3F61D76E1B000FDE440 /* WireShareEngineTests */, 5470D4021D76E2A400FDE440 /* Resources */, @@ -256,32 +226,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 */ @@ -289,7 +233,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F1DABFAA1E9B8B6100AD2324 /* WireShareEngine.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -310,6 +253,7 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( + 596132D12EB912F100BF6B25 /* Sources */, 59D264222CF721F70005317F /* Tests */, ); name = WireShareEngine; @@ -430,25 +374,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; }; 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/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index d23c7c66d30..361fbcbe24c 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -74,7 +74,6 @@ 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 */; }; @@ -195,7 +194,6 @@ 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, ); }; }; @@ -203,7 +201,6 @@ 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 */; }; @@ -285,7 +282,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 */; }; @@ -348,13 +344,11 @@ 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 */; }; 878ACB4620ADBBAA0016E68A /* Blacklist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 878ACB4520ADBBAA0016E68A /* Blacklist.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 */; }; @@ -416,7 +410,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 */; }; @@ -426,7 +419,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 */; }; EE0CAEB12AAF306000BD2DB7 /* ZMBlacklistDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = F9FD798519EE742600D70FCD /* ZMBlacklistDownloader.h */; }; EE1108F923D1F945005DC663 /* TypingUsersTimeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE1108F823D1F945005DC663 /* TypingUsersTimeout.swift */; }; EE1108FB23D2087F005DC663 /* Typing.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE1108FA23D2087F005DC663 /* Typing.swift */; }; @@ -441,7 +433,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 */; }; @@ -666,7 +657,6 @@ 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 = ""; }; @@ -791,12 +781,10 @@ 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 = ""; }; @@ -864,7 +852,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 = ""; }; @@ -933,13 +920,11 @@ 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 = ""; }; 878ACB4520ADBBAA0016E68A /* Blacklist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Blacklist.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 = ""; }; @@ -1039,7 +1024,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 = ""; }; @@ -1051,7 +1035,6 @@ 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 = ""; }; EE0BA28F29D5DBD6004E93B5 /* MockCryptoboxMigrationManagerInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCryptoboxMigrationManagerInterface.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 = ""; }; @@ -1065,7 +1048,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 = ""; }; @@ -1229,6 +1211,7 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ 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 = ""; }; @@ -1648,7 +1631,7 @@ 59D0583B2D158D0D00B687F2 /* Analytics */, 060C06662B7619C600B484C6 /* E2EI */, EFF9403C2240FE12004F3115 /* DeepLink */, - A9EADFFF19DBF20A00FD386C /* Utility */, + 596133112EB913D000BF6B25 /* Utility */, A926F1E0196C12ED0045BB47 /* Registration */, A957B4B91962FB610060EE03 /* Notifications */, 54BAF1BB19212EBA008042FB /* UserSession */, @@ -2163,22 +2146,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 = ( @@ -2469,7 +2436,6 @@ 166E47D1255EC03E00C161C8 /* ZMSelfStrategy.h in Headers */, F19F1D311EFBCBD300275E27 /* ZMLoginTranscoder.h in Headers */, 1602B4611F3B04150061C135 /* ZMBlacklistVerificator.h in Headers */, - 5430E9251BAA0D9F00395E05 /* WireSyncEngineLogs.h in Headers */, 06DE14CF24B85CA0006CB6B3 /* ZMClientRegistrationStatusDelegate.h in Headers */, 09531F161AE960E300B8556A /* ZMLoginCodeRequestTranscoder.h in Headers */, EE0CAEB12AAF306000BD2DB7 /* ZMBlacklistDownloader.h in Headers */, @@ -2583,6 +2549,7 @@ ); fileSystemSynchronizedGroups = ( 591E5E252D28084200284F11 /* WireCallCenterNotifications */, + 596133112EB913D000BF6B25 /* Utility */, 59A9D3C62E86BB49002FCE03 /* AppVersionMigrations */, 59D0583B2D158D0D00B687F2 /* Analytics */, 59DBECA72D3965570069C64C /* Use cases */, @@ -3047,7 +3014,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 */, @@ -3089,7 +3055,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 */, @@ -3102,7 +3067,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 */, @@ -3110,7 +3074,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 */, @@ -3119,7 +3082,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 */, @@ -3143,7 +3105,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 */, @@ -3206,8 +3167,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 */, 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/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/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 From 50061a38194f098fd6108c0b60dec59b87f7329a Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 18:11:01 +0100 Subject: [PATCH 32/37] fix more errors --- .../Utility/WireLegacyLoggingSupport.swift | 21 +++++++++ .../WireSyncEngine.xcodeproj/project.pbxproj | 46 ++++--------------- .../Helpers/WireLegacyLoggingSupport.swift | 21 +++++++++ wire-ios/Wire-iOS.xcodeproj/project.pbxproj | 16 +++++++ 4 files changed, 68 insertions(+), 36 deletions(-) create mode 100644 wire-ios-sync-engine/Tests/Source/Utility/WireLegacyLoggingSupport.swift create mode 100644 wire-ios/Wire-iOS Tests/Helpers/WireLegacyLoggingSupport.swift 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 361fbcbe24c..b1a139fd652 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -73,7 +73,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 */; }; 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 */; }; @@ -131,13 +130,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 */; }; @@ -194,7 +191,6 @@ 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 */; }; - 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 */; }; @@ -266,6 +262,7 @@ 5996E8952C19CB36007A52F0 /* WireUtilitiesSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E87042BF4E01300FC5438 /* WireUtilitiesSupport.framework */; }; 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 */; }; @@ -274,7 +271,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 */; }; @@ -349,7 +345,6 @@ 8754B84C1F73C38900EC02AD /* MessageChangeInfo+UserSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8754B84B1F73C38900EC02AD /* MessageChangeInfo+UserSession.swift */; }; 8766853C1F2A1AA00031081B /* UnauthenticatedSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8766853A1F2A1A860031081B /* UnauthenticatedSessionTests.swift */; }; 878ACB4620ADBBAA0016E68A /* Blacklist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 878ACB4520ADBBAA0016E68A /* Blacklist.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 */; }; @@ -484,7 +479,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 */; }; @@ -656,7 +650,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 = ""; }; 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 = ""; }; @@ -711,13 +704,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 = ""; }; @@ -781,7 +772,6 @@ 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 = ""; }; - 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 = ""; }; @@ -844,7 +834,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 = ""; }; @@ -925,7 +914,6 @@ 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 = ""; }; 878ACB4520ADBBAA0016E68A /* Blacklist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Blacklist.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 = ""; }; @@ -1106,7 +1094,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 = ""; }; @@ -1218,6 +1205,7 @@ 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 */ @@ -1261,6 +1249,7 @@ 59919E092DACFEED00EF63C7 /* WireFoundationSupport in Frameworks */, 59358C902DF1A01300C32162 /* WireAnalyticsSupport in Frameworks */, 59BB29252E29527500C49DB6 /* WireLegacyLoggingSupport in Frameworks */, + 59D8C3962EB9189200B8E622 /* WireLoggingSupport in Frameworks */, EE4E6A262B714490007C476D /* WireRequestStrategySupport.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1670,7 +1659,7 @@ 169BA1F625ECF8C300374343 /* Mocks */, 09C77C3C1BA2E38D00E2163F /* E2EE */, 54C2F6751A6FA988003D09D9 /* Notifications */, - A9EAE00A19DBF24100FD386C /* Utility */, + 59D8C3A12EB918D500B8E622 /* Utility */, 54CEC9BB19AB34CE006817BB /* Registration */, 5474C7EB1921303400185A3A /* UserSession */, F159F4121F1E310C001B7D80 /* SessionManager */, @@ -2146,20 +2135,6 @@ path = Search; 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 = ( @@ -2519,6 +2494,7 @@ fileSystemSynchronizedGroups = ( 598410982D3EC1980062D022 /* Use cases */, 59C60D1A2D00672300CAC544 /* Transcoders */, + 59D8C3A12EB918D500B8E622 /* Utility */, ); name = UnitTests; packageProductDependencies = ( @@ -2529,6 +2505,7 @@ 34F8CA972E02BFEB000FE4E0 /* WireNetwork */, 59BB29242E29527500C49DB6 /* WireLegacyLoggingSupport */, 594EA9FF2EA23E73009BC0EB /* WireUtilitiesPackageSupport */, + 59D8C3952EB9189200B8E622 /* WireLoggingSupport */, ); productName = "WireSyncEngine-iOS-Tests"; productReference = 3E1860C3191A649D000FE027 /* UnitTests.xctest */; @@ -2769,16 +2746,13 @@ 1660AA111ECE3C1C0056D403 /* SearchTaskTests.swift in Sources */, 16D66D6A2B0789F500CB237D /* MockCryptoboxMigrationManagerInterface.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 */, @@ -2818,7 +2792,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 */, @@ -2849,7 +2822,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 */, @@ -2881,14 +2853,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 */, 3ED972FB1A0A65D800BAFC61 /* ZMBlacklistVerificatorTest.m in Sources */, EECE27C6294362F100419A8B /* MockPushTokenService.swift in Sources */, @@ -3748,6 +3718,10 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; + 59D8C3952EB9189200B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; CBD35F292D09EBA50080DA37 /* WireCrypto */ = { isa = XCSwiftPackageProductDependency; productName = WireCrypto; 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 21924811911..9c677e6d46d 100644 --- a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj +++ b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj @@ -106,6 +106,8 @@ 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 */; }; @@ -501,6 +503,7 @@ membershipExceptions = ( LegacyNotificationService.swift, Logger.swift, + WireLegacyLogging.swift, ); target = BACB88501AF7C48900DDCDB0 /* Wire-iOS-Tests */; }; @@ -709,6 +712,7 @@ GroupParticipantsDetailViewControllerSnapshotTests.swift, Helpers/MockSystemSaveFilePresenter.swift, Helpers/SaveFileManagerTests.swift, + Helpers/WireLegacyLoggingSupport.swift, "Helpers/XCTestCase+Extensions.swift", IconLabelButtonTests.swift, ImageCache/DecodeImageOperationTests.swift, @@ -1024,6 +1028,7 @@ 59C951C22E2B67E3002C0A3E /* WireLegacyLoggingSupport in Frameworks */, 591B6E1C2C8B0964009F8A7B /* WireDataModelSupport.framework in Frameworks */, 595BE7A42E32367F00ED9088 /* WireAnalyticsSupport in Frameworks */, + 59D8C38F2EB9159E00B8E622 /* WireLoggingSupport in Frameworks */, 5996E8AD2C19D0DF007A52F0 /* WireTesting.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1033,6 +1038,7 @@ buildActionMask = 2147483647; files = ( 59AADE272BB429B200D9E658 /* WireRequestStrategySupport.framework in Frameworks */, + 59D8C3912EB915A500B8E622 /* WireLoggingSupport in Frameworks */, 59C951C42E2B67E8002C0A3E /* WireLegacyLoggingSupport in Frameworks */, 5996E8AA2C19D0D6007A52F0 /* WireSystemSupport.framework in Frameworks */, 5977ED1F2D26747900F5C78E /* WireLegacyLogging in Frameworks */, @@ -1442,6 +1448,7 @@ 595BE7A32E32367F00ED9088 /* WireAnalyticsSupport */, 3438C5582E5C518900D6FB5C /* WireNetwork */, 76EF748F2E9E6380006A1579 /* WireLocators */, + 59D8C38E2EB9159E00B8E622 /* WireLoggingSupport */, ); productName = "ZClient-iOS Tests"; productReference = BACB88511AF7C48900DDCDB0 /* Wire-iOS-Tests.xctest */; @@ -1470,6 +1477,7 @@ 59C951C32E2B67E8002C0A3E /* WireLegacyLoggingSupport */, 595BE7A52E32368500ED9088 /* WireAnalyticsSupport */, 3438C55A2E5C51A700D6FB5C /* WireNetwork */, + 59D8C3902EB915A500B8E622 /* WireLoggingSupport */, ); productName = "Wire-iOS UnitTests"; productReference = E6579E362AFF9B30004E7FD8 /* Wire-iOS UnitTests.xctest */; @@ -3009,6 +3017,14 @@ isa = XCSwiftPackageProductDependency; productName = WireMainNavigationUI; }; + 59D8C38E2EB9159E00B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; + 59D8C3902EB915A500B8E622 /* WireLoggingSupport */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLoggingSupport; + }; 76ACF8A12D4215E2001F48A1 /* WireViewsDebugUI */ = { isa = XCSwiftPackageProductDependency; productName = WireViewsDebugUI; From 7ce213d7762f5e06b25510d1b7fc081dd0017360 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 18:13:59 +0100 Subject: [PATCH 33/37] revert some changes --- fastlane/framework.rb | 38 +++++++++---------- .../xcschemes/WireFoundationAll.xcscheme | 6 +-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fastlane/framework.rb b/fastlane/framework.rb index 9038a358353..0890b01ccdb 100644 --- a/fastlane/framework.rb +++ b/fastlane/framework.rb @@ -12,7 +12,7 @@ def self.all "WireFoundation", "WireMessaging", "WireCalling", - "WireLegacyLogging", + "WireLogging", "WireUI", "wire-ios", "wire-ios-canvas", @@ -47,23 +47,23 @@ def self.all frameworks["wire-ios"].add_dependency(frameworks["WireMessaging"]) frameworks["wire-ios"].add_dependency(frameworks["WireCalling"]) frameworks["wire-ios"].add_dependency(frameworks["wire-ios-testing"]) # included in WireiOSTests - frameworks["wire-ios"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-notification-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) - frameworks["wire-ios-notification-engine"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-notification-engine"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireNetwork"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireAnalytics"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireDomain"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["wire-ios-testing"]) # included in WireSyncEngineiOSTests - frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireLogging"]) - frameworks["wire-ios-share-engine"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-share-engine"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-request-strategy"].add_dependency(frameworks["wire-ios-data-model"]) frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireNetwork"]) - frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-request-strategy"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-cryptobox"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-images"]) @@ -72,7 +72,7 @@ def self.all frameworks["wire-ios-data-model"].add_dependency(frameworks["WireFoundation"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["WireData"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-testing"]) # included in WireDataModelTests - frameworks["wire-ios-data-model"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-data-model"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-testing"]) frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-cryptobox"]) @@ -81,7 +81,7 @@ def self.all frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-utilities"]) frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-testing"]) # included in WireTransportTests - frameworks["wire-ios-transport"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-transport"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-link-preview"].add_dependency(frameworks["wire-ios-utilities"]) frameworks["wire-ios-link-preview"].add_dependency(frameworks["WireFoundation"]) @@ -90,7 +90,7 @@ def self.all frameworks["wire-ios-utilities"].add_dependency(frameworks["wire-ios-system"]) frameworks["wire-ios-utilities"].add_dependency(frameworks["WireFoundation"]) - frameworks["wire-ios-utilities"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["wire-ios-utilities"].add_dependency(frameworks["WireLogging"]) frameworks["wire-ios-testing"].add_dependency(frameworks["wire-ios-system"]) @@ -98,30 +98,30 @@ def self.all frameworks["WireDomain"].add_dependency(frameworks["wire-ios-data-model"]) frameworks["WireDomain"].add_dependency(frameworks["WireNetwork"]) frameworks["WireDomain"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireDomain"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireDomain"].add_dependency(frameworks["WireLogging"]) frameworks["WireNetwork"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireNetwork"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireNetwork"].add_dependency(frameworks["WireLogging"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireDomain"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireFoundation"]) frameworks["WireAuthentication"].add_dependency(frameworks["WireUI"]) - frameworks["WireAuthentication"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireAuthentication"].add_dependency(frameworks["WireLogging"]) frameworks["WireBackup"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireBackup"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireBackup"].add_dependency(frameworks["WireLogging"]) frameworks["WireMessaging"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireMessaging"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireMessaging"].add_dependency(frameworks["WireLogging"]) frameworks["WireCalling"].add_dependency(frameworks["WireFoundation"]) - frameworks["WireCalling"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireCalling"].add_dependency(frameworks["WireLogging"]) - frameworks["WireUI"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireUI"].add_dependency(frameworks["WireLogging"]) frameworks["WireUI"].add_dependency(frameworks["WireFoundation"]) frameworks["WireUI"].add_dependency(frameworks["WireDomain"]) - frameworks["WireAnalytics"].add_dependency(frameworks["WireLegacyLogging"]) + frameworks["WireAnalytics"].add_dependency(frameworks["WireLogging"]) frameworks end @@ -175,8 +175,8 @@ def to_scheme(name) name when "WireAnalytics" "WireAnalyticsAll" # if a package has multiple targets, fastlane does not found -Package - when "WireLegacyLogging" - "WireLegacyLoggingAll" # if a package has multiple targets, fastlane does not find -Package + when "WireLogging" + "WireLoggingAll" # if a package has multiple targets, fastlane does not find -Package when "wire-ios-mocktransport" "WireMockTransport" else diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme index 07044d31690..9dcfe280a1d 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme @@ -15,9 +15,9 @@ buildForAnalyzing = "YES"> From d38f5967079e602698b08e6e997c0a3889a6470e Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Mon, 3 Nov 2025 20:15:05 +0100 Subject: [PATCH 34/37] format code --- .../Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift index bc9be2bc875..a54364d4d8c 100644 --- a/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift +++ b/WireLogging/Tests/WireLoggingTests/WireLoggingTestsPlaceholder.swift @@ -22,7 +22,8 @@ import Testing struct Test { - @Test func nothing() async throws { + @Test + func nothing() async throws { // just a placeholder test } From 32dc49ea7c4ad1492a95a488500e009c99db94be Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 28 Nov 2025 11:03:23 +0100 Subject: [PATCH 35/37] Trigger CI From 708549e337020fa64dc149163f0f7ca98e402996 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 28 Nov 2025 12:05:50 +0100 Subject: [PATCH 36/37] Trigger CI From 145b7d862c8a65c4a42e6625ada32f1cb46538f8 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 16 Jan 2026 15:32:50 +0100 Subject: [PATCH 37/37] remove Starscream --- wire-ios-transport/WireTransport.xcodeproj/project.pbxproj | 7 ------- 1 file changed, 7 deletions(-) diff --git a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj index 9b88773ef70..2b1de67ef3c 100644 --- a/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj +++ b/wire-ios-transport/WireTransport.xcodeproj/project.pbxproj @@ -162,7 +162,6 @@ 59FE6ACC2DA90CBA00DB461C /* WireFoundation in Frameworks */, 591B6E632C8B09F3009F8A7B /* WireUtilities.framework in Frameworks */, 59537CD92CFF7ED800920B59 /* WireLegacyLogging in Frameworks */, - 01BBCFD82BF559AA001D9397 /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -287,7 +286,6 @@ ); name = "WireTransport-ios"; packageProductDependencies = ( - 01BBCFD72BF559AA001D9397 /* Starscream */, 59537CD82CFF7ED800920B59 /* WireLegacyLogging */, 59FE6ACB2DA90CBA00DB461C /* WireFoundation */, ); @@ -812,11 +810,6 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 01BBCFD72BF559AA001D9397 /* Starscream */ = { - isa = XCSwiftPackageProductDependency; - package = 01BBCFD62BF559AA001D9397 /* XCRemoteSwiftPackageReference "starscream" */; - productName = Starscream; - }; 59537CD82CFF7ED800920B59 /* WireLegacyLogging */ = { isa = XCSwiftPackageProductDependency; productName = WireLegacyLogging;