From d7a70a325f8354b5eab40ec80cee7ce6ba2aa348 Mon Sep 17 00:00:00 2001 From: Christoph Aldrian Date: Fri, 6 Dec 2024 12:40:40 +0100 Subject: [PATCH] chore: extract WireLogger into Swift package - WPB-11881 (#1938) --- .github/workflows/test_pr_changes.yml | 8 +- .gitignore | 3 + .../Service/AnalyticsService.swift | 2 +- .../project.pbxproj | 1024 +---------------- .../UpdateEventDecryptor.swift | 1 + .../ConversationCreateEventProcessor.swift | 1 + ...ationReceiptModeUpdateEventProcessor.swift | 1 + .../UserPropertiesDeleteEventProcessor.swift | 1 + .../ConversationLocalStore.swift | 1 + .../ConversationRepository.swift | 1 + .../ConversationLabelsLocalStore.swift | 1 + .../ConversationLabelsRepository.swift | 1 + .../FeatureConfigLocalStore.swift | 1 + .../FeatureConfigRepository.swift | 1 + .../UpdateEvents/UpdateEventsLocalStore.swift | 1 + .../UpdateEvents/UpdateEventsRepository.swift | 1 + .../Repositories/User/UserLocalStore.swift | 1 + .../Repositories/User/UserRepository.swift | 1 + .../UserClients/UserClientsLocalStore.swift | 1 + .../Synchronization/OneOnOneResolver.swift | 1 + .../Synchronization/SyncManager.swift | 1 + .../PushSupportedProtocolsUseCase.swift | 1 + ...atureConfigUpdateEventProcessorTests.swift | 1 + .../PushSupportedProtocolsUseCaseTests.swift | 1 + .../xcschemes/WireFoundation-Package.xcscheme | 38 + WireFoundation/Package.swift | 1 - .../Tests/TestPlans/AllTests.xctestplan | 7 + WireLogging/.gitignore | 8 + .../xcshareddata/IDETemplateMacros.plist | 24 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + WireLogging/Package.swift | 37 + .../WireLogging}/AggregatedLogger.swift | 2 + .../Sources/WireLogging}/Flow.swift | 0 .../Sources/WireLogging}/LogAttributes.swift | 0 .../Sources/WireLogging}/LogConvertible.swift | 0 .../Sources/WireLogging}/LoggerProtocol.swift | 2 + .../Sources/WireLogging}/SystemLogger.swift | 3 +- .../WireLogging}/WireLogger+Instances.swift | 0 .../Sources/WireLogging}/WireLogger.swift | 2 + .../Sourcery/AutoMockable.stencil | 1 + .../WireLoggingSupport/Sourcery/sourcery.yml | 8 + .../WireLoggingPackage.swift | 21 + .../Tests/TestPlans/AllTests.xctestplan | 25 + .../WireLoggingTests/PlaceholderTests.swift | 26 + fastlane/framework.rb | 42 +- .../AuthenticationContext.swift | 1 + .../Authentication/EAR/EARKeyRepository.swift | 1 + .../Authentication/EAR/EARService.swift | 1 + .../E2EIVerificationStatusService.swift | 1 + .../Source/MLS/CommitSender.swift | 1 + .../Source/MLS/CoreCryptoConfiguration.swift | 1 + .../Source/MLS/CoreCryptoKeyProvider.swift | 1 + .../Source/MLS/CoreCryptoProvider.swift | 1 + .../Source/MLS/CreateMLSGroupUseCase.swift | 1 + .../Source/MLS/MLSActionExecutor.swift | 1 + .../Source/MLS/MLSDecryptionService.swift | 1 + .../Source/MLS/MLSEncryptionService.swift | 1 + .../Source/MLS/MLSGroupVerification.swift | 1 + .../Source/MLS/MLSService.swift | 1 + .../ProteusToMLSMigrationCoordinator.swift | 1 + .../MLS/OneOnOne/OneOnOneResolver.swift | 1 + .../Source/MLS/SafeCoreCrypto.swift | 1 + .../MLS/StaleMLSKeyMaterialDetector.swift | 1 + .../CoreDataStack+Backup.swift | 1 + .../ManagedObjectContext/CoreDataStack.swift | 1 + .../106-107/CleanupModels107PreAction.swift | 1 + .../110-111/PrefillPrimaryKeyAction.swift | 1 + .../110-111/RemoveDuplicatePreAction.swift | 1 + .../OneOnOneConversationMigrationAction.swift | 1 + ...DuplicateOneOnOneConversationsAction.swift | 1 + .../ForceSyncResourcesPostAction.swift | 1 + .../Migration/CoreDataMigrator.swift | 1 + ...anagedObjectContext+EncryptionAtRest.swift | 1 + .../NSManagedObjectContext+FetchRequest.swift | 1 + .../NSManagedObjectContext+zmessaging.m | 2 +- .../Source/Model/Account/AccountStore.swift | 1 + .../Conversation/ZMConversation+Message.swift | 1 + .../ZMConversation+Messaging.swift | 1 + .../ZMConversation+SecurityLevel.swift | 1 + .../ZMConversation+Timestamps.swift | 1 + .../ZMConversation+UnreadCount.swift | 1 + .../AppLock/AppLockController.swift | 1 + .../Source/Model/Message/FileAssetCache.swift | 1 + .../Message/GenericMessage+External.swift | 1 + .../Model/Message/ZMAssetClientMessage.swift | 1 + .../Message/ZMClientMessage+Encryption.swift | 1 + .../Model/Message/ZMClientMessage.swift | 1 + .../Model/Message/ZMGenericMessageData.swift | 1 + .../Model/Message/ZMMessage+Insert.swift | 1 + .../Model/Message/ZMOTRMessage+Quotes.swift | 1 + .../Message/ZMOTRMessage+UpdateEvent.swift | 1 + .../User/AnalyticsIdentifierProvider.swift | 1 + .../Model/UserClient/UserClient+Patches.swift | 1 + .../Source/Model/UserClient/UserClient.swift | 1 + .../Proteus/CryptoboxMigrationManager.swift | 1 + .../Source/Proteus/ProteusProvider.swift | 1 + .../Source/Proteus/ProteusService.swift | 1 + .../Repositories/FeatureRepository.swift | 1 + .../RemoveLocalConversationUseCase.swift | 1 + .../Source/Utilis/KeychainManager.swift | 1 + .../Utilis/LastUpdateEventIDRepository.swift | 1 + .../Source/Utilis/ZMUpdateEvent.swift | 2 + .../WireDataModel.xcodeproj/project.pbxproj | 7 + .../contents.xcworkspacedata | 3 + .../xcschemes/WireFoundationAll.xcscheme | 14 + .../xcschemes/WireLoggingAll.xcscheme | 39 +- .../Sources/NotificationSession.swift | 1 + .../Strategies/PushNotificationStrategy.swift | 1 + .../project.pbxproj | 9 + .../Sources/E2EIdentity/E2EIEnrollment.swift | 1 + .../E2EIdentity/E2EIKeyPackageRotator.swift | 1 + .../Sources/E2EIdentity/E2EIRepository.swift | 1 + .../EnrollE2EICertificateUseCase.swift | 1 + .../Helpers/MessageExpirationTimer.swift | 1 + .../Helpers/MessageLogAttributesBuilder.swift | 1 + .../MessageDependencyResolver.swift | 1 + .../MessageInfoExtractor.swift | 1 + .../Message Sending/MessageSender.swift | 1 + .../NotificationStreamSync.swift | 1 + .../Content/ZMLocalNotification.swift | 1 + .../PushNotificationStatus.swift | 1 + .../Sources/Payloads/Payload+Coding.swift | 1 + .../ConnectionPayloadProcessor.swift | 1 + .../ConversationEventPayloadProcessor.swift | 1 + .../Helpers/MLSEventProcessor.swift | 1 + ...MessageSendingStatusPayloadProcessor.swift | 1 + .../AssetClientMessageRequestStrategy.swift | 1 + .../Assets/AssetV3UploadRequestStrategy.swift | 1 + .../LinkPreviewUpdateRequestStrategy.swift | 1 + .../AvailabilityRequestStrategy.swift | 1 + .../ClientMessageRequestStrategy.swift | 1 + .../ConnectionRequestStrategy.swift | 1 + ...CreateGroupConversationActionHandler.swift | 1 + .../ConversationParticipantsService.swift | 1 + .../ConversationRequestStrategy.swift | 1 + .../Conversation/ConversationService.swift | 1 + .../MLSConversationParticipantsService.swift | 1 + .../DeliveryReceiptRequestStrategy.swift | 1 + .../FeatureConfigRequestStrategy.swift | 1 + ...hBackendMLSPublicKeysRequestStrategy.swift | 1 + .../ResetSessionRequestStrategy.swift | 1 + .../User/UserProfileRequestStrategy.swift | 2 + .../Decoding/EventDecoder+MLS.swift | 1 + .../Decoding/EventDecoder+Proteus.swift | 1 + .../Decoding/EventDecoder.swift | 1 + .../Decoding/StoreUpdateEvent.swift | 1 + .../Synchronization/QuickSyncObserver.swift | 1 + .../Tests/Helpers/MessagingTestBase.swift | 2 + .../project.pbxproj | 14 + .../Sources/ZMConversation+Conversation.swift | 1 + .../Sources/ZMMessage+Sendable.swift | 1 + .../WireShareEngine.xcodeproj/project.pbxproj | 9 + .../Source/Calling/CallKitManager.swift | 1 + ...LSConferenceStaleParticipantsRemover.swift | 1 + .../Calling/WireCallCenterV3+Events.swift | 1 + .../Source/Calling/WireCallCenterV3+MLS.swift | 1 + .../Source/Calling/WireCallCenterV3.swift | 1 + .../Data Model/Conversation+Deletion.swift | 1 + .../CertificateRevocationListsChecker.swift | 1 + .../Services/SupportedProtocolsService.swift | 1 + .../APIMigration/APIMigrationManager.swift | 2 +- .../APIMigration/AccessTokenMigration.swift | 2 +- .../SessionManager/APIVersionResolver.swift | 1 + .../SessionManager/AVSLogObserver.swift | 1 + ...kendEnvironmentProvider+Reachability.swift | 1 + .../SessionManager+Backup.swift | 1 + ...essionManager+CallKitManagerDelegate.swift | 1 + .../SessionManager+EncryptionAtRest.swift | 1 + ...ionManager+UserSessionLogoutDelegate.swift | 1 + ...er+UserSessionSelfUserClientDelegate.swift | 1 + ...ssionManager+VoIPPushManagerDelegate.swift | 1 + .../SessionManager/SessionManager.swift | 1 + .../Synchronization/EventProcessor.swift | 1 + .../Strategies/CallingRequestStrategy.swift | 1 + ...valuateOneOnOneConversationsStrategy.swift | 1 + .../LabelDownstreamRequestStrategy.swift | 1 + .../Strategies/LegalHoldRequestStrategy.swift | 1 + ...tationCredentialVerificationStrategy.swift | 1 + ...elfSupportedProtocolsRequestStrategy.swift | 1 + .../Strategies/UserClientEventConsumer.swift | 1 + .../UserClientRequestStrategy.swift | 1 + .../ZMMissingUpdateEventsTranscoder.m | 2 +- .../ZMOperationLoop+PushChannel.swift | 1 + ...entityCertificateUpdateStatusUseCase.swift | 1 + .../GetUserClientFingerprintUseCase.swift | 1 + .../Source/Use cases/ShareFileUseCase.swift | 1 + .../NSManagedObject+CryptoStack.swift | 1 + .../Source/UserSession/OperationStatus.swift | 1 + .../Source/UserSession/SyncStatus.swift | 2 + .../DeepLinkURLActionProcessor.swift | 1 + .../ImportEventsURLActionProcessor.swift | 1 + .../ZMClientRegistrationStatus.swift | 1 + .../ZMUserSession+AccessToken.swift | 1 + .../ZMUserSession+AnalyticsUser.swift | 1 + ...erSession+CertificateRevocationLists.swift | 1 + .../ZMUserSession+EncryptionAtRest.swift | 1 + .../ZMUserSession+LifeCycle.swift | 1 + .../ZMUserSession+OneOnOne.swift | 1 + .../ZMUserSession/ZMUserSession+Push.swift | 1 + .../ZMUserSession+RecurringAction.swift | 1 + .../ZMUserSession/ZMUserSession.swift | 1 + .../WireSyncEngine.xcodeproj/project.pbxproj | 7 + wire-ios-system/Source/ExpiringActivity.swift | 1 + wire-ios-system/Source/TimePoint.swift | 1 + ...eLoggerObjc.swift => WireLoggerObjC.swift} | 3 +- wire-ios-system/Source/ZMSAsserts.h | 4 +- wire-ios-system/Source/ZMSAsserts.swift | 1 + wire-ios-system/Source/ZMSLog.swift | 1 + .../WireSystem.xcodeproj/project.pbxproj | 7 + .../Authentication/ZMAccessTokenHandler.swift | 1 + .../BackgroundActivityFactory.swift | 1 + .../Source/Logging/RequestLog.swift | 3 +- .../Public/ServerCertificateTrust.swift | 1 + .../Source/Public/ZMUpdateEvent.swift | 1 + .../PushChannel/NativePushChannel.swift | 1 + .../PushChannel/StarscreamPushChannel.swift | 1 + .../UnauthenticatedTransportSession.swift | 1 + .../TransportSession/ZMTransportSession.m | 6 +- .../WireTransport.xcodeproj/project.pbxproj | 7 + .../Source/Keychain/Keychain.swift | 1 + .../WireUtilities.xcodeproj/project.pbxproj | 7 + .../LegacyNotificationService.swift | 1 + .../NotificationService.swift | 1 + .../ShareExtensionViewController.swift | 1 + wire-ios/Wire-iOS.xcodeproj/project.pbxproj | 34 + .../TrackingManager+UIAlertController.swift | 1 + .../TrackingManager/TrackingManager.swift | 1 + wire-ios/Wire-iOS/Sources/AppDelegate.swift | 1 + .../Wire-iOS/Sources/AppStateCalculator.swift | 1 + .../Backup/BackupRestoreController.swift | 1 + .../AuthenticationCoordinator.swift | 1 + .../Helpers/PasscodeRules+Shared.swift | 1 + .../Sources/Developer/DebugAlert.swift | 1 + ...ConversationDeveloperActionsProvider.swift | 1 + .../UserClientDeveloperActionsProvider.swift | 1 + .../DeveloperDebugActionsViewModel.swift | 1 + .../DeveloperE2eiViewModel.swift | 1 + .../Sources/Helpers/AuthenticationType.swift | 1 + .../Sources/Helpers/PerformanceDebugger.swift | 1 + .../Sources/Helpers/SaveFileManager.swift | 1 + .../TmpFiles/TemporaryFileService.swift | 1 + .../Conversation+Participants.swift | 1 + .../Sources/LaunchSequenceOperation.swift | 1 + .../UserInterface/BlockerViewController.swift | 1 + .../AVSVideoContainerView.swift | 2 +- .../CollectionsViewController.swift | 1 + .../NetworkStatus/NetworkStatusView.swift | 1 + ...troller+CanvasViewControllerDelegate.swift | 1 + ...rsationContentViewController+Forward.swift | 1 + ...nContentViewController+MessageAction.swift | 1 + .../ConversationViewController.swift | 1 + .../ConversationCreationController.swift | 1 + .../Conversation/InputBar/AudioRecorder.swift | 1 + ...rsationInputBarViewController+Camera.swift | 1 + .../InputBar/EmojiRepository.swift | 1 + ...versationListViewControllerViewModel.swift | 1 + .../DeviceDetailsViewActionsHandler.swift | 1 + .../E2EINotificationActionsHandler.swift | 1 + .../E2EIdentity/OAuthUseCase.swift | 1 + .../GroupDetailsViewController.swift | 1 + .../GroupParticipantsDetailViewModel.swift | 1 + .../ParticipantsSectionController.swift | 1 + ...ClientViewController+StartUIDelegate.swift | 1 + .../ZClientViewController.swift | 1 + .../ProfileHeaderViewController.swift | 1 + .../Debug Report/LogFilesProvider.swift | 1 + .../SettingsDebugReportViewModel.swift | 1 + .../ClientListViewController.swift | 1 + .../MFMailComposeViewController+Logs.swift | 1 + .../OtherUserClientsListViewController.swift | 1 + .../UserProfile/ProfileActionsFactory.swift | 1 + .../UserProfile/ProfileViewController.swift | 1 + .../ProfileViewControllerViewModel.swift | 1 + .../Datadog/WireDatadog+LoggerProtocol.swift | 3 +- .../Analytics/WireAnalytics.swift | 1 + .../FileMetaDataGenerator.swift | 1 + .../LogFileDestination.swift | 1 + .../Logging/CocoaLumberjackLogger.swift | 1 + 278 files changed, 673 insertions(+), 1040 deletions(-) create mode 100644 WireLogging/.gitignore create mode 100644 WireLogging/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist create mode 100644 WireLogging/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 WireLogging/Package.swift rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/AggregatedLogger.swift (99%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/Flow.swift (100%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/LogAttributes.swift (100%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/LogConvertible.swift (100%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/LoggerProtocol.swift (98%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/SystemLogger.swift (99%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/WireLogger+Instances.swift (100%) rename {wire-ios-system/Source/Logging => WireLogging/Sources/WireLogging}/WireLogger.swift (99%) create mode 120000 WireLogging/Sources/WireLoggingSupport/Sourcery/AutoMockable.stencil create mode 100644 WireLogging/Sources/WireLoggingSupport/Sourcery/sourcery.yml create mode 100644 WireLogging/Sources/WireLoggingSupport/WireLoggingPackage.swift create mode 100644 WireLogging/Tests/TestPlans/AllTests.xctestplan create mode 100644 WireLogging/Tests/WireLoggingTests/PlaceholderTests.swift rename WirePlugins/.swiftpm/xcode/xcshareddata/xcschemes/WirePlugins-Package.xcscheme => wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme (64%) rename wire-ios-system/Source/{Logging/WireLoggerObjc.swift => WireLoggerObjC.swift} (95%) diff --git a/.github/workflows/test_pr_changes.yml b/.github/workflows/test_pr_changes.yml index a8d36de6140..b207676b18e 100644 --- a/.github/workflows/test_pr_changes.yml +++ b/.github/workflows/test_pr_changes.yml @@ -51,11 +51,15 @@ jobs: - 'wire-ios-request-strategy/**' WireAPI: - 'WireAPI/**' + - 'wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireAPIAll.xcscheme' WireAnalytics: - - 'WireAnalytics/Sources/WireAnalytics/**' - - 'WireAnalytics/Sources/WireDatadog/**' + - 'WireAnalytics/**' + - 'wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireAnalyticsAll.xcscheme' WireDomain: - 'WireDomain/**' + WireLogging: + - 'WireLogging/**' + - 'wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireLoggingAll.xcscheme' wire-ios-data-model: - 'wire-ios-data-model/**' wire-ios-transport: diff --git a/.gitignore b/.gitignore index 502fca9230f..7ffe2cc43b7 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,9 @@ playground.xcworkspace # .swiftpm .build/ +# Ignore Package.resolved files in packages and projects, only track the one in the workspace. +**/Package.resolved +!wire-ios-mono.xcworkspace/xcshareddata/swiftpm/Package.resolved # CocoaPods # diff --git a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift index 5d5bbc38676..803dec90ec7 100644 --- a/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift +++ b/WireAnalytics/Sources/WireAnalytics/Service/AnalyticsService.swift @@ -44,7 +44,7 @@ public final class AnalyticsService: AnalyticsServiceProtocol { public convenience init( config: Config?, - logger: @escaping (String) -> Void + logger: @escaping (String) -> Void // TODO: [WPB-11881] import WireLogging and remove this workaround ) { self.init( config: config, diff --git a/WireDomain/Project/WireDomain Project.xcodeproj/project.pbxproj b/WireDomain/Project/WireDomain Project.xcodeproj/project.pbxproj index 391f80d59d7..d35b3420805 100644 --- a/WireDomain/Project/WireDomain Project.xcodeproj/project.pbxproj +++ b/WireDomain/Project/WireDomain Project.xcodeproj/project.pbxproj @@ -3,171 +3,25 @@ archiveVersion = 1; classes = { }; - objectVersion = 56; + objectVersion = 70; objects = { /* Begin PBXBuildFile section */ 0163EE812C20D71C00B37260 /* WireDomain.docc in Sources */ = {isa = PBXBuildFile; fileRef = 01D0DCE92C1C8EA10076CB1C /* WireDomain.docc */; }; 017F67942C207AA000B6E02D /* WireDomainSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 017F67822C207A3200B6E02D /* WireDomainSupport.framework */; }; - 017F679C2C20801800B6E02D /* TeamRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017F67982C20801800B6E02D /* TeamRepositoryTests.swift */; }; - 017F67AF2C20803300B6E02D /* AutoMockable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017F67A42C20802300B6E02D /* AutoMockable.generated.swift */; }; 01D0DCB12C1C8C880076CB1C /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; }; 01D0DCC62C1C8CD90076CB1C /* WireTransport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCC52C1C8CD90076CB1C /* WireTransport.framework */; }; - 162356502C2B223100C6666C /* UserRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1623564F2C2B223100C6666C /* UserRepositoryTests.swift */; }; 591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */; }; 591B6E472C8B09BD009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01BDA5442C20762200636E50 /* WireDataModelSupport.framework */; }; - 594AF2062CF7358F00478C64 /* AllTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 594AF2042CF7358F00478C64 /* AllTests.xctestplan */; }; 598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D042C2C89C63100B64D71 /* WireFoundation */; }; 59909A5E2C5BBEA8009C41DE /* WireAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 59909A5D2C5BBEA8009C41DE /* WireAPI */; }; 59909A692C5BC001009C41DE /* WireAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 59909A682C5BC001009C41DE /* WireAPI */; }; 59909A6D2C5BC08B009C41DE /* WireAPISupport in Frameworks */ = {isa = PBXBuildFile; productRef = 59909A6C2C5BC08B009C41DE /* WireAPISupport */; }; - C91F111C2C9C4B2B00BA5BE2 /* ConnectionsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C91F111A2C9C4B2B00BA5BE2 /* ConnectionsRepository.swift */; }; - C91F111D2C9C4B2B00BA5BE2 /* ConnectionsLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C91F111B2C9C4B2B00BA5BE2 /* ConnectionsLocalStore.swift */; }; - C93961922C91B12800EA971A /* TestError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE0E117D2C2C4080004BBD29 /* TestError.swift */; }; - C96B75292CDB7688003A85EB /* ConversationMemberUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75252CDB7688003A85EB /* ConversationMemberUpdateEventProcessorTests.swift */; }; - C96B752A2CDB7688003A85EB /* ConversationMemberJoinEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75232CDB7688003A85EB /* ConversationMemberJoinEventTests.swift */; }; - C96B752B2CDB7688003A85EB /* ConversationProtocolUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75262CDB7688003A85EB /* ConversationProtocolUpdateEventProcessorTests.swift */; }; - C96B752C2CDB7688003A85EB /* ConversationAccessUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75212CDB7688003A85EB /* ConversationAccessUpdateEventProcessorTests.swift */; }; - C96B752D2CDB7688003A85EB /* ConversationCreateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75222CDB7688003A85EB /* ConversationCreateEventProcessorTests.swift */; }; - C96B752E2CDB7688003A85EB /* ConversationReceiptModeUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75272CDB7688003A85EB /* ConversationReceiptModeUpdateEventProcessorTests.swift */; }; - C96B752F2CDB7688003A85EB /* ConversationMemberLeaveEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75242CDB7688003A85EB /* ConversationMemberLeaveEventTests.swift */; }; - C96B75432CDB8E03003A85EB /* NSManagedObjectContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75422CDB8E03003A85EB /* NSManagedObjectContext.swift */; }; - C96B75452CDBA0A9003A85EB /* ConversationDeleteEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75442CDBA0A9003A85EB /* ConversationDeleteEventProcessorTests.swift */; }; - C96B75482CDBA10F003A85EB /* SystemMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75462CDBA10F003A85EB /* SystemMessage.swift */; }; - C96B755D2CDBB176003A85EB /* ConversationLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B755C2CDBB176003A85EB /* ConversationLocalStoreTests.swift */; }; - C96B755F2CDBCD24003A85EB /* UserLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B755E2CDBCD24003A85EB /* UserLocalStoreTests.swift */; }; - C96B75612CDCAFC6003A85EB /* ConnectionsLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75602CDCAFC6003A85EB /* ConnectionsLocalStoreTests.swift */; }; - C96B75632CDCBA10003A85EB /* TeamLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75622CDCBA10003A85EB /* TeamLocalStore.swift */; }; - C96B75652CDCC85B003A85EB /* TeamLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75642CDCC85B003A85EB /* TeamLocalStoreTests.swift */; }; - C96B75672CDCD3BC003A85EB /* UserClientsLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75662CDCD3BC003A85EB /* UserClientsLocalStoreTests.swift */; }; - C96B75692CDCD488003A85EB /* UserClientsLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75682CDCD488003A85EB /* UserClientsLocalStore.swift */; }; - C96B756B2CDCF1C8003A85EB /* FeatureConfigLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B756A2CDCF1C8003A85EB /* FeatureConfigLocalStore.swift */; }; - C96B756D2CDCFA36003A85EB /* FeatureConfigLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B756C2CDCFA36003A85EB /* FeatureConfigLocalStoreTests.swift */; }; - C96B75702CDD0000003A85EB /* MockFeatureConfigLocalStoreProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B756F2CDD0000003A85EB /* MockFeatureConfigLocalStoreProtocol.swift */; }; - C96B75732CDD1333003A85EB /* LocalFeature.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75722CDD1333003A85EB /* LocalFeature.swift */; }; - C96B75752CDD1357003A85EB /* FeatureState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75742CDD1357003A85EB /* FeatureState.swift */; }; - C96B75772CDD154C003A85EB /* UpdateEventsLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75762CDD154C003A85EB /* UpdateEventsLocalStoreTests.swift */; }; - C96B75792CDD159A003A85EB /* UpdateEventsLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75782CDD159A003A85EB /* UpdateEventsLocalStore.swift */; }; - C96B757B2CDDEDC4003A85EB /* ConversationLabelsLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B757A2CDDEDC4003A85EB /* ConversationLabelsLocalStoreTests.swift */; }; - C96B757D2CDDEDF8003A85EB /* ConversationLabelsLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B757C2CDDEDF8003A85EB /* ConversationLabelsLocalStore.swift */; }; - C96B757F2CDDEEAE003A85EB /* ConversationLabelsModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B757E2CDDEEAE003A85EB /* ConversationLabelsModelMappings.swift */; }; - C96B75822CDDEEDC003A85EB /* ConversationLabelInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75812CDDEEDC003A85EB /* ConversationLabelInfo.swift */; }; - C96B75852CDDFBBE003A85EB /* TeamRoleInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75842CDDFBBE003A85EB /* TeamRoleInfo.swift */; }; - C96B75872CDDFBC9003A85EB /* TeamMemberInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75862CDDFBC9003A85EB /* TeamMemberInfo.swift */; }; - C96B75892CDDFBFB003A85EB /* TeamModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75882CDDFBFB003A85EB /* TeamModelMappings.swift */; }; - C96B75912CDE02BC003A85EB /* ConnectionInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75902CDE02BC003A85EB /* ConnectionInfo.swift */; }; - C96B75962CDE0590003A85EB /* UserUpdateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75952CDE0590003A85EB /* UserUpdateInfo.swift */; }; - C96B75982CDE08B3003A85EB /* NewUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B75972CDE08B3003A85EB /* NewUserInfo.swift */; }; - C96B759B2CDE174D003A85EB /* UserClientInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B759A2CDE174D003A85EB /* UserClientInfo.swift */; }; - C96B759D2CDE18B5003A85EB /* UserClientsModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C96B759C2CDE18B5003A85EB /* UserClientsModelMappings.swift */; }; + 59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59EA774E2D00CE0C002CA0B8 /* WireLogging */; }; C97BCCAA2C98704B004F2D0D /* WireDomain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; }; - C97C013D2CAD7D69000683C5 /* UserPropertiesDeleteEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C013C2CAD7D69000683C5 /* UserPropertiesDeleteEventProcessorTests.swift */; }; - C97C01542CB04626000683C5 /* UserDeleteEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01532CB04626000683C5 /* UserDeleteEventProcessorTests.swift */; }; - C97C01592CB40010000683C5 /* FederationConnectionRemovedEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01562CB40010000683C5 /* FederationConnectionRemovedEventProcessorTests.swift */; }; - C97C015A2CB40010000683C5 /* FederationDeleteEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01572CB40010000683C5 /* FederationDeleteEventProcessorTests.swift */; }; - C97C015C2CB40038000683C5 /* UserPropertiesSetEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C015B2CB40038000683C5 /* UserPropertiesSetEventProcessorTests.swift */; }; - C97C01A52CB80F54000683C5 /* UserClientsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01A42CB80F4E000683C5 /* UserClientsRepository.swift */; }; - C97C01A82CB813C9000683C5 /* UserClientsRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01A72CB813C9000683C5 /* UserClientsRepositoryTests.swift */; }; - C97C01AC2CB92D47000683C5 /* UserLegalholdEnableEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01AB2CB92D47000683C5 /* UserLegalholdEnableEventProcessorTests.swift */; }; - C97C01BB2CBE5E65000683C5 /* UserUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01BA2CBE5E65000683C5 /* UserUpdateEventProcessorTests.swift */; }; - C97C01D72CC13E1A000683C5 /* UserLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97C01D62CC13E1A000683C5 /* UserLocalStore.swift */; }; - C9841A1F2CA309310062A834 /* MockFeatureConfigRepositoryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9841A1E2CA309310062A834 /* MockFeatureConfigRepositoryProtocol.swift */; }; - C98433D02CC26A1D009723D4 /* MLSProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433CF2CC26A1D009723D4 /* MLSProvider.swift */; }; - C98433E72CCA868F009723D4 /* MessageRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433E62CCA868F009723D4 /* MessageRepository.swift */; }; - C98433E92CCA86CA009723D4 /* MessageLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433E82CCA86CA009723D4 /* MessageLocalStore.swift */; }; - C98433EF2CCB7EE6009723D4 /* MessageType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433EE2CCB7EE6009723D4 /* MessageType.swift */; }; - C98433F12CCBC251009723D4 /* MessageRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433F02CCBC251009723D4 /* MessageRepositoryTests.swift */; }; - C99322D22C986E3A0065E10F /* TeamRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B22C986E3A0065E10F /* TeamRepository.swift */; }; - C99322D32C986E3A0065E10F /* TeamRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B32C986E3A0065E10F /* TeamRepositoryError.swift */; }; - C99322D42C986E3A0065E10F /* SelfUserProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B52C986E3A0065E10F /* SelfUserProvider.swift */; }; - C99322D52C986E3A0065E10F /* UserModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B62C986E3A0065E10F /* UserModelMappings.swift */; }; - C99322D62C986E3A0065E10F /* UserRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B72C986E3A0065E10F /* UserRepository.swift */; }; - C99322D72C986E3A0065E10F /* UserRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322B82C986E3A0065E10F /* UserRepositoryError.swift */; }; - C99322D82C986E3A0065E10F /* UpdateEventsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322BA2C986E3A0065E10F /* UpdateEventsRepository.swift */; }; - C99322D92C986E3A0065E10F /* UpdateEventsRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322BB2C986E3A0065E10F /* UpdateEventsRepositoryError.swift */; }; - C99322DB2C986E3A0065E10F /* FeatureConfigModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322BF2C986E3A0065E10F /* FeatureConfigModelMappings.swift */; }; - C99322DC2C986E3A0065E10F /* FeatureConfigRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C02C986E3A0065E10F /* FeatureConfigRepository.swift */; }; - C99322DE2C986E3A0065E10F /* ConversationLocalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C32C986E3A0065E10F /* ConversationLocalStore.swift */; }; - C99322DF2C986E3A0065E10F /* ConversationLocalStore+Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C42C986E3A0065E10F /* ConversationLocalStore+Group.swift */; }; - C99322E02C986E3A0065E10F /* ConversationLocalStore+Metadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C52C986E3A0065E10F /* ConversationLocalStore+Metadata.swift */; }; - C99322E12C986E3A0065E10F /* ConversationLocalStore+MLS.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C62C986E3A0065E10F /* ConversationLocalStore+MLS.swift */; }; - C99322E22C986E3A0065E10F /* ConversationLocalStore+Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C72C986E3A0065E10F /* ConversationLocalStore+Status.swift */; }; - C99322E32C986E3A0065E10F /* ConversationModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C82C986E3A0065E10F /* ConversationModelMappings.swift */; }; - C99322E42C986E3A0065E10F /* ConversationRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322C92C986E3A0065E10F /* ConversationRepository.swift */; }; - C99322E52C986E3A0065E10F /* ConversationRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322CA2C986E3A0065E10F /* ConversationRepositoryError.swift */; }; - C99322E72C986E3A0065E10F /* ConnectionsRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322CD2C986E3A0065E10F /* ConnectionsRepositoryError.swift */; }; - C99322E82C986E3A0065E10F /* ConversationLabelsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322CF2C986E3A0065E10F /* ConversationLabelsRepository.swift */; }; - C99322E92C986E3A0065E10F /* ConversationLabelsRepositoryError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C99322D02C986E3A0065E10F /* ConversationLabelsRepositoryError.swift */; }; - C9C102442CE789F500EA273F /* OneOnOneResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C102432CE789F500EA273F /* OneOnOneResolver.swift */; }; - C9C1024A2CE792C300EA273F /* PushSupportedProtocolsUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C102492CE792C300EA273F /* PushSupportedProtocolsUseCase.swift */; }; - C9C1024C2CE7935600EA273F /* UserConnectionEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C1024B2CE7935600EA273F /* UserConnectionEventProcessorTests.swift */; }; - C9C1024E2CE7984300EA273F /* OneOnOneResolverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C1024D2CE7984300EA273F /* OneOnOneResolverTests.swift */; }; - C9C8FDCE2C9DBE0E00702B91 /* FeatureConfigUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDC32C9DBE0E00702B91 /* FeatureConfigUpdateEventProcessorTests.swift */; }; - C9C8FDCF2C9DBE0E00702B91 /* TeamDeleteEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDC52C9DBE0E00702B91 /* TeamDeleteEventProcessorTests.swift */; }; - C9C8FDD02C9DBE0E00702B91 /* TeamMemberLeaveEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDC62C9DBE0E00702B91 /* TeamMemberLeaveEventProcessorTests.swift */; }; - C9C8FDD12C9DBE0E00702B91 /* TeamMemberUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDC72C9DBE0E00702B91 /* TeamMemberUpdateEventProcessorTests.swift */; }; - C9C8FDD22C9DBE0E00702B91 /* UserClientAddEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDC92C9DBE0E00702B91 /* UserClientAddEventProcessorTests.swift */; }; - C9C8FDD32C9DBE0E00702B91 /* UserLegalHoldDisableEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDCA2C9DBE0E00702B91 /* UserLegalHoldDisableEventProcessorTests.swift */; }; - C9C8FDD42C9DBE0E00702B91 /* UserLegalholdRequestEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9C8FDCB2C9DBE0E00702B91 /* UserLegalholdRequestEventProcessorTests.swift */; }; - C9D5793F2CF618C600012A0E /* Conversation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D5793E2CF618C600012A0E /* Conversation.swift */; }; - C9D579422CF61F2300012A0E /* ConversationMessageTimerUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D579412CF61F2300012A0E /* ConversationMessageTimerUpdateEventProcessor.swift */; }; - C9D579442CF61F6D00012A0E /* ConversationMessageTimerUpdateEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D579432CF61F6D00012A0E /* ConversationMessageTimerUpdateEventProcessorTests.swift */; }; - C9D574582CEB9FB400012A0E /* ConversationRenameEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D574572CEB9FB400012A0E /* ConversationRenameEventProcessorTests.swift */; }; - C9D57A8A2CF732A500012A0E /* MessageLocalStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98433F42CCBC290009723D4 /* MessageLocalStoreTests.swift */; }; - C9D57A932CF7556800012A0E /* ConversationRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D57A922CF7556800012A0E /* ConversationRepositoryTests.swift */; }; - C9D57B232CF75B3700012A0E /* FeatureConfigRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9E8A3BF2C761EDD0093DD5C /* FeatureConfigRepositoryTests.swift */; }; + C9D57A8A2CF732A500012A0E /* (null) in Sources */ = {isa = PBXBuildFile; }; C9E0C9BB2C91B76F00CE6607 /* WireTestingPackage in Frameworks */ = {isa = PBXBuildFile; productRef = C9E0C9BA2C91B76F00CE6607 /* WireTestingPackage */; }; - C9E8A3AE2C73878B0093DD5C /* ConnectionsRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9E8A3AD2C73878B0093DD5C /* ConnectionsRepositoryTests.swift */; }; - C9E8A3B72C749F2A0093DD5C /* ConversationLabelsRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9E8A3B62C749F2A0093DD5C /* ConversationLabelsRepositoryTests.swift */; }; - C9F691292C9B164A008CC41F /* UserPushRemoveEventProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F691282C9B164A008CC41F /* UserPushRemoveEventProcessorTests.swift */; }; - C9FDF3EC2CAA988900D78098 /* ConnectionsModelMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FDF3EA2CAA988100D78098 /* ConnectionsModelMappings.swift */; }; CB7979132C738508006FBA58 /* WireTransportSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB7979122C738508006FBA58 /* WireTransportSupport.framework */; }; - CB7979162C738547006FBA58 /* TestSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB7979152C738547006FBA58 /* TestSetup.swift */; }; - EE368CCE2C2DAA87009DBAB0 /* ConversationEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CC72C2DAA87009DBAB0 /* ConversationEventProcessor.swift */; }; - EE368CCF2C2DAA87009DBAB0 /* FeatureConfigEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CC82C2DAA87009DBAB0 /* FeatureConfigEventProcessor.swift */; }; - EE368CD02C2DAA87009DBAB0 /* FederationEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CC92C2DAA87009DBAB0 /* FederationEventProcessor.swift */; }; - EE368CD12C2DAA87009DBAB0 /* TeamEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CCA2C2DAA87009DBAB0 /* TeamEventProcessor.swift */; }; - EE368CD22C2DAA87009DBAB0 /* UpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CCB2C2DAA87009DBAB0 /* UpdateEventProcessor.swift */; }; - EE368CD32C2DAA87009DBAB0 /* UserEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE368CCC2C2DAA87009DBAB0 /* UserEventProcessor.swift */; }; - EE3F97542C2ADC4C00668DF1 /* ProteusMessageDecryptorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3F97532C2ADC4C00668DF1 /* ProteusMessageDecryptorTests.swift */; }; - EE57A6FE2C298F380096F242 /* UpdateEventDecryptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE57A6FD2C298F380096F242 /* UpdateEventDecryptor.swift */; }; - EE57A7002C298F630096F242 /* ProteusMessageDecryptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE57A6FF2C298F630096F242 /* ProteusMessageDecryptor.swift */; }; - EE57A7032C2994420096F242 /* UpdateEventsRepositoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE57A7022C2994420096F242 /* UpdateEventsRepositoryTests.swift */; }; - EE57A7082C2A8B740096F242 /* ProteusMessageDecryptorError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE57A7062C2A86880096F242 /* ProteusMessageDecryptorError.swift */; }; - EE57A70B2C2A8BAA0096F242 /* UpdateEventDecryptorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE57A70A2C2A8BAA0096F242 /* UpdateEventDecryptorTests.swift */; }; - EEAD09F22C46604400CC8658 /* ConversationAccessUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09F12C46604400CC8658 /* ConversationAccessUpdateEventProcessor.swift */; }; - EEAD09F62C46772000CC8658 /* ConversationCreateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09F52C46772000CC8658 /* ConversationCreateEventProcessor.swift */; }; - EEAD09F82C46772C00CC8658 /* ConversationDeleteEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09F72C46772C00CC8658 /* ConversationDeleteEventProcessor.swift */; }; - EEAD09FA2C46773300CC8658 /* ConversationMemberJoinEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09F92C46773300CC8658 /* ConversationMemberJoinEventProcessor.swift */; }; - EEAD09FC2C46773900CC8658 /* ConversationMemberLeaveEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09FB2C46773900CC8658 /* ConversationMemberLeaveEventProcessor.swift */; }; - EEAD09FE2C46774200CC8658 /* ConversationMemberUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD09FD2C46774200CC8658 /* ConversationMemberUpdateEventProcessor.swift */; }; - EEAD0A022C46774F00CC8658 /* ConversationMLSMessageAddEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A012C46774F00CC8658 /* ConversationMLSMessageAddEventProcessor.swift */; }; - EEAD0A042C46775700CC8658 /* ConversationMLSWelcomeEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A032C46775700CC8658 /* ConversationMLSWelcomeEventProcessor.swift */; }; - EEAD0A062C46775D00CC8658 /* ConversationProteusMessageAddEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A052C46775D00CC8658 /* ConversationProteusMessageAddEventProcessor.swift */; }; - EEAD0A082C46776400CC8658 /* ConversationProtocolUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A072C46776400CC8658 /* ConversationProtocolUpdateEventProcessor.swift */; }; - EEAD0A0A2C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A092C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift */; }; - EEAD0A0C2C46777200CC8658 /* ConversationRenameEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A0B2C46777200CC8658 /* ConversationRenameEventProcessor.swift */; }; - EEAD0A0E2C46777800CC8658 /* ConversationTypingEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A0D2C46777800CC8658 /* ConversationTypingEventProcessor.swift */; }; - EEAD0A112C46A33E00CC8658 /* TeamMemberUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A102C46A33E00CC8658 /* TeamMemberUpdateEventProcessor.swift */; }; - EEAD0A132C46A38200CC8658 /* TeamMemberLeaveEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A122C46A38200CC8658 /* TeamMemberLeaveEventProcessor.swift */; }; - EEAD0A152C46A3AB00CC8658 /* TeamDeleteEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A142C46A3AB00CC8658 /* TeamDeleteEventProcessor.swift */; }; - EEAD0A182C46A88D00CC8658 /* UserClientAddEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A172C46A88D00CC8658 /* UserClientAddEventProcessor.swift */; }; - EEAD0A1A2C46A92000CC8658 /* UserClientRemoveEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A192C46A92000CC8658 /* UserClientRemoveEventProcessor.swift */; }; - EEAD0A1C2C46A99D00CC8658 /* UserConnectionEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A1B2C46A99D00CC8658 /* UserConnectionEventProcessor.swift */; }; - EEAD0A202C46AB8700CC8658 /* UserDeleteEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A1F2C46AB8700CC8658 /* UserDeleteEventProcessor.swift */; }; - EEAD0A222C46ABFB00CC8658 /* UserLegalholdDisableEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A212C46ABFA00CC8658 /* UserLegalholdDisableEventProcessor.swift */; }; - EEAD0A242C46ACEA00CC8658 /* UserLegalholdEnableEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A232C46ACEA00CC8658 /* UserLegalholdEnableEventProcessor.swift */; }; - EEAD0A262C46AD4D00CC8658 /* UserLegalholdRequestEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A252C46AD4D00CC8658 /* UserLegalholdRequestEventProcessor.swift */; }; - EEAD0A282C46AE6400CC8658 /* UserPropertiesSetEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A272C46AE6400CC8658 /* UserPropertiesSetEventProcessor.swift */; }; - EEAD0A2A2C46AEB600CC8658 /* UserPropertiesDeleteEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A292C46AEB600CC8658 /* UserPropertiesDeleteEventProcessor.swift */; }; - EEAD0A2C2C46AF9200CC8658 /* UserPushRemoveEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A2B2C46AF9200CC8658 /* UserPushRemoveEventProcessor.swift */; }; - EEAD0A2E2C46B01900CC8658 /* UserUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A2D2C46B01900CC8658 /* UserUpdateEventProcessor.swift */; }; - EEAD0A312C46B98D00CC8658 /* FederationConnectionRemovedEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A302C46B98D00CC8658 /* FederationConnectionRemovedEventProcessor.swift */; }; - EEAD0A332C46B99800CC8658 /* FederationDeleteEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A322C46B99800CC8658 /* FederationDeleteEventProcessor.swift */; }; - EEAD0A362C46BBA600CC8658 /* FeatureConfigUpdateEventProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD0A352C46BBA600CC8658 /* FeatureConfigUpdateEventProcessor.swift */; }; - EEC410262C60D48900E89394 /* SyncManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC410242C60D48900E89394 /* SyncManagerTests.swift */; }; - EECC35A62C2EB6CD00679448 /* SyncManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECC35A52C2EB6CD00679448 /* SyncManager.swift */; }; - EECC35A82C2EB70400679448 /* SyncState.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECC35A72C2EB70400679448 /* SyncState.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -189,165 +43,32 @@ /* Begin PBXFileReference section */ 017F67822C207A3200B6E02D /* WireDomainSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireDomainSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 017F67982C20801800B6E02D /* TeamRepositoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamRepositoryTests.swift; sourceTree = ""; }; - 017F67A42C20802300B6E02D /* AutoMockable.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoMockable.generated.swift; sourceTree = ""; }; - 017F67A62C20802300B6E02D /* AutoMockable.stencil */ = {isa = PBXFileReference; lastKnownFileType = text; path = AutoMockable.stencil; sourceTree = ""; }; - 017F67A72C20802300B6E02D /* config.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = config.yml; sourceTree = ""; }; 01BDA5442C20762200636E50 /* WireDataModelSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModelSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireDomain.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCB02C1C8C880076CB1C /* WireDomainTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireDomainTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCC32C1C8CC20076CB1C /* WireDataModel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireDataModel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCC52C1C8CD90076CB1C /* WireTransport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 01D0DCE92C1C8EA10076CB1C /* WireDomain.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = WireDomain.docc; sourceTree = ""; }; - 1623564F2C2B223100C6666C /* UserRepositoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRepositoryTests.swift; sourceTree = ""; }; - 594AF2042CF7358F00478C64 /* AllTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AllTests.xctestplan; sourceTree = ""; }; - C91F111A2C9C4B2B00BA5BE2 /* ConnectionsRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionsRepository.swift; sourceTree = ""; }; - C91F111B2C9C4B2B00BA5BE2 /* ConnectionsLocalStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionsLocalStore.swift; sourceTree = ""; }; - C96B75212CDB7688003A85EB /* ConversationAccessUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationAccessUpdateEventProcessorTests.swift; sourceTree = ""; }; - C96B75222CDB7688003A85EB /* ConversationCreateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationCreateEventProcessorTests.swift; sourceTree = ""; }; - C96B75232CDB7688003A85EB /* ConversationMemberJoinEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberJoinEventTests.swift; sourceTree = ""; }; - C96B75242CDB7688003A85EB /* ConversationMemberLeaveEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberLeaveEventTests.swift; sourceTree = ""; }; - C96B75252CDB7688003A85EB /* ConversationMemberUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberUpdateEventProcessorTests.swift; sourceTree = ""; }; - C96B75262CDB7688003A85EB /* ConversationProtocolUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationProtocolUpdateEventProcessorTests.swift; sourceTree = ""; }; - C96B75272CDB7688003A85EB /* ConversationReceiptModeUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationReceiptModeUpdateEventProcessorTests.swift; sourceTree = ""; }; - C96B75422CDB8E03003A85EB /* NSManagedObjectContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSManagedObjectContext.swift; sourceTree = ""; }; - C96B75442CDBA0A9003A85EB /* ConversationDeleteEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationDeleteEventProcessorTests.swift; sourceTree = ""; }; - C96B75462CDBA10F003A85EB /* SystemMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemMessage.swift; sourceTree = ""; }; - C96B755C2CDBB176003A85EB /* ConversationLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationLocalStoreTests.swift; sourceTree = ""; }; - C96B755E2CDBCD24003A85EB /* UserLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLocalStoreTests.swift; sourceTree = ""; }; - C96B75602CDCAFC6003A85EB /* ConnectionsLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionsLocalStoreTests.swift; sourceTree = ""; }; - C96B75622CDCBA10003A85EB /* TeamLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamLocalStore.swift; sourceTree = ""; }; - C96B75642CDCC85B003A85EB /* TeamLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamLocalStoreTests.swift; sourceTree = ""; }; - C96B75662CDCD3BC003A85EB /* UserClientsLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientsLocalStoreTests.swift; sourceTree = ""; }; - C96B75682CDCD488003A85EB /* UserClientsLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientsLocalStore.swift; sourceTree = ""; }; - C96B756A2CDCF1C8003A85EB /* FeatureConfigLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigLocalStore.swift; sourceTree = ""; }; - C96B756C2CDCFA36003A85EB /* FeatureConfigLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigLocalStoreTests.swift; sourceTree = ""; }; - C96B756F2CDD0000003A85EB /* MockFeatureConfigLocalStoreProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFeatureConfigLocalStoreProtocol.swift; sourceTree = ""; }; - C96B75722CDD1333003A85EB /* LocalFeature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalFeature.swift; sourceTree = ""; }; - C96B75742CDD1357003A85EB /* FeatureState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureState.swift; sourceTree = ""; }; - C96B75762CDD154C003A85EB /* UpdateEventsLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateEventsLocalStoreTests.swift; sourceTree = ""; }; - C96B75782CDD159A003A85EB /* UpdateEventsLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateEventsLocalStore.swift; sourceTree = ""; }; - C96B757A2CDDEDC4003A85EB /* ConversationLabelsLocalStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationLabelsLocalStoreTests.swift; sourceTree = ""; }; - C96B757C2CDDEDF8003A85EB /* ConversationLabelsLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationLabelsLocalStore.swift; sourceTree = ""; }; - C96B757E2CDDEEAE003A85EB /* ConversationLabelsModelMappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationLabelsModelMappings.swift; sourceTree = ""; }; - C96B75812CDDEEDC003A85EB /* ConversationLabelInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationLabelInfo.swift; sourceTree = ""; }; - C96B75842CDDFBBE003A85EB /* TeamRoleInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamRoleInfo.swift; sourceTree = ""; }; - C96B75862CDDFBC9003A85EB /* TeamMemberInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamMemberInfo.swift; sourceTree = ""; }; - C96B75882CDDFBFB003A85EB /* TeamModelMappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamModelMappings.swift; sourceTree = ""; }; - C96B75902CDE02BC003A85EB /* ConnectionInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionInfo.swift; sourceTree = ""; }; - C96B75952CDE0590003A85EB /* UserUpdateInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserUpdateInfo.swift; sourceTree = ""; }; - C96B75972CDE08B3003A85EB /* NewUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewUserInfo.swift; sourceTree = ""; }; - C96B759A2CDE174D003A85EB /* UserClientInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientInfo.swift; sourceTree = ""; }; - C96B759C2CDE18B5003A85EB /* UserClientsModelMappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientsModelMappings.swift; sourceTree = ""; }; - C97C013C2CAD7D69000683C5 /* UserPropertiesDeleteEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertiesDeleteEventProcessorTests.swift; sourceTree = ""; }; - C97C014A2CB00F92000683C5 /* OneOnOneResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = OneOnOneResolver.swift; path = ../../OneOnOneResolver.swift; sourceTree = ""; }; - C97C01532CB04626000683C5 /* UserDeleteEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDeleteEventProcessorTests.swift; sourceTree = ""; }; - C97C01562CB40010000683C5 /* FederationConnectionRemovedEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationConnectionRemovedEventProcessorTests.swift; sourceTree = ""; }; - C97C01572CB40010000683C5 /* FederationDeleteEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationDeleteEventProcessorTests.swift; sourceTree = ""; }; - C97C015B2CB40038000683C5 /* UserPropertiesSetEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertiesSetEventProcessorTests.swift; sourceTree = ""; }; - C97C01A42CB80F4E000683C5 /* UserClientsRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientsRepository.swift; sourceTree = ""; }; - C97C01A72CB813C9000683C5 /* UserClientsRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientsRepositoryTests.swift; sourceTree = ""; }; - C97C01AB2CB92D47000683C5 /* UserLegalholdEnableEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLegalholdEnableEventProcessorTests.swift; sourceTree = ""; }; - C97C01BA2CBE5E65000683C5 /* UserUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserUpdateEventProcessorTests.swift; sourceTree = ""; }; - C97C01D62CC13E1A000683C5 /* UserLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLocalStore.swift; sourceTree = ""; }; - C9841A1E2CA309310062A834 /* MockFeatureConfigRepositoryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFeatureConfigRepositoryProtocol.swift; sourceTree = ""; }; - C98433CF2CC26A1D009723D4 /* MLSProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MLSProvider.swift; sourceTree = ""; }; - C98433E62CCA868F009723D4 /* MessageRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRepository.swift; sourceTree = ""; }; - C98433E82CCA86CA009723D4 /* MessageLocalStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLocalStore.swift; sourceTree = ""; }; - C98433EE2CCB7EE6009723D4 /* MessageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageType.swift; sourceTree = ""; }; - C98433F02CCBC251009723D4 /* MessageRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRepositoryTests.swift; sourceTree = ""; }; - C99322B22C986E3A0065E10F /* TeamRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamRepository.swift; sourceTree = ""; }; - C99322B32C986E3A0065E10F /* TeamRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamRepositoryError.swift; sourceTree = ""; }; - C99322B52C986E3A0065E10F /* SelfUserProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelfUserProvider.swift; sourceTree = ""; }; - C99322B62C986E3A0065E10F /* UserModelMappings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserModelMappings.swift; sourceTree = ""; }; - C99322B72C986E3A0065E10F /* UserRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRepository.swift; sourceTree = ""; }; - C99322B82C986E3A0065E10F /* UserRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRepositoryError.swift; sourceTree = ""; }; - C99322BA2C986E3A0065E10F /* UpdateEventsRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateEventsRepository.swift; sourceTree = ""; }; - C99322BB2C986E3A0065E10F /* UpdateEventsRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateEventsRepositoryError.swift; sourceTree = ""; }; - C99322BF2C986E3A0065E10F /* FeatureConfigModelMappings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureConfigModelMappings.swift; sourceTree = ""; }; - C99322C02C986E3A0065E10F /* FeatureConfigRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureConfigRepository.swift; sourceTree = ""; }; - C99322C32C986E3A0065E10F /* ConversationLocalStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationLocalStore.swift; sourceTree = ""; }; - C99322C42C986E3A0065E10F /* ConversationLocalStore+Group.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationLocalStore+Group.swift"; sourceTree = ""; }; - C99322C52C986E3A0065E10F /* ConversationLocalStore+Metadata.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationLocalStore+Metadata.swift"; sourceTree = ""; }; - C99322C62C986E3A0065E10F /* ConversationLocalStore+MLS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationLocalStore+MLS.swift"; sourceTree = ""; }; - C99322C72C986E3A0065E10F /* ConversationLocalStore+Status.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConversationLocalStore+Status.swift"; sourceTree = ""; }; - C99322C82C986E3A0065E10F /* ConversationModelMappings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationModelMappings.swift; sourceTree = ""; }; - C99322C92C986E3A0065E10F /* ConversationRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationRepository.swift; sourceTree = ""; }; - C99322CA2C986E3A0065E10F /* ConversationRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationRepositoryError.swift; sourceTree = ""; }; - C99322CD2C986E3A0065E10F /* ConnectionsRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionsRepositoryError.swift; sourceTree = ""; }; - C99322CF2C986E3A0065E10F /* ConversationLabelsRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationLabelsRepository.swift; sourceTree = ""; }; - C99322D02C986E3A0065E10F /* ConversationLabelsRepositoryError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationLabelsRepositoryError.swift; sourceTree = ""; }; - C9C102432CE789F500EA273F /* OneOnOneResolver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneResolver.swift; sourceTree = ""; }; - C9C102492CE792C300EA273F /* PushSupportedProtocolsUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushSupportedProtocolsUseCase.swift; sourceTree = ""; }; - C9C1024B2CE7935600EA273F /* UserConnectionEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserConnectionEventProcessorTests.swift; sourceTree = ""; }; - C9C1024D2CE7984300EA273F /* OneOnOneResolverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneOnOneResolverTests.swift; sourceTree = ""; }; - C9C8FDC32C9DBE0E00702B91 /* FeatureConfigUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureConfigUpdateEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDC52C9DBE0E00702B91 /* TeamDeleteEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamDeleteEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDC62C9DBE0E00702B91 /* TeamMemberLeaveEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamMemberLeaveEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDC72C9DBE0E00702B91 /* TeamMemberUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamMemberUpdateEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDC92C9DBE0E00702B91 /* UserClientAddEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserClientAddEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDCA2C9DBE0E00702B91 /* UserLegalHoldDisableEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserLegalHoldDisableEventProcessorTests.swift; sourceTree = ""; }; - C9C8FDCB2C9DBE0E00702B91 /* UserLegalholdRequestEventProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserLegalholdRequestEventProcessorTests.swift; sourceTree = ""; }; - C9D5793E2CF618C600012A0E /* Conversation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Conversation.swift; sourceTree = ""; }; - C9D579412CF61F2300012A0E /* ConversationMessageTimerUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMessageTimerUpdateEventProcessor.swift; sourceTree = ""; }; - C9D579432CF61F6D00012A0E /* ConversationMessageTimerUpdateEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMessageTimerUpdateEventProcessorTests.swift; sourceTree = ""; }; - C9D574572CEB9FB400012A0E /* ConversationRenameEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationRenameEventProcessorTests.swift; sourceTree = ""; }; - C9D57A922CF7556800012A0E /* ConversationRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationRepositoryTests.swift; sourceTree = ""; }; - C9E8A3AD2C73878B0093DD5C /* ConnectionsRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionsRepositoryTests.swift; sourceTree = ""; }; - C9E8A3B62C749F2A0093DD5C /* ConversationLabelsRepositoryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationLabelsRepositoryTests.swift; sourceTree = ""; }; - C9E8A3BF2C761EDD0093DD5C /* FeatureConfigRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigRepositoryTests.swift; sourceTree = ""; }; - C9F691282C9B164A008CC41F /* UserPushRemoveEventProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPushRemoveEventProcessorTests.swift; sourceTree = ""; }; - C9FDF3EA2CAA988100D78098 /* ConnectionsModelMappings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionsModelMappings.swift; sourceTree = ""; }; CB7979122C738508006FBA58 /* WireTransportSupport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WireTransportSupport.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - CB7979152C738547006FBA58 /* TestSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSetup.swift; sourceTree = ""; }; - EE0E117D2C2C4080004BBD29 /* TestError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestError.swift; sourceTree = ""; }; - EE368CC72C2DAA87009DBAB0 /* ConversationEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConversationEventProcessor.swift; sourceTree = ""; }; - EE368CC82C2DAA87009DBAB0 /* FeatureConfigEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureConfigEventProcessor.swift; sourceTree = ""; }; - EE368CC92C2DAA87009DBAB0 /* FederationEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FederationEventProcessor.swift; sourceTree = ""; }; - EE368CCA2C2DAA87009DBAB0 /* TeamEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TeamEventProcessor.swift; sourceTree = ""; }; - EE368CCB2C2DAA87009DBAB0 /* UpdateEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateEventProcessor.swift; sourceTree = ""; }; - EE368CCC2C2DAA87009DBAB0 /* UserEventProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserEventProcessor.swift; sourceTree = ""; }; - EE3F97532C2ADC4C00668DF1 /* ProteusMessageDecryptorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusMessageDecryptorTests.swift; sourceTree = ""; }; - EE57A6FD2C298F380096F242 /* UpdateEventDecryptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateEventDecryptor.swift; sourceTree = ""; }; - EE57A6FF2C298F630096F242 /* ProteusMessageDecryptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusMessageDecryptor.swift; sourceTree = ""; }; - EE57A7022C2994420096F242 /* UpdateEventsRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateEventsRepositoryTests.swift; sourceTree = ""; }; - EE57A7062C2A86880096F242 /* ProteusMessageDecryptorError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProteusMessageDecryptorError.swift; sourceTree = ""; }; - EE57A70A2C2A8BAA0096F242 /* UpdateEventDecryptorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateEventDecryptorTests.swift; sourceTree = ""; }; - EEAD09F12C46604400CC8658 /* ConversationAccessUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationAccessUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD09F52C46772000CC8658 /* ConversationCreateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationCreateEventProcessor.swift; sourceTree = ""; }; - EEAD09F72C46772C00CC8658 /* ConversationDeleteEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationDeleteEventProcessor.swift; sourceTree = ""; }; - EEAD09F92C46773300CC8658 /* ConversationMemberJoinEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberJoinEventProcessor.swift; sourceTree = ""; }; - EEAD09FB2C46773900CC8658 /* ConversationMemberLeaveEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberLeaveEventProcessor.swift; sourceTree = ""; }; - EEAD09FD2C46774200CC8658 /* ConversationMemberUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMemberUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD0A012C46774F00CC8658 /* ConversationMLSMessageAddEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMLSMessageAddEventProcessor.swift; sourceTree = ""; }; - EEAD0A032C46775700CC8658 /* ConversationMLSWelcomeEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationMLSWelcomeEventProcessor.swift; sourceTree = ""; }; - EEAD0A052C46775D00CC8658 /* ConversationProteusMessageAddEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationProteusMessageAddEventProcessor.swift; sourceTree = ""; }; - EEAD0A072C46776400CC8658 /* ConversationProtocolUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationProtocolUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD0A092C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationReceiptModeUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD0A0B2C46777200CC8658 /* ConversationRenameEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationRenameEventProcessor.swift; sourceTree = ""; }; - EEAD0A0D2C46777800CC8658 /* ConversationTypingEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationTypingEventProcessor.swift; sourceTree = ""; }; - EEAD0A102C46A33E00CC8658 /* TeamMemberUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamMemberUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD0A122C46A38200CC8658 /* TeamMemberLeaveEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamMemberLeaveEventProcessor.swift; sourceTree = ""; }; - EEAD0A142C46A3AB00CC8658 /* TeamDeleteEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamDeleteEventProcessor.swift; sourceTree = ""; }; - EEAD0A172C46A88D00CC8658 /* UserClientAddEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientAddEventProcessor.swift; sourceTree = ""; }; - EEAD0A192C46A92000CC8658 /* UserClientRemoveEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserClientRemoveEventProcessor.swift; sourceTree = ""; }; - EEAD0A1B2C46A99D00CC8658 /* UserConnectionEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserConnectionEventProcessor.swift; sourceTree = ""; }; - EEAD0A1F2C46AB8700CC8658 /* UserDeleteEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDeleteEventProcessor.swift; sourceTree = ""; }; - EEAD0A212C46ABFA00CC8658 /* UserLegalholdDisableEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLegalholdDisableEventProcessor.swift; sourceTree = ""; }; - EEAD0A232C46ACEA00CC8658 /* UserLegalholdEnableEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLegalholdEnableEventProcessor.swift; sourceTree = ""; }; - EEAD0A252C46AD4D00CC8658 /* UserLegalholdRequestEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserLegalholdRequestEventProcessor.swift; sourceTree = ""; }; - EEAD0A272C46AE6400CC8658 /* UserPropertiesSetEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertiesSetEventProcessor.swift; sourceTree = ""; }; - EEAD0A292C46AEB600CC8658 /* UserPropertiesDeleteEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPropertiesDeleteEventProcessor.swift; sourceTree = ""; }; - EEAD0A2B2C46AF9200CC8658 /* UserPushRemoveEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPushRemoveEventProcessor.swift; sourceTree = ""; }; - EEAD0A2D2C46B01900CC8658 /* UserUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserUpdateEventProcessor.swift; sourceTree = ""; }; - EEAD0A302C46B98D00CC8658 /* FederationConnectionRemovedEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationConnectionRemovedEventProcessor.swift; sourceTree = ""; }; - EEAD0A322C46B99800CC8658 /* FederationDeleteEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FederationDeleteEventProcessor.swift; sourceTree = ""; }; - EEAD0A352C46BBA600CC8658 /* FeatureConfigUpdateEventProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureConfigUpdateEventProcessor.swift; sourceTree = ""; }; - EEC410242C60D48900E89394 /* SyncManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncManagerTests.swift; sourceTree = ""; }; - EECC35A52C2EB6CD00679448 /* SyncManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncManager.swift; sourceTree = ""; }; - EECC35A72C2EB70400679448 /* SyncState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncState.swift; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 59EA78D62D00CF22002CA0B8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Sourcery/generated/AutoMockable.generated.swift, + ); + target = 017F67812C207A3200B6E02D /* WireDomainSupport */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 59EA76E82D00CD88002CA0B8 /* TestPlans */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TestPlans; sourceTree = ""; }; + 59EA78992D00CF1C002CA0B8 /* WireDomainTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireDomainTests; sourceTree = ""; }; + 59EA78D42D00CF22002CA0B8 /* WireDomainSupport */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (59EA78D62D00CF22002CA0B8 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = WireDomainSupport; sourceTree = ""; }; + 59EA7A282D00CFB2002CA0B8 /* WireDomain */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireDomain; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ 017F677F2C207A3200B6E02D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -364,6 +85,7 @@ files = ( 598D042D2C89C63100B64D71 /* WireFoundation in Frameworks */, 591B6E452C8B09BA009F8A7B /* WireDataModel.framework in Frameworks */, + 59EA774F2D00CE0C002CA0B8 /* WireLogging in Frameworks */, 59909A5E2C5BBEA8009C41DE /* WireAPI in Frameworks */, 01D0DCC62C1C8CD90076CB1C /* WireTransport.framework in Frameworks */, ); @@ -385,92 +107,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 017F67992C20801800B6E02D /* Repositories */ = { - isa = PBXGroup; - children = ( - C9841A1D2CA309090062A834 /* Mock */, - C9E8A3B62C749F2A0093DD5C /* ConversationLabelsRepositoryTests.swift */, - C9D57A922CF7556800012A0E /* ConversationRepositoryTests.swift */, - C9E8A3AD2C73878B0093DD5C /* ConnectionsRepositoryTests.swift */, - 017F67982C20801800B6E02D /* TeamRepositoryTests.swift */, - EE57A7022C2994420096F242 /* UpdateEventsRepositoryTests.swift */, - C9E8A3BF2C761EDD0093DD5C /* FeatureConfigRepositoryTests.swift */, - 1623564F2C2B223100C6666C /* UserRepositoryTests.swift */, - C98433F02CCBC251009723D4 /* MessageRepositoryTests.swift */, - C97C01A72CB813C9000683C5 /* UserClientsRepositoryTests.swift */, - ); - path = Repositories; - sourceTree = ""; - }; - 017F679A2C20801800B6E02D /* WireDomain */ = { - isa = PBXGroup; - children = ( - C96B755B2CDBB149003A85EB /* LocalStores */, - C9C8FDCD2C9DBE0E00702B91 /* Event Processing */, - EEC410252C60D48900E89394 /* Synchronization */, - EE0E117C2C2C4076004BBD29 /* Helpers */, - EE57A7092C2A8B950096F242 /* Event Decryption */, - 017F67992C20801800B6E02D /* Repositories */, - ); - name = WireDomain; - path = WireDomainTests; - sourceTree = ""; - }; - 017F67A22C20802300B6E02D /* Repositories */ = { - isa = PBXGroup; - children = ( - C98433E52CCA867F009723D4 /* Message */, - C97C01A32CB80F46000683C5 /* UserClients */, - C99322CE2C986E3A0065E10F /* Connections */, - C99322CB2C986E3A0065E10F /* Conversations */, - C99322D12C986E3A0065E10F /* ConversationsLabels */, - C99322C22C986E3A0065E10F /* FeatureConfig */, - C99322B42C986E3A0065E10F /* Team */, - C99322BC2C986E3A0065E10F /* UpdateEvents */, - C99322B92C986E3A0065E10F /* User */, - ); - path = Repositories; - sourceTree = ""; - }; - 017F67A32C20802300B6E02D /* WireDomain */ = { - isa = PBXGroup; - children = ( - C97C01C02CBE9C93000683C5 /* Extensions */, - C9EA76AD2C98548900A7D35C /* UseCases */, - EECC35A42C2EB6C100679448 /* Synchronization */, - EE57A6FC2C298F280096F242 /* Event Decryption */, - EE368CCD2C2DAA87009DBAB0 /* Event Processing */, - 017F67A22C20802300B6E02D /* Repositories */, - ); - path = WireDomain; - sourceTree = ""; - }; - 017F67A52C20802300B6E02D /* generated */ = { - isa = PBXGroup; - children = ( - 017F67A42C20802300B6E02D /* AutoMockable.generated.swift */, - ); - path = generated; - sourceTree = ""; - }; - 017F67A82C20802300B6E02D /* Sourcery */ = { - isa = PBXGroup; - children = ( - 017F67A52C20802300B6E02D /* generated */, - 017F67A62C20802300B6E02D /* AutoMockable.stencil */, - 017F67A72C20802300B6E02D /* config.yml */, - ); - path = Sourcery; - sourceTree = ""; - }; - 017F67A92C20802300B6E02D /* WireDomainSupport */ = { - isa = PBXGroup; - children = ( - 017F67A82C20802300B6E02D /* Sourcery */, - ); - path = WireDomainSupport; - sourceTree = ""; - }; 01D0DC9C2C1C8C870076CB1C = { isa = PBXGroup; children = ( @@ -506,8 +142,8 @@ 01D0DCE82C1C8EA10076CB1C /* Sources */ = { isa = PBXGroup; children = ( - 017F67A32C20802300B6E02D /* WireDomain */, - 017F67A92C20802300B6E02D /* WireDomainSupport */, + 59EA7A282D00CFB2002CA0B8 /* WireDomain */, + 59EA78D42D00CF22002CA0B8 /* WireDomainSupport */, ); name = Sources; path = ../Sources; @@ -516,459 +152,13 @@ 01D0DCED2C1C8EA10076CB1C /* Tests */ = { isa = PBXGroup; children = ( - 594AF2052CF7358F00478C64 /* TestPlans */, - 017F679A2C20801800B6E02D /* WireDomain */, + 59EA76E82D00CD88002CA0B8 /* TestPlans */, + 59EA78992D00CF1C002CA0B8 /* WireDomainTests */, ); name = Tests; path = ../Tests; sourceTree = ""; }; - 594AF2052CF7358F00478C64 /* TestPlans */ = { - isa = PBXGroup; - children = ( - 594AF2042CF7358F00478C64 /* AllTests.xctestplan */, - ); - path = TestPlans; - sourceTree = ""; - }; - C96B75282CDB7688003A85EB /* ConversationEventProcessor */ = { - isa = PBXGroup; - children = ( - C96B75212CDB7688003A85EB /* ConversationAccessUpdateEventProcessorTests.swift */, - C96B75222CDB7688003A85EB /* ConversationCreateEventProcessorTests.swift */, - C96B75442CDBA0A9003A85EB /* ConversationDeleteEventProcessorTests.swift */, - C96B75232CDB7688003A85EB /* ConversationMemberJoinEventTests.swift */, - C96B75242CDB7688003A85EB /* ConversationMemberLeaveEventTests.swift */, - C9D579432CF61F6D00012A0E /* ConversationMessageTimerUpdateEventProcessorTests.swift */, - C96B75252CDB7688003A85EB /* ConversationMemberUpdateEventProcessorTests.swift */, - C96B75262CDB7688003A85EB /* ConversationProtocolUpdateEventProcessorTests.swift */, - C96B75272CDB7688003A85EB /* ConversationReceiptModeUpdateEventProcessorTests.swift */, - C9D574572CEB9FB400012A0E /* ConversationRenameEventProcessorTests.swift */, - ); - path = ConversationEventProcessor; - sourceTree = ""; - }; - C96B75472CDBA10F003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C9D5793E2CF618C600012A0E /* Conversation.swift */, - C96B75462CDBA10F003A85EB /* SystemMessage.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B755B2CDBB149003A85EB /* LocalStores */ = { - isa = PBXGroup; - children = ( - C96B756E2CDCFFEB003A85EB /* Mock */, - C96B755C2CDBB176003A85EB /* ConversationLocalStoreTests.swift */, - C98433F42CCBC290009723D4 /* MessageLocalStoreTests.swift */, - C96B757A2CDDEDC4003A85EB /* ConversationLabelsLocalStoreTests.swift */, - C96B75762CDD154C003A85EB /* UpdateEventsLocalStoreTests.swift */, - C96B755E2CDBCD24003A85EB /* UserLocalStoreTests.swift */, - C96B75602CDCAFC6003A85EB /* ConnectionsLocalStoreTests.swift */, - C96B75642CDCC85B003A85EB /* TeamLocalStoreTests.swift */, - C96B75662CDCD3BC003A85EB /* UserClientsLocalStoreTests.swift */, - C96B756C2CDCFA36003A85EB /* FeatureConfigLocalStoreTests.swift */, - ); - path = LocalStores; - sourceTree = ""; - }; - C96B756E2CDCFFEB003A85EB /* Mock */ = { - isa = PBXGroup; - children = ( - C96B756F2CDD0000003A85EB /* MockFeatureConfigLocalStoreProtocol.swift */, - ); - path = Mock; - sourceTree = ""; - }; - C96B75712CDD1326003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B75722CDD1333003A85EB /* LocalFeature.swift */, - C96B75742CDD1357003A85EB /* FeatureState.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B75802CDDEEC5003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B75812CDDEEDC003A85EB /* ConversationLabelInfo.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B75832CDDFBB6003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B75842CDDFBBE003A85EB /* TeamRoleInfo.swift */, - C96B75862CDDFBC9003A85EB /* TeamMemberInfo.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B758F2CDE02B3003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B75902CDE02BC003A85EB /* ConnectionInfo.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B75942CDE0588003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B75952CDE0590003A85EB /* UserUpdateInfo.swift */, - C96B75972CDE08B3003A85EB /* NewUserInfo.swift */, - ); - path = Models; - sourceTree = ""; - }; - C96B75992CDE1741003A85EB /* Models */ = { - isa = PBXGroup; - children = ( - C96B759A2CDE174D003A85EB /* UserClientInfo.swift */, - ); - path = Models; - sourceTree = ""; - }; - C97C01582CB40010000683C5 /* FederationEventProcessor */ = { - isa = PBXGroup; - children = ( - C97C01562CB40010000683C5 /* FederationConnectionRemovedEventProcessorTests.swift */, - C97C01572CB40010000683C5 /* FederationDeleteEventProcessorTests.swift */, - ); - path = FederationEventProcessor; - sourceTree = ""; - }; - C97C01A32CB80F46000683C5 /* UserClients */ = { - isa = PBXGroup; - children = ( - C96B75992CDE1741003A85EB /* Models */, - C97C01A42CB80F4E000683C5 /* UserClientsRepository.swift */, - C96B759C2CDE18B5003A85EB /* UserClientsModelMappings.swift */, - C96B75682CDCD488003A85EB /* UserClientsLocalStore.swift */, - ); - path = UserClients; - sourceTree = ""; - }; - C97C01C02CBE9C93000683C5 /* Extensions */ = { - isa = PBXGroup; - children = ( - C97C01C12CBE9C9B000683C5 /* CoreData */, - ); - path = Extensions; - sourceTree = ""; - }; - C97C01C12CBE9C9B000683C5 /* CoreData */ = { - isa = PBXGroup; - children = ( - C96B75422CDB8E03003A85EB /* NSManagedObjectContext.swift */, - ); - path = CoreData; - sourceTree = ""; - }; - C9841A1D2CA309090062A834 /* Mock */ = { - isa = PBXGroup; - children = ( - C9841A1E2CA309310062A834 /* MockFeatureConfigRepositoryProtocol.swift */, - ); - path = Mock; - sourceTree = ""; - }; - C98433E52CCA867F009723D4 /* Message */ = { - isa = PBXGroup; - children = ( - C98433ED2CCB7EDF009723D4 /* Models */, - C98433E62CCA868F009723D4 /* MessageRepository.swift */, - C98433E82CCA86CA009723D4 /* MessageLocalStore.swift */, - ); - path = Message; - sourceTree = ""; - }; - C98433ED2CCB7EDF009723D4 /* Models */ = { - isa = PBXGroup; - children = ( - C98433EE2CCB7EE6009723D4 /* MessageType.swift */, - ); - path = Models; - sourceTree = ""; - }; - C99322B42C986E3A0065E10F /* Team */ = { - isa = PBXGroup; - children = ( - C96B75832CDDFBB6003A85EB /* Models */, - C99322B22C986E3A0065E10F /* TeamRepository.swift */, - C96B75622CDCBA10003A85EB /* TeamLocalStore.swift */, - C96B75882CDDFBFB003A85EB /* TeamModelMappings.swift */, - C99322B32C986E3A0065E10F /* TeamRepositoryError.swift */, - ); - path = Team; - sourceTree = ""; - }; - C99322B92C986E3A0065E10F /* User */ = { - isa = PBXGroup; - children = ( - C96B75942CDE0588003A85EB /* Models */, - C99322B52C986E3A0065E10F /* SelfUserProvider.swift */, - C99322B62C986E3A0065E10F /* UserModelMappings.swift */, - C99322B72C986E3A0065E10F /* UserRepository.swift */, - C97C01D62CC13E1A000683C5 /* UserLocalStore.swift */, - C99322B82C986E3A0065E10F /* UserRepositoryError.swift */, - ); - path = User; - sourceTree = ""; - }; - C99322BC2C986E3A0065E10F /* UpdateEvents */ = { - isa = PBXGroup; - children = ( - C99322BA2C986E3A0065E10F /* UpdateEventsRepository.swift */, - C96B75782CDD159A003A85EB /* UpdateEventsLocalStore.swift */, - C99322BB2C986E3A0065E10F /* UpdateEventsRepositoryError.swift */, - ); - path = UpdateEvents; - sourceTree = ""; - }; - C99322C22C986E3A0065E10F /* FeatureConfig */ = { - isa = PBXGroup; - children = ( - C96B75712CDD1326003A85EB /* Models */, - C99322BF2C986E3A0065E10F /* FeatureConfigModelMappings.swift */, - C99322C02C986E3A0065E10F /* FeatureConfigRepository.swift */, - C96B756A2CDCF1C8003A85EB /* FeatureConfigLocalStore.swift */, - ); - path = FeatureConfig; - sourceTree = ""; - }; - C99322CB2C986E3A0065E10F /* Conversations */ = { - isa = PBXGroup; - children = ( - C96B75472CDBA10F003A85EB /* Models */, - C99322C32C986E3A0065E10F /* ConversationLocalStore.swift */, - C99322C42C986E3A0065E10F /* ConversationLocalStore+Group.swift */, - C99322C52C986E3A0065E10F /* ConversationLocalStore+Metadata.swift */, - C99322C62C986E3A0065E10F /* ConversationLocalStore+MLS.swift */, - C99322C72C986E3A0065E10F /* ConversationLocalStore+Status.swift */, - C99322C82C986E3A0065E10F /* ConversationModelMappings.swift */, - C99322C92C986E3A0065E10F /* ConversationRepository.swift */, - C99322CA2C986E3A0065E10F /* ConversationRepositoryError.swift */, - ); - path = Conversations; - sourceTree = ""; - }; - C99322CE2C986E3A0065E10F /* Connections */ = { - isa = PBXGroup; - children = ( - C96B758F2CDE02B3003A85EB /* Models */, - C9FDF3EA2CAA988100D78098 /* ConnectionsModelMappings.swift */, - C91F111B2C9C4B2B00BA5BE2 /* ConnectionsLocalStore.swift */, - C91F111A2C9C4B2B00BA5BE2 /* ConnectionsRepository.swift */, - C99322CD2C986E3A0065E10F /* ConnectionsRepositoryError.swift */, - ); - path = Connections; - sourceTree = ""; - }; - C99322D12C986E3A0065E10F /* ConversationsLabels */ = { - isa = PBXGroup; - children = ( - C96B75802CDDEEC5003A85EB /* Models */, - C99322CF2C986E3A0065E10F /* ConversationLabelsRepository.swift */, - C96B757E2CDDEEAE003A85EB /* ConversationLabelsModelMappings.swift */, - C96B757C2CDDEDF8003A85EB /* ConversationLabelsLocalStore.swift */, - C99322D02C986E3A0065E10F /* ConversationLabelsRepositoryError.swift */, - ); - path = ConversationsLabels; - sourceTree = ""; - }; - C9C8FDC42C9DBE0E00702B91 /* FeatureConfigEventProcessor */ = { - isa = PBXGroup; - children = ( - C9C8FDC32C9DBE0E00702B91 /* FeatureConfigUpdateEventProcessorTests.swift */, - ); - path = FeatureConfigEventProcessor; - sourceTree = ""; - }; - C9C8FDC82C9DBE0E00702B91 /* TeamEventProcessor */ = { - isa = PBXGroup; - children = ( - C9C8FDC52C9DBE0E00702B91 /* TeamDeleteEventProcessorTests.swift */, - C9C8FDC62C9DBE0E00702B91 /* TeamMemberLeaveEventProcessorTests.swift */, - C9C8FDC72C9DBE0E00702B91 /* TeamMemberUpdateEventProcessorTests.swift */, - ); - path = TeamEventProcessor; - sourceTree = ""; - }; - C9C8FDCC2C9DBE0E00702B91 /* UserEventProcessor */ = { - isa = PBXGroup; - children = ( - C97C01BA2CBE5E65000683C5 /* UserUpdateEventProcessorTests.swift */, - C9C1024B2CE7935600EA273F /* UserConnectionEventProcessorTests.swift */, - C97C015B2CB40038000683C5 /* UserPropertiesSetEventProcessorTests.swift */, - C97C013C2CAD7D69000683C5 /* UserPropertiesDeleteEventProcessorTests.swift */, - C9F691282C9B164A008CC41F /* UserPushRemoveEventProcessorTests.swift */, - C9C8FDC92C9DBE0E00702B91 /* UserClientAddEventProcessorTests.swift */, - C9C8FDCA2C9DBE0E00702B91 /* UserLegalHoldDisableEventProcessorTests.swift */, - C9C8FDCB2C9DBE0E00702B91 /* UserLegalholdRequestEventProcessorTests.swift */, - C97C01AB2CB92D47000683C5 /* UserLegalholdEnableEventProcessorTests.swift */, - C97C01532CB04626000683C5 /* UserDeleteEventProcessorTests.swift */, - ); - path = UserEventProcessor; - sourceTree = ""; - }; - C9C8FDCD2C9DBE0E00702B91 /* Event Processing */ = { - isa = PBXGroup; - children = ( - C96B75282CDB7688003A85EB /* ConversationEventProcessor */, - C97C01582CB40010000683C5 /* FederationEventProcessor */, - C9C8FDC42C9DBE0E00702B91 /* FeatureConfigEventProcessor */, - C9C8FDC82C9DBE0E00702B91 /* TeamEventProcessor */, - C9C8FDCC2C9DBE0E00702B91 /* UserEventProcessor */, - ); - path = "Event Processing"; - sourceTree = ""; - }; - C9EA76AD2C98548900A7D35C /* UseCases */ = { - isa = PBXGroup; - children = ( - C9C102492CE792C300EA273F /* PushSupportedProtocolsUseCase.swift */, - ); - path = UseCases; - sourceTree = ""; - }; - EE0E117C2C2C4076004BBD29 /* Helpers */ = { - isa = PBXGroup; - children = ( - EE0E117D2C2C4080004BBD29 /* TestError.swift */, - CB7979152C738547006FBA58 /* TestSetup.swift */, - ); - path = Helpers; - sourceTree = ""; - }; - EE368CCD2C2DAA87009DBAB0 /* Event Processing */ = { - isa = PBXGroup; - children = ( - EE368CCB2C2DAA87009DBAB0 /* UpdateEventProcessor.swift */, - EEAD09F02C46602300CC8658 /* ConversationEventProcessor */, - EEAD0A342C46BB7500CC8658 /* FeatureConfigEventProcessor */, - EEAD0A2F2C46B97700CC8658 /* FederationEventProcessor */, - EEAD0A0F2C46A32A00CC8658 /* TeamEventProcessor */, - EEAD0A162C46A87100CC8658 /* UserEventProcessor */, - ); - path = "Event Processing"; - sourceTree = ""; - }; - EE57A6FC2C298F280096F242 /* Event Decryption */ = { - isa = PBXGroup; - children = ( - EE57A6FD2C298F380096F242 /* UpdateEventDecryptor.swift */, - EE57A6FF2C298F630096F242 /* ProteusMessageDecryptor.swift */, - EE57A7062C2A86880096F242 /* ProteusMessageDecryptorError.swift */, - ); - path = "Event Decryption"; - sourceTree = ""; - }; - EE57A7092C2A8B950096F242 /* Event Decryption */ = { - isa = PBXGroup; - children = ( - EE57A70A2C2A8BAA0096F242 /* UpdateEventDecryptorTests.swift */, - EE3F97532C2ADC4C00668DF1 /* ProteusMessageDecryptorTests.swift */, - ); - path = "Event Decryption"; - sourceTree = ""; - }; - EEAD09F02C46602300CC8658 /* ConversationEventProcessor */ = { - isa = PBXGroup; - children = ( - EE368CC72C2DAA87009DBAB0 /* ConversationEventProcessor.swift */, - EEAD09F12C46604400CC8658 /* ConversationAccessUpdateEventProcessor.swift */, - EEAD09F52C46772000CC8658 /* ConversationCreateEventProcessor.swift */, - EEAD09F72C46772C00CC8658 /* ConversationDeleteEventProcessor.swift */, - EEAD09F92C46773300CC8658 /* ConversationMemberJoinEventProcessor.swift */, - EEAD09FB2C46773900CC8658 /* ConversationMemberLeaveEventProcessor.swift */, - EEAD09FD2C46774200CC8658 /* ConversationMemberUpdateEventProcessor.swift */, - C9D579412CF61F2300012A0E /* ConversationMessageTimerUpdateEventProcessor.swift */, - EEAD0A012C46774F00CC8658 /* ConversationMLSMessageAddEventProcessor.swift */, - EEAD0A032C46775700CC8658 /* ConversationMLSWelcomeEventProcessor.swift */, - EEAD0A052C46775D00CC8658 /* ConversationProteusMessageAddEventProcessor.swift */, - EEAD0A072C46776400CC8658 /* ConversationProtocolUpdateEventProcessor.swift */, - EEAD0A092C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift */, - EEAD0A0B2C46777200CC8658 /* ConversationRenameEventProcessor.swift */, - EEAD0A0D2C46777800CC8658 /* ConversationTypingEventProcessor.swift */, - ); - path = ConversationEventProcessor; - sourceTree = ""; - }; - EEAD0A0F2C46A32A00CC8658 /* TeamEventProcessor */ = { - isa = PBXGroup; - children = ( - EE368CCA2C2DAA87009DBAB0 /* TeamEventProcessor.swift */, - EEAD0A142C46A3AB00CC8658 /* TeamDeleteEventProcessor.swift */, - EEAD0A122C46A38200CC8658 /* TeamMemberLeaveEventProcessor.swift */, - EEAD0A102C46A33E00CC8658 /* TeamMemberUpdateEventProcessor.swift */, - ); - path = TeamEventProcessor; - sourceTree = ""; - }; - EEAD0A162C46A87100CC8658 /* UserEventProcessor */ = { - isa = PBXGroup; - children = ( - C97C014A2CB00F92000683C5 /* OneOnOneResolver.swift */, - EE368CCC2C2DAA87009DBAB0 /* UserEventProcessor.swift */, - EEAD0A172C46A88D00CC8658 /* UserClientAddEventProcessor.swift */, - EEAD0A192C46A92000CC8658 /* UserClientRemoveEventProcessor.swift */, - EEAD0A1B2C46A99D00CC8658 /* UserConnectionEventProcessor.swift */, - EEAD0A1F2C46AB8700CC8658 /* UserDeleteEventProcessor.swift */, - EEAD0A212C46ABFA00CC8658 /* UserLegalholdDisableEventProcessor.swift */, - EEAD0A232C46ACEA00CC8658 /* UserLegalholdEnableEventProcessor.swift */, - EEAD0A252C46AD4D00CC8658 /* UserLegalholdRequestEventProcessor.swift */, - EEAD0A272C46AE6400CC8658 /* UserPropertiesSetEventProcessor.swift */, - EEAD0A292C46AEB600CC8658 /* UserPropertiesDeleteEventProcessor.swift */, - EEAD0A2B2C46AF9200CC8658 /* UserPushRemoveEventProcessor.swift */, - EEAD0A2D2C46B01900CC8658 /* UserUpdateEventProcessor.swift */, - ); - path = UserEventProcessor; - sourceTree = ""; - }; - EEAD0A2F2C46B97700CC8658 /* FederationEventProcessor */ = { - isa = PBXGroup; - children = ( - EE368CC92C2DAA87009DBAB0 /* FederationEventProcessor.swift */, - EEAD0A302C46B98D00CC8658 /* FederationConnectionRemovedEventProcessor.swift */, - EEAD0A322C46B99800CC8658 /* FederationDeleteEventProcessor.swift */, - ); - path = FederationEventProcessor; - sourceTree = ""; - }; - EEAD0A342C46BB7500CC8658 /* FeatureConfigEventProcessor */ = { - isa = PBXGroup; - children = ( - EE368CC82C2DAA87009DBAB0 /* FeatureConfigEventProcessor.swift */, - EEAD0A352C46BBA600CC8658 /* FeatureConfigUpdateEventProcessor.swift */, - ); - path = FeatureConfigEventProcessor; - sourceTree = ""; - }; - EEC410252C60D48900E89394 /* Synchronization */ = { - isa = PBXGroup; - children = ( - C9C1024D2CE7984300EA273F /* OneOnOneResolverTests.swift */, - EEC410242C60D48900E89394 /* SyncManagerTests.swift */, - ); - path = Synchronization; - sourceTree = ""; - }; - EECC35A42C2EB6C100679448 /* Synchronization */ = { - isa = PBXGroup; - children = ( - EECC35A52C2EB6CD00679448 /* SyncManager.swift */, - C9C102432CE789F500EA273F /* OneOnOneResolver.swift */, - EECC35A72C2EB70400679448 /* SyncState.swift */, - C98433CF2CC26A1D009723D4 /* MLSProvider.swift */, - ); - path = Synchronization; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1025,10 +215,14 @@ ); dependencies = ( ); + fileSystemSynchronizedGroups = ( + 59EA7A282D00CFB2002CA0B8 /* WireDomain */, + ); name = WireDomain; packageProductDependencies = ( 59909A5D2C5BBEA8009C41DE /* WireAPI */, 598D042C2C89C63100B64D71 /* WireFoundation */, + 59EA774E2D00CE0C002CA0B8 /* WireLogging */, ); productName = WireDomain; productReference = 01D0DCA62C1C8C870076CB1C /* WireDomain.framework */; @@ -1047,6 +241,10 @@ dependencies = ( 01D0DCB32C1C8C880076CB1C /* PBXTargetDependency */, ); + fileSystemSynchronizedGroups = ( + 59EA76E82D00CD88002CA0B8 /* TestPlans */, + 59EA78992D00CF1C002CA0B8 /* WireDomainTests */, + ); name = WireDomainTests; packageProductDependencies = ( 59909A6C2C5BC08B009C41DE /* WireAPISupport */, @@ -1118,7 +316,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 594AF2062CF7358F00478C64 /* AllTests.xctestplan in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1151,7 +348,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 017F67AF2C20803300B6E02D /* AutoMockable.generated.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1159,104 +355,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C99322D22C986E3A0065E10F /* TeamRepository.swift in Sources */, - C96B75822CDDEEDC003A85EB /* ConversationLabelInfo.swift in Sources */, - EEAD0A042C46775700CC8658 /* ConversationMLSWelcomeEventProcessor.swift in Sources */, - C99322E72C986E3A0065E10F /* ConnectionsRepositoryError.swift in Sources */, - C98433D02CC26A1D009723D4 /* MLSProvider.swift in Sources */, - C96B75692CDCD488003A85EB /* UserClientsLocalStore.swift in Sources */, - EEAD0A362C46BBA600CC8658 /* FeatureConfigUpdateEventProcessor.swift in Sources */, - EE57A7002C298F630096F242 /* ProteusMessageDecryptor.swift in Sources */, - EE368CD02C2DAA87009DBAB0 /* FederationEventProcessor.swift in Sources */, - C9D5793F2CF618C600012A0E /* Conversation.swift in Sources */, - EEAD09FA2C46773300CC8658 /* ConversationMemberJoinEventProcessor.swift in Sources */, - C99322E12C986E3A0065E10F /* ConversationLocalStore+MLS.swift in Sources */, - C96B75632CDCBA10003A85EB /* TeamLocalStore.swift in Sources */, - C99322D52C986E3A0065E10F /* UserModelMappings.swift in Sources */, - C96B75872CDDFBC9003A85EB /* TeamMemberInfo.swift in Sources */, - C91F111D2C9C4B2B00BA5BE2 /* ConnectionsLocalStore.swift in Sources */, - EEAD0A022C46774F00CC8658 /* ConversationMLSMessageAddEventProcessor.swift in Sources */, - EE368CCE2C2DAA87009DBAB0 /* ConversationEventProcessor.swift in Sources */, - EEAD0A2C2C46AF9200CC8658 /* UserPushRemoveEventProcessor.swift in Sources */, 0163EE812C20D71C00B37260 /* WireDomain.docc in Sources */, - EEAD0A2E2C46B01900CC8658 /* UserUpdateEventProcessor.swift in Sources */, - C96B75962CDE0590003A85EB /* UserUpdateInfo.swift in Sources */, - EEAD0A2A2C46AEB600CC8658 /* UserPropertiesDeleteEventProcessor.swift in Sources */, - C9C1024A2CE792C300EA273F /* PushSupportedProtocolsUseCase.swift in Sources */, - C9FDF3EC2CAA988900D78098 /* ConnectionsModelMappings.swift in Sources */, - C99322D42C986E3A0065E10F /* SelfUserProvider.swift in Sources */, - C97C01D72CC13E1A000683C5 /* UserLocalStore.swift in Sources */, - C96B757D2CDDEDF8003A85EB /* ConversationLabelsLocalStore.swift in Sources */, - EEAD0A332C46B99800CC8658 /* FederationDeleteEventProcessor.swift in Sources */, - C99322E42C986E3A0065E10F /* ConversationRepository.swift in Sources */, - C99322E02C986E3A0065E10F /* ConversationLocalStore+Metadata.swift in Sources */, - EEAD0A062C46775D00CC8658 /* ConversationProteusMessageAddEventProcessor.swift in Sources */, - C91F111C2C9C4B2B00BA5BE2 /* ConnectionsRepository.swift in Sources */, - EEAD0A282C46AE6400CC8658 /* UserPropertiesSetEventProcessor.swift in Sources */, - C96B75432CDB8E03003A85EB /* NSManagedObjectContext.swift in Sources */, - C99322E32C986E3A0065E10F /* ConversationModelMappings.swift in Sources */, - EEAD09FC2C46773900CC8658 /* ConversationMemberLeaveEventProcessor.swift in Sources */, - EE57A7082C2A8B740096F242 /* ProteusMessageDecryptorError.swift in Sources */, - EEAD0A1A2C46A92000CC8658 /* UserClientRemoveEventProcessor.swift in Sources */, - C96B75982CDE08B3003A85EB /* NewUserInfo.swift in Sources */, - C96B756B2CDCF1C8003A85EB /* FeatureConfigLocalStore.swift in Sources */, - EEAD0A0A2C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift in Sources */, - C99322D62C986E3A0065E10F /* UserRepository.swift in Sources */, - C96B75732CDD1333003A85EB /* LocalFeature.swift in Sources */, - C98433E92CCA86CA009723D4 /* MessageLocalStore.swift in Sources */, - C9D579422CF61F2300012A0E /* ConversationMessageTimerUpdateEventProcessor.swift in Sources */, - EEAD0A0A2C46776B00CC8658 /* ConversationReceiptModeUpdateEventProcessor.swift in Sources */, - C99322D62C986E3A0065E10F /* UserRepository.swift in Sources */, - C9C102442CE789F500EA273F /* OneOnOneResolver.swift in Sources */, - C98433EF2CCB7EE6009723D4 /* MessageType.swift in Sources */, - EEAD0A182C46A88D00CC8658 /* UserClientAddEventProcessor.swift in Sources */, - C96B759D2CDE18B5003A85EB /* UserClientsModelMappings.swift in Sources */, - C99322DC2C986E3A0065E10F /* FeatureConfigRepository.swift in Sources */, - C99322E22C986E3A0065E10F /* ConversationLocalStore+Status.swift in Sources */, - EEAD0A0E2C46777800CC8658 /* ConversationTypingEventProcessor.swift in Sources */, - C99322D92C986E3A0065E10F /* UpdateEventsRepositoryError.swift in Sources */, - EEAD0A202C46AB8700CC8658 /* UserDeleteEventProcessor.swift in Sources */, - EEAD0A152C46A3AB00CC8658 /* TeamDeleteEventProcessor.swift in Sources */, - EEAD0A312C46B98D00CC8658 /* FederationConnectionRemovedEventProcessor.swift in Sources */, - EEAD09F62C46772000CC8658 /* ConversationCreateEventProcessor.swift in Sources */, - C96B759B2CDE174D003A85EB /* UserClientInfo.swift in Sources */, - EEAD0A1C2C46A99D00CC8658 /* UserConnectionEventProcessor.swift in Sources */, - EEAD09F82C46772C00CC8658 /* ConversationDeleteEventProcessor.swift in Sources */, - EEAD0A112C46A33E00CC8658 /* TeamMemberUpdateEventProcessor.swift in Sources */, - C99322E82C986E3A0065E10F /* ConversationLabelsRepository.swift in Sources */, - C99322E52C986E3A0065E10F /* ConversationRepositoryError.swift in Sources */, - C98433E72CCA868F009723D4 /* MessageRepository.swift in Sources */, - C99322DF2C986E3A0065E10F /* ConversationLocalStore+Group.swift in Sources */, - C99322DE2C986E3A0065E10F /* ConversationLocalStore.swift in Sources */, - EEAD0A242C46ACEA00CC8658 /* UserLegalholdEnableEventProcessor.swift in Sources */, - C96B75892CDDFBFB003A85EB /* TeamModelMappings.swift in Sources */, - C99322D72C986E3A0065E10F /* UserRepositoryError.swift in Sources */, - EEAD0A132C46A38200CC8658 /* TeamMemberLeaveEventProcessor.swift in Sources */, - EEAD0A262C46AD4D00CC8658 /* UserLegalholdRequestEventProcessor.swift in Sources */, - EEAD09FE2C46774200CC8658 /* ConversationMemberUpdateEventProcessor.swift in Sources */, - EEAD09F42C46709800CC8658 /* ConversationCodeUpdateEventProcessor.swift in Sources */, - C96B757F2CDDEEAE003A85EB /* ConversationLabelsModelMappings.swift in Sources */, - EE368CCF2C2DAA87009DBAB0 /* FeatureConfigEventProcessor.swift in Sources */, - EECC35A82C2EB70400679448 /* SyncState.swift in Sources */, - C96B75852CDDFBBE003A85EB /* TeamRoleInfo.swift in Sources */, - C99322D82C986E3A0065E10F /* UpdateEventsRepository.swift in Sources */, - EE368CD12C2DAA87009DBAB0 /* TeamEventProcessor.swift in Sources */, - C99322D32C986E3A0065E10F /* TeamRepositoryError.swift in Sources */, - EEAD0A222C46ABFB00CC8658 /* UserLegalholdDisableEventProcessor.swift in Sources */, - EEAD09F22C46604400CC8658 /* ConversationAccessUpdateEventProcessor.swift in Sources */, - EEAD0A082C46776400CC8658 /* ConversationProtocolUpdateEventProcessor.swift in Sources */, - EE368CD32C2DAA87009DBAB0 /* UserEventProcessor.swift in Sources */, - C96B75482CDBA10F003A85EB /* SystemMessage.swift in Sources */, - EE57A6FE2C298F380096F242 /* UpdateEventDecryptor.swift in Sources */, - C99322E92C986E3A0065E10F /* ConversationLabelsRepositoryError.swift in Sources */, - C96B75752CDD1357003A85EB /* FeatureState.swift in Sources */, - C96B75792CDD159A003A85EB /* UpdateEventsLocalStore.swift in Sources */, - EEAD0A0C2C46777200CC8658 /* ConversationRenameEventProcessor.swift in Sources */, - C99322DB2C986E3A0065E10F /* FeatureConfigModelMappings.swift in Sources */, - C97C01A52CB80F54000683C5 /* UserClientsRepository.swift in Sources */, - C96B75912CDE02BC003A85EB /* ConnectionInfo.swift in Sources */, - EE368CD22C2DAA87009DBAB0 /* UpdateEventProcessor.swift in Sources */, - EECC35A62C2EB6CD00679448 /* SyncManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1264,58 +363,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C9D57B232CF75B3700012A0E /* FeatureConfigRepositoryTests.swift in Sources */, - C9D57A8A2CF732A500012A0E /* MessageLocalStoreTests.swift in Sources */, - C9F691292C9B164A008CC41F /* UserPushRemoveEventProcessorTests.swift in Sources */, - C96B757B2CDDEDC4003A85EB /* ConversationLabelsLocalStoreTests.swift in Sources */, - C96B75292CDB7688003A85EB /* ConversationMemberUpdateEventProcessorTests.swift in Sources */, - C96B752A2CDB7688003A85EB /* ConversationMemberJoinEventTests.swift in Sources */, - C96B752B2CDB7688003A85EB /* ConversationProtocolUpdateEventProcessorTests.swift in Sources */, - C96B752C2CDB7688003A85EB /* ConversationAccessUpdateEventProcessorTests.swift in Sources */, - C9D579442CF61F6D00012A0E /* ConversationMessageTimerUpdateEventProcessorTests.swift in Sources */, - C96B755F2CDBCD24003A85EB /* UserLocalStoreTests.swift in Sources */, - C96B752D2CDB7688003A85EB /* ConversationCreateEventProcessorTests.swift in Sources */, - C96B752E2CDB7688003A85EB /* ConversationReceiptModeUpdateEventProcessorTests.swift in Sources */, - C96B752F2CDB7688003A85EB /* ConversationMemberLeaveEventTests.swift in Sources */, - C93961922C91B12800EA971A /* TestError.swift in Sources */, - EEC410262C60D48900E89394 /* SyncManagerTests.swift in Sources */, - C9C8FDD32C9DBE0E00702B91 /* UserLegalHoldDisableEventProcessorTests.swift in Sources */, - EE57A7032C2994420096F242 /* UpdateEventsRepositoryTests.swift in Sources */, - C98433F12CCBC251009723D4 /* MessageRepositoryTests.swift in Sources */, - C9C8FDD02C9DBE0E00702B91 /* TeamMemberLeaveEventProcessorTests.swift in Sources */, - C97C01A82CB813C9000683C5 /* UserClientsRepositoryTests.swift in Sources */, - C9841A1F2CA309310062A834 /* MockFeatureConfigRepositoryProtocol.swift in Sources */, - C97C015C2CB40038000683C5 /* UserPropertiesSetEventProcessorTests.swift in Sources */, - CB7979162C738547006FBA58 /* TestSetup.swift in Sources */, - 162356502C2B223100C6666C /* UserRepositoryTests.swift in Sources */, - C96B75452CDBA0A9003A85EB /* ConversationDeleteEventProcessorTests.swift in Sources */, - EE3F97542C2ADC4C00668DF1 /* ProteusMessageDecryptorTests.swift in Sources */, - C9D57A932CF7556800012A0E /* ConversationRepositoryTests.swift in Sources */, - EE57A70B2C2A8BAA0096F242 /* UpdateEventDecryptorTests.swift in Sources */, - C9E8A3AE2C73878B0093DD5C /* ConnectionsRepositoryTests.swift in Sources */, - C97C01BB2CBE5E65000683C5 /* UserUpdateEventProcessorTests.swift in Sources */, - C9C1024E2CE7984300EA273F /* OneOnOneResolverTests.swift in Sources */, - C97C013D2CAD7D69000683C5 /* UserPropertiesDeleteEventProcessorTests.swift in Sources */, - C9D574582CEB9FB400012A0E /* ConversationRenameEventProcessorTests.swift in Sources */, - C96B75612CDCAFC6003A85EB /* ConnectionsLocalStoreTests.swift in Sources */, - C9C8FDD22C9DBE0E00702B91 /* UserClientAddEventProcessorTests.swift in Sources */, - C96B756D2CDCFA36003A85EB /* FeatureConfigLocalStoreTests.swift in Sources */, - C9C8FDD12C9DBE0E00702B91 /* TeamMemberUpdateEventProcessorTests.swift in Sources */, - C9C1024C2CE7935600EA273F /* UserConnectionEventProcessorTests.swift in Sources */, - C97C01542CB04626000683C5 /* UserDeleteEventProcessorTests.swift in Sources */, - C96B75672CDCD3BC003A85EB /* UserClientsLocalStoreTests.swift in Sources */, - C9C8FDCE2C9DBE0E00702B91 /* FeatureConfigUpdateEventProcessorTests.swift in Sources */, - C9C8FDCF2C9DBE0E00702B91 /* TeamDeleteEventProcessorTests.swift in Sources */, - C97C01592CB40010000683C5 /* FederationConnectionRemovedEventProcessorTests.swift in Sources */, - C97C01AC2CB92D47000683C5 /* UserLegalholdEnableEventProcessorTests.swift in Sources */, - C96B75652CDCC85B003A85EB /* TeamLocalStoreTests.swift in Sources */, - C96B75702CDD0000003A85EB /* MockFeatureConfigLocalStoreProtocol.swift in Sources */, - C97C015A2CB40010000683C5 /* FederationDeleteEventProcessorTests.swift in Sources */, - C9C8FDD42C9DBE0E00702B91 /* UserLegalholdRequestEventProcessorTests.swift in Sources */, - C96B755D2CDBB176003A85EB /* ConversationLocalStoreTests.swift in Sources */, - C96B75772CDD154C003A85EB /* UpdateEventsLocalStoreTests.swift in Sources */, - 017F679C2C20801800B6E02D /* TeamRepositoryTests.swift in Sources */, - C9E8A3B72C749F2A0093DD5C /* ConversationLabelsRepositoryTests.swift in Sources */, + C9D57A8A2CF732A500012A0E /* (null) in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1714,6 +762,10 @@ isa = XCSwiftPackageProductDependency; productName = WireAPISupport; }; + 59EA774E2D00CE0C002CA0B8 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; C9E0C9BA2C91B76F00CE6607 /* WireTestingPackage */ = { isa = XCSwiftPackageProductDependency; productName = WireTestingPackage; diff --git a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift index 42a3d8a0a6d..9e0c5c58490 100644 --- a/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift +++ b/WireDomain/Sources/WireDomain/Event Decryption/UpdateEventDecryptor.swift @@ -19,6 +19,7 @@ import Foundation import WireAPI import WireDataModel +import WireLogging // sourcery: AutoMockable /// Decrypt the E2EE content within update events. diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift index f5d7998d638..3e1ff6af9ff 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationCreateEventProcessor.swift @@ -17,6 +17,7 @@ // import WireAPI +import WireLogging import WireSystem /// Process conversation create events. diff --git a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift index 7ecdcb3c443..1e2a473d938 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationReceiptModeUpdateEventProcessor.swift @@ -17,6 +17,7 @@ // import WireAPI +import WireLogging import WireSystem /// Process conversation receipt mode update events. diff --git a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift index 26272f0d291..df38a0613ad 100644 --- a/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift +++ b/WireDomain/Sources/WireDomain/Event Processing/UserEventProcessor/UserPropertiesDeleteEventProcessor.swift @@ -17,6 +17,7 @@ // import WireAPI +import WireLogging import WireSystem /// Process user properties delete events. diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationLocalStore.swift index 722202aa2d0..ea1edfbb66d 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationLocalStore.swift @@ -18,6 +18,7 @@ import CoreData import WireDataModel +import WireLogging // sourcery: AutoMockable /// A local store dedicated to conversations. diff --git a/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationRepository.swift b/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationRepository.swift index 49ecbb94cda..bc4a7149125 100644 --- a/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/Conversations/ConversationRepository.swift @@ -19,6 +19,7 @@ import Foundation import WireAPI import WireDataModel +import WireLogging // sourcery: AutoMockable /// Facilitate access to conversations related domain objects. diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift index 80e5ce4eff2..4ea209ff051 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsLocalStore.swift @@ -17,6 +17,7 @@ // import WireDataModel +import WireLogging // sourcery: AutoMockable public protocol ConversationLabelsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift index 76165d49a34..f5045897c2e 100644 --- a/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/ConversationsLabels/ConversationLabelsRepository.swift @@ -18,6 +18,7 @@ import WireAPI import WireDataModel +import WireLogging // sourcery: AutoMockable /// Facilitates access to conversation labels related domain objects. diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift index 2ac8dc4adb5..e01a1aaf605 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigLocalStore.swift @@ -17,6 +17,7 @@ // import WireDataModel +import WireLogging protocol FeatureConfigLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift index a4abbb64d92..ed163b10591 100644 --- a/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/FeatureConfig/FeatureConfigRepository.swift @@ -19,6 +19,7 @@ import Combine import WireAPI import WireDataModel +import WireLogging /// Facilitates access to feature configs related domain objects. protocol FeatureConfigRepositoryProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift index e45dfddad8e..fbb13e0cd9d 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsLocalStore.swift @@ -18,6 +18,7 @@ import WireDataModel import WireFoundation +import WireLogging // sourcery: AutoMockable protocol UpdateEventsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsRepository.swift b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsRepository.swift index 3628a798277..73ec07cf81e 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UpdateEvents/UpdateEventsRepository.swift @@ -20,6 +20,7 @@ import Foundation import WireAPI import WireDataModel import WireFoundation +import WireLogging // sourcery: AutoMockable /// Access update events. diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift index f806f9159ee..3ecf82ca186 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift @@ -17,6 +17,7 @@ // import WireDataModel +import WireLogging // sourcery: AutoMockable /// A local store dedicated to user. diff --git a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift index cb09ecedf1c..2a1427d61f6 100644 --- a/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift +++ b/WireDomain/Sources/WireDomain/Repositories/User/UserRepository.swift @@ -20,6 +20,7 @@ import Foundation import WireAPI import WireDataModel import WireFoundation +import WireLogging // sourcery: AutoMockable /// Facilitate access to users related domain objects. diff --git a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift index 790d72edf1e..8ff2478db73 100644 --- a/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift +++ b/WireDomain/Sources/WireDomain/Repositories/UserClients/UserClientsLocalStore.swift @@ -17,6 +17,7 @@ // import WireDataModel +import WireLogging // sourcery: AutoMockable public protocol UserClientsLocalStoreProtocol { diff --git a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift index 34753fe652c..7d658542e99 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/OneOnOneResolver.swift @@ -19,6 +19,7 @@ import CoreData import WireAPI import WireDataModel +import WireLogging // sourcery: AutoMockable /// Resolves 1:1 conversations diff --git a/WireDomain/Sources/WireDomain/Synchronization/SyncManager.swift b/WireDomain/Sources/WireDomain/Synchronization/SyncManager.swift index c45c226580b..243fee52944 100644 --- a/WireDomain/Sources/WireDomain/Synchronization/SyncManager.swift +++ b/WireDomain/Sources/WireDomain/Synchronization/SyncManager.swift @@ -20,6 +20,7 @@ import CoreData import Foundation import WireAPI import WireDataModel +import WireLogging import WireSystem protocol SyncManagerProtocol { diff --git a/WireDomain/Sources/WireDomain/UseCases/PushSupportedProtocolsUseCase.swift b/WireDomain/Sources/WireDomain/UseCases/PushSupportedProtocolsUseCase.swift index 66edc3c1db9..43e7e83198e 100644 --- a/WireDomain/Sources/WireDomain/UseCases/PushSupportedProtocolsUseCase.swift +++ b/WireDomain/Sources/WireDomain/UseCases/PushSupportedProtocolsUseCase.swift @@ -18,6 +18,7 @@ import WireAPI import WireDataModel +import WireLogging import WireSystem // sourcery: AutoMockable diff --git a/WireDomain/Tests/WireDomainTests/Event Processing/FeatureConfigEventProcessor/FeatureConfigUpdateEventProcessorTests.swift b/WireDomain/Tests/WireDomainTests/Event Processing/FeatureConfigEventProcessor/FeatureConfigUpdateEventProcessorTests.swift index 4bb115e0ed8..b3e7c2e0312 100644 --- a/WireDomain/Tests/WireDomainTests/Event Processing/FeatureConfigEventProcessor/FeatureConfigUpdateEventProcessorTests.swift +++ b/WireDomain/Tests/WireDomainTests/Event Processing/FeatureConfigEventProcessor/FeatureConfigUpdateEventProcessorTests.swift @@ -19,6 +19,7 @@ import WireAPI import WireDomainSupport import XCTest + @testable import WireDomain final class FeatureConfigUpdateEventProcessorTests: XCTestCase { diff --git a/WireDomain/Tests/WireDomainTests/UseCases/PushSupportedProtocolsUseCaseTests.swift b/WireDomain/Tests/WireDomainTests/UseCases/PushSupportedProtocolsUseCaseTests.swift index 9abe62a4ef4..c2a8f18aee8 100644 --- a/WireDomain/Tests/WireDomainTests/UseCases/PushSupportedProtocolsUseCaseTests.swift +++ b/WireDomain/Tests/WireDomainTests/UseCases/PushSupportedProtocolsUseCaseTests.swift @@ -21,6 +21,7 @@ import WireAPISupport import WireDataModel import WireDataModelSupport import XCTest + @testable import WireDomain @testable import WireDomainSupport diff --git a/WireFoundation/.swiftpm/xcode/xcshareddata/xcschemes/WireFoundation-Package.xcscheme b/WireFoundation/.swiftpm/xcode/xcshareddata/xcschemes/WireFoundation-Package.xcscheme index 4ba6a9e2fdf..60780140d29 100644 --- a/WireFoundation/.swiftpm/xcode/xcshareddata/xcschemes/WireFoundation-Package.xcscheme +++ b/WireFoundation/.swiftpm/xcode/xcshareddata/xcschemes/WireFoundation-Package.xcscheme @@ -49,6 +49,34 @@ ReferencedContainer = "container:"> + + + + + + + + + + + + + + + + FILEHEADER + +// Wire +// Copyright (C) ___YEAR___ 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/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/WireLogging/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000000..08de0be8d3c --- /dev/null +++ b/WireLogging/.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/WireLogging/Package.swift b/WireLogging/Package.swift new file mode 100644 index 00000000000..bd3bff7710f --- /dev/null +++ b/WireLogging/Package.swift @@ -0,0 +1,37 @@ +// swift-tools-version: 6.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "WireLogging", + platforms: [.iOS(.v16), .macOS(.v12)], + products: [ + .library(name: "WireLogging", targets: ["WireLogging"]), + .library(name: "WireLoggingSupport", targets: ["WireLoggingSupport"]) + ], + 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"] + ) + ] +) + +for target in package.targets { + target.swiftSettings = (target.swiftSettings ?? []) + [ + .enableUpcomingFeature("InternalImportsByDefault"), + .enableUpcomingFeature("FullTypedThrows"), + .enableUpcomingFeature("ExistentialAny") + ] +} diff --git a/wire-ios-system/Source/Logging/AggregatedLogger.swift b/WireLogging/Sources/WireLogging/AggregatedLogger.swift similarity index 99% rename from wire-ios-system/Source/Logging/AggregatedLogger.swift rename to WireLogging/Sources/WireLogging/AggregatedLogger.swift index 4c4ad53c9c6..937972935ce 100644 --- a/wire-ios-system/Source/Logging/AggregatedLogger.swift +++ b/WireLogging/Sources/WireLogging/AggregatedLogger.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +import Foundation + final class AggregatedLogger: LoggerProtocol { private var loggers: [any LoggerProtocol] diff --git a/wire-ios-system/Source/Logging/Flow.swift b/WireLogging/Sources/WireLogging/Flow.swift similarity index 100% rename from wire-ios-system/Source/Logging/Flow.swift rename to WireLogging/Sources/WireLogging/Flow.swift diff --git a/wire-ios-system/Source/Logging/LogAttributes.swift b/WireLogging/Sources/WireLogging/LogAttributes.swift similarity index 100% rename from wire-ios-system/Source/Logging/LogAttributes.swift rename to WireLogging/Sources/WireLogging/LogAttributes.swift diff --git a/wire-ios-system/Source/Logging/LogConvertible.swift b/WireLogging/Sources/WireLogging/LogConvertible.swift similarity index 100% rename from wire-ios-system/Source/Logging/LogConvertible.swift rename to WireLogging/Sources/WireLogging/LogConvertible.swift diff --git a/wire-ios-system/Source/Logging/LoggerProtocol.swift b/WireLogging/Sources/WireLogging/LoggerProtocol.swift similarity index 98% rename from wire-ios-system/Source/Logging/LoggerProtocol.swift rename to WireLogging/Sources/WireLogging/LoggerProtocol.swift index 612e5476f40..2fa10c70ee5 100644 --- a/wire-ios-system/Source/Logging/LoggerProtocol.swift +++ b/WireLogging/Sources/WireLogging/LoggerProtocol.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +public import Foundation + public protocol LoggerProtocol { func debug(_ message: any LogConvertible, attributes: LogAttributes...) diff --git a/wire-ios-system/Source/Logging/SystemLogger.swift b/WireLogging/Sources/WireLogging/SystemLogger.swift similarity index 99% rename from wire-ios-system/Source/Logging/SystemLogger.swift rename to WireLogging/Sources/WireLogging/SystemLogger.swift index 824a1f90b62..c52cb855f4a 100644 --- a/wire-ios-system/Source/Logging/SystemLogger.swift +++ b/WireLogging/Sources/WireLogging/SystemLogger.swift @@ -16,7 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import Foundation +public import Foundation + import OSLog public protocol FileLoggerDestination { diff --git a/wire-ios-system/Source/Logging/WireLogger+Instances.swift b/WireLogging/Sources/WireLogging/WireLogger+Instances.swift similarity index 100% rename from wire-ios-system/Source/Logging/WireLogger+Instances.swift rename to WireLogging/Sources/WireLogging/WireLogger+Instances.swift diff --git a/wire-ios-system/Source/Logging/WireLogger.swift b/WireLogging/Sources/WireLogging/WireLogger.swift similarity index 99% rename from wire-ios-system/Source/Logging/WireLogger.swift rename to WireLogging/Sources/WireLogging/WireLogger.swift index a5d937ae7fb..5d24c8b1e77 100644 --- a/wire-ios-system/Source/Logging/WireLogger.swift +++ b/WireLogging/Sources/WireLogging/WireLogger.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +public import Foundation + public struct WireLogger: LoggerProtocol, Sendable { public static func initialize(loggers: [any LoggerProtocol]) { 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..44e51b04c37 --- /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: ["WireLogging"] diff --git a/WireLogging/Sources/WireLoggingSupport/WireLoggingPackage.swift b/WireLogging/Sources/WireLoggingSupport/WireLoggingPackage.swift new file mode 100644 index 00000000000..1861c8dd67b --- /dev/null +++ b/WireLogging/Sources/WireLoggingSupport/WireLoggingPackage.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/. +// + +// 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 new file mode 100644 index 00000000000..f366f3d093a --- /dev/null +++ b/WireLogging/Tests/TestPlans/AllTests.xctestplan @@ -0,0 +1,25 @@ +{ + "configurations" : [ + { + "id" : "05E04B85-C1D7-4249-9719-C90D5164A909", + "name" : "Test Scheme Action", + "options" : { + + } + } + ], + "defaultOptions" : { + "codeCoverage" : false, + "language" : "en" + }, + "testTargets" : [ + { + "target" : { + "containerPath" : "container:WireLogging", + "identifier" : "WireLoggingTests", + "name" : "WireLoggingTests" + } + } + ], + "version" : 1 +} diff --git a/WireLogging/Tests/WireLoggingTests/PlaceholderTests.swift b/WireLogging/Tests/WireLoggingTests/PlaceholderTests.swift new file mode 100644 index 00000000000..26085f2d9aa --- /dev/null +++ b/WireLogging/Tests/WireLoggingTests/PlaceholderTests.swift @@ -0,0 +1,26 @@ +// +// 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 XCTest + +@testable import WireLogging + +final class PlaceholderTests: XCTestCase { + + func testNothing() {} +} diff --git a/fastlane/framework.rb b/fastlane/framework.rb index 4511089e6e0..ebbb275e709 100644 --- a/fastlane/framework.rb +++ b/fastlane/framework.rb @@ -3,6 +3,12 @@ class Framework def self.all all_folders = [ + "WireAPI", + "WireAnalytics", + "WireDomain", + "WireFoundation", + "WireLogging", + "WireUI", "wire-ios", "wire-ios-canvas", "wire-ios-cryptobox", @@ -20,11 +26,6 @@ def self.all "wire-ios-transport", "wire-ios-utilities", "wire-ios-ziphy", - "WireAPI", - "WireAnalytics", - "WireDomain", - "WireUI", - "WireFoundation", ] frameworks = all_folders.reduce({}) do |hash, framework| @@ -36,43 +37,58 @@ def self.all frameworks["wire-ios"].add_dependency(frameworks["wire-ios-share-engine"]) frameworks["wire-ios"].add_dependency(frameworks["wire-ios-sync-engine"]) frameworks["wire-ios"].add_dependency(frameworks["WireFoundation"]) - - + 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["WireLogging"]) + frameworks["wire-ios-sync-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireAPI"]) - frameworks["wire-ios-sync-engine"].add_dependency(frameworks["WireDomain"]) 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["WireLogging"]) + frameworks["wire-ios-share-engine"].add_dependency(frameworks["wire-ios-request-strategy"]) + 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["WireAPI"]) - + 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"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-link-preview"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-protos"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["wire-ios-transport"]) frameworks["wire-ios-data-model"].add_dependency(frameworks["WireFoundation"]) - + 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"]) frameworks["wire-ios-mocktransport"].add_dependency(frameworks["wire-ios-protos"]) frameworks["wire-ios-cryptobox"].add_dependency(frameworks["wire-ios-utilities"]) + frameworks["wire-ios-transport"].add_dependency(frameworks["wire-ios-utilities"]) + frameworks["wire-ios-transport"].add_dependency(frameworks["WireLogging"]) + frameworks["wire-ios-link-preview"].add_dependency(frameworks["wire-ios-utilities"]) + frameworks["wire-ios-images"].add_dependency(frameworks["wire-ios-utilities"]) 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-testing"].add_dependency(frameworks["wire-ios-system"]) - + + frameworks["wire-ios-system"].add_dependency(frameworks["WireLogging"]) + frameworks["WireDomain"].add_dependency(frameworks["wire-ios-transport"]) frameworks["WireDomain"].add_dependency(frameworks["wire-ios-data-model"]) frameworks["WireDomain"].add_dependency(frameworks["WireAPI"]) frameworks["WireDomain"].add_dependency(frameworks["WireFoundation"]) + frameworks["WireDomain"].add_dependency(frameworks["WireLogging"]) frameworks["WireAPI"].add_dependency(frameworks["WireFoundation"]) @@ -116,6 +132,8 @@ def to_scheme(name) name when "WireAnalytics" "WireAnalyticsAll" # if a package has multiple targets, fastlane does not found -Package + when "WireLogging" + "WireLoggingAll" 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 567c555ce88..4a2d02c031c 100644 --- a/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift +++ b/wire-ios-data-model/Source/Authentication/AuthenticationContext.swift @@ -18,6 +18,7 @@ import Foundation import LocalAuthentication +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 2ca50cc5480..b2615f00ed0 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARKeyRepository.swift @@ -19,6 +19,7 @@ import Foundation import LocalAuthentication import Security +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 a2c474c0036..f0a71ccae1e 100644 --- a/wire-ios-data-model/Source/Authentication/EAR/EARService.swift +++ b/wire-ios-data-model/Source/Authentication/EAR/EARService.swift @@ -19,6 +19,7 @@ import CoreData import Foundation import LocalAuthentication +import WireLogging /// An object that provides encryption at rest. /// diff --git a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift index 599e76af587..58fbfacd13d 100644 --- a/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift +++ b/wire-ios-data-model/Source/E2EIdentity/E2EIVerificationStatusService.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +import WireLogging // sourcery: AutoMockable public protocol E2EIVerificationStatusServiceInterface { diff --git a/wire-ios-data-model/Source/MLS/CommitSender.swift b/wire-ios-data-model/Source/MLS/CommitSender.swift index 58ba79c64f5..e6187ee4b44 100644 --- a/wire-ios-data-model/Source/MLS/CommitSender.swift +++ b/wire-ios-data-model/Source/MLS/CommitSender.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireCoreCrypto +import WireLogging // sourcery: AutoMockable public protocol CommitSending { diff --git a/wire-ios-data-model/Source/MLS/CoreCryptoConfiguration.swift b/wire-ios-data-model/Source/MLS/CoreCryptoConfiguration.swift index 59f89e869a0..36b5ade78e3 100644 --- a/wire-ios-data-model/Source/MLS/CoreCryptoConfiguration.swift +++ b/wire-ios-data-model/Source/MLS/CoreCryptoConfiguration.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +import WireLogging import WireSystem public struct CoreCryptoConfiguration { diff --git a/wire-ios-data-model/Source/MLS/CoreCryptoKeyProvider.swift b/wire-ios-data-model/Source/MLS/CoreCryptoKeyProvider.swift index a2eba6d258a..a523429324d 100644 --- a/wire-ios-data-model/Source/MLS/CoreCryptoKeyProvider.swift +++ b/wire-ios-data-model/Source/MLS/CoreCryptoKeyProvider.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireSystem public class CoreCryptoKeyProvider { diff --git a/wire-ios-data-model/Source/MLS/CoreCryptoProvider.swift b/wire-ios-data-model/Source/MLS/CoreCryptoProvider.swift index f76fac4f388..5dbcc08c116 100644 --- a/wire-ios-data-model/Source/MLS/CoreCryptoProvider.swift +++ b/wire-ios-data-model/Source/MLS/CoreCryptoProvider.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +import WireLogging // sourcery: AutoMockable public protocol CoreCryptoProviderProtocol { diff --git a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift index 82f4b67dd36..9bc9722d901 100644 --- a/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift +++ b/wire-ios-data-model/Source/MLS/CreateMLSGroupUseCase.swift @@ -17,6 +17,7 @@ // import WireCoreCrypto +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 295a8f0230c..383dc8b7d01 100644 --- a/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift +++ b/wire-ios-data-model/Source/MLS/MLSActionExecutor.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireCoreCrypto +import WireLogging public protocol MLSActionExecutorProtocol { diff --git a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift index da652d67826..796c82474e3 100644 --- a/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSDecryptionService.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireCoreCrypto +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 3fd05fcd93b..9c9ff10cf9a 100644 --- a/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift +++ b/wire-ios-data-model/Source/MLS/MLSEncryptionService.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +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 1db0adbf067..c1bee7c548e 100644 --- a/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift +++ b/wire-ios-data-model/Source/MLS/MLSGroupVerification.swift @@ -17,6 +17,7 @@ // import Foundation +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 819a7bbf4b1..c1a2178c418 100644 --- a/wire-ios-data-model/Source/MLS/MLSService.swift +++ b/wire-ios-data-model/Source/MLS/MLSService.swift @@ -20,6 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireFoundation +import WireLogging // sourcery: AutoMockable public protocol MLSServiceInterface: MLSEncryptionServiceInterface, MLSDecryptionServiceInterface { diff --git a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift index 45f4bff7fc5..5a4eac91b8d 100644 --- a/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift +++ b/wire-ios-data-model/Source/MLS/Migration/ProteusToMLSMigrationCoordinator.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireTransport import WireUtilities diff --git a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneResolver.swift b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneResolver.swift index 346ab3b8970..6f8311dbe92 100644 --- a/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneResolver.swift +++ b/wire-ios-data-model/Source/MLS/OneOnOne/OneOnOneResolver.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging // sourcery: AutoMockable public protocol OneOnOneResolverInterface { diff --git a/wire-ios-data-model/Source/MLS/SafeCoreCrypto.swift b/wire-ios-data-model/Source/MLS/SafeCoreCrypto.swift index b4bc54c642a..3a3db0fcac8 100644 --- a/wire-ios-data-model/Source/MLS/SafeCoreCrypto.swift +++ b/wire-ios-data-model/Source/MLS/SafeCoreCrypto.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +import WireLogging // MARK: - Protocols diff --git a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift index 959493b86ae..82e88b1f5dd 100644 --- a/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift +++ b/wire-ios-data-model/Source/MLS/StaleMLSKeyMaterialDetector.swift @@ -17,6 +17,7 @@ // import Foundation +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 d5e6176586f..1847139daf0 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack+Backup.swift @@ -17,6 +17,7 @@ // import Foundation +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 e0f86242298..27c5e30c8b5 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/CoreDataStack.swift @@ -18,6 +18,7 @@ import CoreData import Foundation +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 371a413be6c..14aa5f03be5 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,6 +17,7 @@ // import Foundation +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 7919e6fae02..4e8256ed6cd 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,6 +17,7 @@ // import Foundation +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 956689eb88c..b4a7ecf1841 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,6 +17,7 @@ // import Foundation +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 4c2adddde08..c2b1c00c393 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,6 +17,7 @@ // import Foundation +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 ba95c5693d7..4b8d55f97d8 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,6 +17,7 @@ // import Foundation +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 8eee9a2b372..18c499d3375 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,6 +17,7 @@ // import Foundation +import WireLogging final class ForceSyncResourcesPostAction: CoreDataMigrationAction { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift index 0885339c2c7..ef8aa6c9bdc 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/Migration/CoreDataMigrator.swift @@ -17,6 +17,7 @@ // import CoreData +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 71f09089d93..ca42706fe37 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+EncryptionAtRest.swift @@ -18,6 +18,7 @@ import Foundation import WireCryptobox +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 0f70fc96f36..f118adba041 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+FetchRequest.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging public extension NSManagedObjectContext { diff --git a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m index 4c10ef38095..e230c4dd8d7 100644 --- a/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m +++ b/wire-ios-data-model/Source/ManagedObjectContext/NSManagedObjectContext+zmessaging.m @@ -274,7 +274,7 @@ - (BOOL)saveOrRollbackIgnoringChanges:(BOOL)shouldIgnoreChanges; NSString *tpLabel = [NSString stringWithFormat:@"Saving context %@", self.zm_isSyncContext ? @"sync": @"ui"]; ZMSTimePoint *tp = [[ZMSTimePoint alloc] initWithInterval:10 label:tpLabel]; if (! [self save:&error]) { - [WireLoggerObjc logSaveCoreDataError:error]; + [WireLoggerObjC logSaveCoreDataError:error]; [self reportSaveErrorWithError:error]; [self rollbackWithOldMetadata:oldMetadata]; [tp warnIfLongerThanInterval]; diff --git a/wire-ios-data-model/Source/Model/Account/AccountStore.swift b/wire-ios-data-model/Source/Model/Account/AccountStore.swift index e1f0cb198b1..a8c5ed3f328 100644 --- a/wire-ios-data-model/Source/Model/Account/AccountStore.swift +++ b/wire-ios-data-model/Source/Model/Account/AccountStore.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireSystem private let log = WireLogger(tag: "Accounts") 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 f09270c1b5e..3181c1e5e4e 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Message.swift @@ -17,6 +17,7 @@ // import Foundation +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 e0e83722fe7..a7a306646fc 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Messaging.swift @@ -17,6 +17,7 @@ // import Foundation +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 b95d6e12221..2307c7be31b 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+SecurityLevel.swift @@ -18,6 +18,7 @@ import Foundation import WireCryptobox +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 4570eb32d8a..6fd16531c5c 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+Timestamps.swift @@ -17,6 +17,7 @@ // import Foundation +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 3ce463b0507..59534c5c06b 100644 --- a/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift +++ b/wire-ios-data-model/Source/Model/Conversation/ZMConversation+UnreadCount.swift @@ -17,6 +17,7 @@ // import Foundation +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 8875221c719..10a9809f40a 100644 --- a/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift +++ b/wire-ios-data-model/Source/Model/FeatureConfig/AppLock/AppLockController.swift @@ -18,6 +18,7 @@ import Foundation import LocalAuthentication +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 d60c7eb9fb3..4e50dd88303 100644 --- a/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift +++ b/wire-ios-data-model/Source/Model/Message/FileAssetCache.swift @@ -17,6 +17,7 @@ // import Foundation +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 4da8ab31d57..11a489c8c54 100644 --- a/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift +++ b/wire-ios-data-model/Source/Model/Message/GenericMessage+External.swift @@ -17,6 +17,7 @@ // import Foundation +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 cecfb37b9f2..cc65a7fd15f 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMAssetClientMessage.swift @@ -17,6 +17,7 @@ // import Foundation +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 2f791dd22be..fc109ca524e 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage+Encryption.swift @@ -18,6 +18,7 @@ import Foundation import WireCryptobox +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 c9ffe8ad063..789ba58bb17 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMClientMessage.swift @@ -17,6 +17,7 @@ // import Foundation +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 cb3d57aa853..e6133f597c5 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMGenericMessageData.swift @@ -18,6 +18,7 @@ import Foundation import WireCryptobox +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 82d83102773..d585af98a19 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMMessage+Insert.swift @@ -17,6 +17,7 @@ // import Foundation +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 429fa45e252..5358bdad755 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+Quotes.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging 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 67d510be091..0e4c77d2f53 100644 --- a/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift +++ b/wire-ios-data-model/Source/Model/Message/ZMOTRMessage+UpdateEvent.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging extension ZMOTRMessage { diff --git a/wire-ios-data-model/Source/Model/User/AnalyticsIdentifierProvider.swift b/wire-ios-data-model/Source/Model/User/AnalyticsIdentifierProvider.swift index 1f3fe40803b..b6f4bdf5d8e 100644 --- a/wire-ios-data-model/Source/Model/User/AnalyticsIdentifierProvider.swift +++ b/wire-ios-data-model/Source/Model/User/AnalyticsIdentifierProvider.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging public struct AnalyticsIdentifierProvider { diff --git a/wire-ios-data-model/Source/Model/UserClient/UserClient+Patches.swift b/wire-ios-data-model/Source/Model/UserClient/UserClient+Patches.swift index 38f7b34e134..f6f2efdb27f 100644 --- a/wire-ios-data-model/Source/Model/UserClient/UserClient+Patches.swift +++ b/wire-ios-data-model/Source/Model/UserClient/UserClient+Patches.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireSystem extension UserClient { diff --git a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift index 3a953dbf836..ae75674e7fc 100644 --- a/wire-ios-data-model/Source/Model/UserClient/UserClient.swift +++ b/wire-ios-data-model/Source/Model/UserClient/UserClient.swift @@ -19,6 +19,7 @@ import CoreLocation import Foundation import WireCryptobox +import WireLogging import WireUtilities public let ZMUserClientNumberOfKeysRemainingKey = "numberOfKeysRemaining" diff --git a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift index 05dabae7eaa..c4e560a8b44 100644 --- a/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift +++ b/wire-ios-data-model/Source/Proteus/CryptoboxMigrationManager.swift @@ -17,6 +17,7 @@ // import Foundation +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 447ac4e16f3..327c98b8366 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusProvider.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusProvider.swift @@ -17,6 +17,7 @@ // import Foundation +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 797a60f7549..2c502de3cc5 100644 --- a/wire-ios-data-model/Source/Proteus/ProteusService.swift +++ b/wire-ios-data-model/Source/Proteus/ProteusService.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +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/FeatureRepository.swift b/wire-ios-data-model/Source/Repositories/FeatureRepository.swift index 23813a6a620..32264e66e01 100644 --- a/wire-ios-data-model/Source/Repositories/FeatureRepository.swift +++ b/wire-ios-data-model/Source/Repositories/FeatureRepository.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging // sourcery: AutoMockable public protocol FeatureRepositoryInterface { diff --git a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift index 73ee285923a..55ffddaae44 100644 --- a/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift +++ b/wire-ios-data-model/Source/UseCases/RemoveLocalConversationUseCase.swift @@ -17,6 +17,7 @@ // import Foundation +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 973237e81fa..f702f84fa2b 100644 --- a/wire-ios-data-model/Source/Utilis/KeychainManager.swift +++ b/wire-ios-data-model/Source/Utilis/KeychainManager.swift @@ -17,6 +17,7 @@ // import Foundation +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 e97b0896ad9..64a1429c95b 100644 --- a/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift +++ b/wire-ios-data-model/Source/Utilis/LastUpdateEventIDRepository.swift @@ -17,6 +17,7 @@ // import WireFoundation +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 37e869a2583..784415dc7ca 100644 --- a/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift +++ b/wire-ios-data-model/Source/Utilis/ZMUpdateEvent.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +import WireLogging + public enum UpdateEventSource: String { case pushChannel case notificationsStream diff --git a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj index acc3f45940e..e6e31aada33 100644 --- a/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj +++ b/wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj @@ -291,6 +291,7 @@ 591F8A072B8CB82400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 591F8A052B8CB81400D562A6 /* IsSelfUserE2EICertifiedUseCaseTests.swift */; }; 5952B89B2BA3179100C48B01 /* MLSClientID+random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5952B89A2BA3179100C48B01 /* MLSClientID+random.swift */; }; 5952B89D2BA3189F00C48B01 /* MLSConferenceInfo+random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5952B89C2BA3189F00C48B01 /* MLSConferenceInfo+random.swift */; }; + 59537CDB2CFF8F2B00920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537CDA2CFF8F2B00920B59 /* WireLogging */; }; 5966D82E2BD6A33F00305BBC /* UserPropertyValidating.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82D2BD6A33F00305BBC /* UserPropertyValidating.swift */; }; 5966D8302BD6AA4100305BBC /* UserPropertyNormalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D82F2BD6AA4100305BBC /* UserPropertyNormalization.swift */; }; 5966D8322BD6AA8200305BBC /* UserPropertyNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5966D8312BD6AA8200305BBC /* UserPropertyNormalizer.swift */; }; @@ -1884,6 +1885,7 @@ EE8DA9632954A02400F58B79 /* WireProtos.framework in Frameworks */, 59B48C5C2C89CBBD00EA7999 /* WireFoundation in Frameworks */, EE8DA9702954A03E00F58B79 /* WireImages.framework in Frameworks */, + 59537CDB2CFF8F2B00920B59 /* WireLogging in Frameworks */, EE8DA96A2954A03100F58B79 /* WireTransport.framework in Frameworks */, 017CA4442A2742B800E8E778 /* WireCoreCrypto.xcframework in Frameworks */, ); @@ -3820,6 +3822,7 @@ packageProductDependencies = ( E6707E8F2BBD683F00469D57 /* PINCache */, 59B48C5B2C89CBBD00EA7999 /* WireFoundation */, + 59537CDA2CFF8F2B00920B59 /* WireLogging */, ); productName = WireDataModel; productReference = F9C9A4FC1CAD5DF10039E10C /* WireDataModel.framework */; @@ -5186,6 +5189,10 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 59537CDA2CFF8F2B00920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; 59B48C5B2C89CBBD00EA7999 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; diff --git a/wire-ios-mono.xcworkspace/contents.xcworkspacedata b/wire-ios-mono.xcworkspace/contents.xcworkspacedata index 5b780b44420..f26360433bc 100644 --- a/wire-ios-mono.xcworkspace/contents.xcworkspacedata +++ b/wire-ios-mono.xcworkspace/contents.xcworkspacedata @@ -130,6 +130,9 @@ + + diff --git a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme index 25ca2f8b510..9dcfe280a1d 100644 --- a/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme +++ b/wire-ios-mono.xcworkspace/xcshareddata/xcschemes/WireFoundationAll.xcscheme @@ -7,6 +7,20 @@ buildImplicitDependencies = "YES" buildArchitectures = "Automatic"> + + + + - - - - + BlueprintIdentifier = "WireLogging" + BuildableName = "WireLogging" + BlueprintName = "WireLogging" + ReferencedContainer = "container:WireLogging"> @@ -41,8 +27,13 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - shouldAutocreateTestPlan = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + BlueprintIdentifier = "WireLogging" + BuildableName = "WireLogging" + BlueprintName = "WireLogging" + ReferencedContainer = "container:WireLogging"> diff --git a/wire-ios-notification-engine/Sources/NotificationSession.swift b/wire-ios-notification-engine/Sources/NotificationSession.swift index 229088aa9a6..9507f441d50 100644 --- a/wire-ios-notification-engine/Sources/NotificationSession.swift +++ b/wire-ios-notification-engine/Sources/NotificationSession.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireRequestStrategy public enum NotificationSessionError: LocalizedError { diff --git a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift index 0aba05f85e6..0a490bce03d 100644 --- a/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift +++ b/wire-ios-notification-engine/Sources/Synchronization/Strategies/PushNotificationStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireRequestStrategy protocol PushNotificationStrategyDelegate: AnyObject { diff --git a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj index ccf8794a242..7fcd56896aa 100644 --- a/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj +++ b/wire-ios-notification-engine/WireNotificationEngine.xcodeproj/project.pbxproj @@ -16,6 +16,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 */; }; 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 */; }; @@ -108,6 +109,7 @@ buildActionMask = 2147483647; files = ( 591B6E262C8B097B009F8A7B /* WireRequestStrategy.framework in Frameworks */, + 59537D8D2CFF9FB300920B59 /* WireLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -809,6 +811,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 59537D8C2CFF9FB300920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 0660428C247FE76A00A5F161 /* Project object */; } diff --git a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift index 04f76dcc891..5160897763a 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIEnrollment.swift @@ -18,6 +18,7 @@ import Foundation import WireCoreCrypto +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 eec5933449b..3cbf5f79c18 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIKeyPackageRotator.swift @@ -20,6 +20,7 @@ import Combine import Foundation import WireCoreCrypto import WireDataModel +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 e28dea1edab..162f728fbbd 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/E2EIRepository.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireCoreCrypto +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 72576b0ad39..a2d077bf0ed 100644 --- a/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift +++ b/wire-ios-request-strategy/Sources/E2EIdentity/EnrollE2EICertificateUseCase.swift @@ -17,6 +17,7 @@ // import Foundation +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 6ee3cfa9a08..aa3e3ef2b97 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageExpirationTimer.swift @@ -17,6 +17,7 @@ // import Foundation +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 670614cc8d7..29f6cd867ef 100644 --- a/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift +++ b/wire-ios-request-strategy/Sources/Helpers/MessageLogAttributesBuilder.swift @@ -18,6 +18,7 @@ import CoreData import WireDataModel +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 b0011485cf1..013371154ef 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageDependencyResolver.swift @@ -17,6 +17,7 @@ // import Foundation +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 b0392bd2f8c..dd2e03bc562 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageInfoExtractor.swift @@ -17,6 +17,7 @@ // import Foundation +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 97fe0afab37..8b21b77e052 100644 --- a/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift +++ b/wire-ios-request-strategy/Sources/Message Sending/MessageSender.swift @@ -17,6 +17,7 @@ // import WireDataModel +import WireLogging public enum MessageSendError: Error, Equatable { case missingMessageProtocol diff --git a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift index 16b409a3465..bee5a2740fb 100644 --- a/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift +++ b/wire-ios-request-strategy/Sources/Notifications/NotificationStreamSync.swift @@ -17,6 +17,7 @@ // import Foundation +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.swift b/wire-ios-request-strategy/Sources/Notifications/Push Notifications/Notification Types/Content/ZMLocalNotification.swift index 82a00942b21..044e0636541 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,6 +18,7 @@ import UserNotifications import WireDataModel +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 c82615f1f0f..687dae1e7d6 100644 --- a/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift +++ b/wire-ios-request-strategy/Sources/Notifications/PushNotificationStatus.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 9a471f672e3..445ad6d3273 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Payload+Coding.swift @@ -17,6 +17,7 @@ // import Foundation +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 27758ada22e..eaf2b5e968b 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConnectionPayloadProcessor.swift @@ -17,6 +17,7 @@ // import Foundation +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 5c165a8b28a..1ce04418c74 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/ConversationEventPayloadProcessor.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 5a76e900c24..af53c510b3e 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/Helpers/MLSEventProcessor.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 8f201f74550..d347bb93508 100644 --- a/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift +++ b/wire-ios-request-strategy/Sources/Payloads/Processing/MessageSendingStatusPayloadProcessor.swift @@ -17,6 +17,7 @@ // import Foundation +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 21f7b69ee6c..a11f904662f 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetClientMessageRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 955e5ff6236..ab5ed88e57d 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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/LinkPreviewUpdateRequestStrategy.swift b/wire-ios-request-strategy/Sources/Request Strategies/Assets/Link Preview/LinkPreviewUpdateRequestStrategy.swift index 47f38fe2193..94df0132180 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,6 +17,7 @@ // import Foundation +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 c36d0ba2cf0..3d74b332d10 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Availability/AvailabilityRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 f537ebad982..a0390244fa8 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,6 +17,7 @@ // import Foundation +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 66c9a50a8c6..7e24a1f45cd 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Connection/ConnectionRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 00057b11029..19fb29c6563 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,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging public final class CreateGroupConversationAction: EntityAction { 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 73bba2cbe96..17814dfc57c 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationParticipantsService.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 5462c8faf00..be3d68570eb 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationRequestStrategy.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 1aa42a39a87..9334097698b 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/ConversationService.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 81e329a366d..a23a31d2644 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/Conversation/MLSConversationParticipantsService.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 bf78f0e044a..9de34b9960d 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 @@ -17,6 +17,7 @@ // import Foundation +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 d63aa647439..cf407eac91a 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,6 +17,7 @@ // import Foundation +import WireLogging public final class FeatureConfigRequestStrategy: AbstractRequestStrategy { 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 360469d2d02..961024a0647 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/MLS/FetchBackendMLSPublicKeysRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 0918cc128dc..1bc04afa169 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 @@ -17,6 +17,7 @@ // import Foundation +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 946b4af0a66..026b3e9cffd 100644 --- a/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift +++ b/wire-ios-request-strategy/Sources/Request Strategies/User/UserProfileRequestStrategy.swift @@ -15,7 +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/. // + import Foundation +import WireLogging /// Request strategy for fetching user profiles and processing user update events. /// 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 c269b1a54df..e398f5f7d5c 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+MLS.swift @@ -17,6 +17,7 @@ // import Foundation +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 0eaab567061..5a374303974 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder+Proteus.swift @@ -18,6 +18,7 @@ import Foundation import WireCryptobox +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 3ede2d316f4..8784bd321d5 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/EventDecoder.swift @@ -19,6 +19,7 @@ import Foundation import WireCryptobox import WireDataModel +import WireLogging import WireUtilities private let zmLog = ZMSLog(tag: "EventDecoder") diff --git a/wire-ios-request-strategy/Sources/Synchronization/Decoding/StoreUpdateEvent.swift b/wire-ios-request-strategy/Sources/Synchronization/Decoding/StoreUpdateEvent.swift index a15cbf08f61..3cb600b85bf 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/Decoding/StoreUpdateEvent.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/Decoding/StoreUpdateEvent.swift @@ -18,6 +18,7 @@ import CoreData import Foundation +import WireLogging @objc(StoredUpdateEvent) public final class StoredUpdateEvent: NSManagedObject { diff --git a/wire-ios-request-strategy/Sources/Synchronization/QuickSyncObserver.swift b/wire-ios-request-strategy/Sources/Synchronization/QuickSyncObserver.swift index 69724922f32..07fbf481167 100644 --- a/wire-ios-request-strategy/Sources/Synchronization/QuickSyncObserver.swift +++ b/wire-ios-request-strategy/Sources/Synchronization/QuickSyncObserver.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging // sourcery: AutoMockable public protocol QuickSyncObserverInterface { diff --git a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift index 665f1a04558..a7076648185 100644 --- a/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift +++ b/wire-ios-request-strategy/Tests/Helpers/MessagingTestBase.swift @@ -18,7 +18,9 @@ import WireCryptobox import WireDataModel +import WireLogging import WireTesting + @testable import WireRequestStrategy class MessagingTestBase: ZMTBaseTest { diff --git a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj index b11025df905..619754cf5e5 100644 --- a/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj +++ b/wire-ios-request-strategy/WireRequestStrategy.xcodeproj/project.pbxproj @@ -197,6 +197,8 @@ 591B6E422C8B09B6009F8A7B /* WireRequestStrategy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; }; 59271BED2B90D2140019B726 /* ClientRegistrationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BEC2B90D2140019B726 /* ClientRegistrationDelegate.swift */; }; 59271BF02B90D2510019B726 /* MockOTREntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BEE2B90D24A0019B726 /* MockOTREntity.swift */; }; + 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D842CFF9D1600920B59 /* WireLogging */; }; + 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D862CFF9DF600920B59 /* WireLogging */; }; 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 */; }; @@ -964,6 +966,7 @@ buildActionMask = 2147483647; files = ( 598D04332C89C6CF00B64D71 /* WireFoundation in Frameworks */, + 59537D852CFF9D1600920B59 /* WireLogging in Frameworks */, 591B6E3B2C8B09AA009F8A7B /* WireDataModel.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -976,6 +979,7 @@ CB7979052C73663B006FBA58 /* WireRequestStrategySupport.framework in Frameworks */, 598D04302C89C67E00B64D71 /* WireFoundation in Frameworks */, 598E870D2BF4E08100FC5438 /* WireUtilitiesSupport.framework in Frameworks */, + 59537D872CFF9DF600920B59 /* WireLogging in Frameworks */, CB5120532C6FD69F000C8FEC /* WireTransportSupport.framework in Frameworks */, 591B6E3D2C8B09AE009F8A7B /* WireDataModelSupport.framework in Frameworks */, ); @@ -2208,6 +2212,7 @@ name = WireRequestStrategy; packageProductDependencies = ( 598D04322C89C6CF00B64D71 /* WireFoundation */, + 59537D842CFF9D1600920B59 /* WireLogging */, ); productName = WireRequestStrategy; productReference = 1669016A1D707509000FE4AF /* WireRequestStrategy.framework */; @@ -2234,6 +2239,7 @@ name = WireRequestStrategyTests; packageProductDependencies = ( 598D042F2C89C67E00B64D71 /* WireFoundation */, + 59537D862CFF9DF600920B59 /* WireLogging */, ); productName = WireRequestStrategyTests; productReference = 166901741D707509000FE4AF /* WireRequestStrategyTests.xctest */; @@ -3217,6 +3223,14 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ + 59537D842CFF9D1600920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; + 59537D862CFF9DF600920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; 598D042F2C89C67E00B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; diff --git a/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift index f0efcc307f2..91473c5555b 100644 --- a/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift +++ b/wire-ios-share-engine/Sources/ZMConversation+Conversation.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 c686a1be93a..43d47f0cb36 100644 --- a/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift +++ b/wire-ios-share-engine/Sources/ZMMessage+Sendable.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging private extension ZMMessage { diff --git a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj index d72d4e525a4..eeb27fe5db9 100644 --- a/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj +++ b/wire-ios-share-engine/WireShareEngine.xcodeproj/project.pbxproj @@ -13,6 +13,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 */; }; 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 */; }; @@ -113,6 +114,7 @@ buildActionMask = 2147483647; files = ( 591B6E322C8B098C009F8A7B /* WireRequestStrategy.framework in Frameworks */, + 59537D8B2CFF9F8F00920B59 /* WireLogging in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -595,6 +597,13 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + 59537D8A2CFF9F8F00920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 5470D3DF1D76E1B000FDE440 /* Project object */; } diff --git a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift index a84adf50b68..7fef5120f45 100644 --- a/wire-ios-sync-engine/Source/Calling/CallKitManager.swift +++ b/wire-ios-sync-engine/Source/Calling/CallKitManager.swift @@ -20,6 +20,7 @@ import avs import CallKit import Foundation import Intents +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 ba232058d4c..af9b959a3d0 100644 --- a/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift +++ b/wire-ios-sync-engine/Source/Calling/MLSConferenceStaleParticipantsRemover.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireDataModel +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 bc7c4963016..8014f3ee1c4 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+Events.swift @@ -18,6 +18,7 @@ import avs import Foundation +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 db8e1b2813f..d83281e1623 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3+MLS.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireDataModel +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 a3daa09d9ce..3d5ec67e29d 100644 --- a/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift +++ b/wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift @@ -19,6 +19,7 @@ import avs import Combine import Foundation +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 8ad5d035e28..52240ff958b 100644 --- a/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift +++ b/wire-ios-sync-engine/Source/Data Model/Conversation+Deletion.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging import WireSystem public enum ConversationDeletionError: Error { diff --git a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift index 842a0853553..28560fdaf8f 100644 --- a/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift +++ b/wire-ios-sync-engine/Source/E2EI/CRL/CertificateRevocationListsChecker.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging // sourcery: AutoMockable public protocol CertificateRevocationListsChecking { diff --git a/wire-ios-sync-engine/Source/Services/SupportedProtocolsService.swift b/wire-ios-sync-engine/Source/Services/SupportedProtocolsService.swift index f12897a1605..780e14e471b 100644 --- a/wire-ios-sync-engine/Source/Services/SupportedProtocolsService.swift +++ b/wire-ios-sync-engine/Source/Services/SupportedProtocolsService.swift @@ -18,6 +18,7 @@ import Foundation import WireDomain +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 fac81e26afb..44a279088dc 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 struct WireSystem.WireLogger +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 dafaf4d3845..b58e3ba55fa 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 struct WireSystem.WireLogger +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 225307b03f1..e4f8a3a56cf 100644 --- a/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/APIVersionResolver.swift @@ -17,6 +17,7 @@ // import Foundation +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 fdbe14a7fdb..e7abc7fade8 100644 --- a/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift +++ b/wire-ios-sync-engine/Source/SessionManager/AVSLogObserver.swift @@ -17,6 +17,7 @@ // import avs +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 54578ba5781..106d714860f 100644 --- a/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift +++ b/wire-ios-sync-engine/Source/SessionManager/BackendEnvironmentProvider+Reachability.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging public typealias Reachability = ReachabilityProvider & TearDownCapable diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+Backup.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+Backup.swift index 6e0ea571fdb..2c937b8d4e1 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+Backup.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+Backup.swift @@ -20,6 +20,7 @@ import Foundation import WireAnalytics import WireCryptobox import WireDataModel +import WireLogging import WireUtilities import ZipArchive diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift index a65962c610b..886ef7e2800 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+CallKitManagerDelegate.swift @@ -18,6 +18,7 @@ import CallKit import Foundation +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 7dcf96d9a8c..429cc65649d 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+EncryptionAtRest.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging extension SessionManager: UserSessionEncryptionAtRestDelegate { diff --git a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift index 2bbc7759a8f..35df14f4050 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionLogoutDelegate.swift @@ -17,6 +17,7 @@ // import Foundation +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 a5b0702ff12..e933f24920a 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+UserSessionSelfUserClientDelegate.swift @@ -17,6 +17,7 @@ // import Foundation +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 05e2ab8d326..eb76892c8de 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager+VoIPPushManagerDelegate.swift @@ -18,6 +18,7 @@ import Foundation import PushKit +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 2088edeced2..92a2326282a 100644 --- a/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift +++ b/wire-ios-sync-engine/Source/SessionManager/SessionManager.swift @@ -24,6 +24,7 @@ import UserNotifications import WireAnalytics import WireDataModel import WireFoundation +import WireLogging import WireRequestStrategy import WireTransport import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift index c65c9e0153b..b6e41b20a77 100644 --- a/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift +++ b/wire-ios-sync-engine/Source/Synchronization/EventProcessor.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireRequestStrategy import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift index 7f0cb8afc70..08db7855829 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/CallingRequestStrategy.swift @@ -19,6 +19,7 @@ import Combine import Foundation import WireDataModel +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 8dc9c70472a..8c4cd51fab7 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/EvaluateOneOnOneConversationsStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 357e45185a7..93fe34622fc 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LabelDownstreamRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 9200b723b67..f34b57490d1 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/LegalHoldRequestStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 cb263ce5961..1737389956e 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/RegistationCredentialVerificationStrategy.swift @@ -17,6 +17,7 @@ // import Foundation +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 3cbe001b612..8f5f0fe4d50 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/SelfSupportedProtocolsRequestStrategy.swift @@ -18,6 +18,7 @@ import Foundation import WireDomain +import WireLogging import WireRequestStrategy public final class SelfSupportedProtocolsRequestStrategy: AbstractRequestStrategy, ZMSingleRequestTranscoder { diff --git a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift index edcdfa1ae03..a6458a2e5bc 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientEventConsumer.swift @@ -17,6 +17,7 @@ // import Foundation +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 138f0e40939..cba96ea3696 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift +++ b/wire-ios-sync-engine/Source/Synchronization/Strategies/UserClientRequestStrategy.swift @@ -19,6 +19,7 @@ import Foundation import WireCryptobox import WireDataModel +import WireLogging import WireSystem import WireTransport import WireUtilities diff --git a/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m b/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m index bbb87ea6324..00f361cd299 100644 --- a/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m +++ b/wire-ios-sync-engine/Source/Synchronization/Transcoders/ZMMissingUpdateEventsTranscoder.m @@ -175,7 +175,7 @@ - (NSUUID *)processUpdateEventsAndReturnLastNotificationIDFromResponse:(ZMTransp if (!event.isTransient) { latestEventId = event.uuid; } - [WireLoggerObjc logReceivedUpdateEventWithId:[event safeUUID]]; + [WireLoggerObjC logReceivedUpdateEventWithId:[event safeUUID]]; } } diff --git a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift index 281fa62c4a1..842ff8ef8f0 100644 --- a/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift +++ b/wire-ios-sync-engine/Source/Synchronization/ZMOperationLoop+PushChannel.swift @@ -18,6 +18,7 @@ import Foundation import WireAPI +import WireLogging extension ZMOperationLoop: ZMPushChannelConsumer { diff --git a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift index d59ec5c426b..91ac26e139c 100644 --- a/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/E2EIdentityCertificateUpdateStatusUseCase.swift @@ -17,6 +17,7 @@ // import Foundation +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 c816166a556..e16835a356a 100644 --- a/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/GetUserClientFingerprintUseCase.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireRequestStrategy // sourcery: AutoMockable diff --git a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift index e73553978fc..5d519a61d6b 100644 --- a/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift +++ b/wire-ios-sync-engine/Source/Use cases/ShareFileUseCase.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 f6e493ab3aa..c4a47475673 100644 --- a/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift +++ b/wire-ios-sync-engine/Source/UserSession/NSManagedObject+CryptoStack.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 0342c7ab4fc..dd0a00373df 100644 --- a/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/OperationStatus.swift @@ -17,6 +17,7 @@ // import Foundation +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 d2acd251abb..eff3b2acb96 100644 --- a/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/SyncStatus.swift @@ -16,6 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +import WireLogging + private let zmLog = ZMSLog(tag: "SyncStatus") public extension Notification.Name { diff --git a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift index c9364e237e7..f2305561165 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/DeepLinkURLActionProcessor.swift @@ -17,6 +17,7 @@ // import Foundation +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 0c81cbc4b7e..87eadf254cd 100644 --- a/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift +++ b/wire-ios-sync-engine/Source/UserSession/URLActionProcessors/ImportEventsURLActionProcessor.swift @@ -17,6 +17,7 @@ // import Foundation +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 60ab7247fa8..85038d62989 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMClientRegistrationStatus.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging import WireSystem @objc(ZMClientRegistrationPhase) 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 287b38f8f1a..81394420067 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AccessToken.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging extension ZMUserSession: AccessTokenRenewing { 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 5465155f1d4..33cc8b131c5 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+AnalyticsUser.swift @@ -19,6 +19,7 @@ import Foundation import WireAnalytics import WireDataModel +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 4a317a3cbd5..161531491d9 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+CertificateRevocationLists.swift @@ -17,6 +17,7 @@ // import Foundation +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 9aef1bc0d5b..21670d89cb7 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+EncryptionAtRest.swift @@ -19,6 +19,7 @@ import Foundation import LocalAuthentication import WireDataModel +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 87d24f6a76b..8f7c599c8ab 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+LifeCycle.swift @@ -17,6 +17,7 @@ // import Foundation +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 6f0c06434dc..a1ba0f847ec 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+OneOnOne.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 662b171f8f8..b438bb201b2 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Push.swift @@ -18,6 +18,7 @@ import Foundation import UserNotifications +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 ac7862fda91..6e1fea0cc02 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+RecurringAction.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging extension ZMUserSession { diff --git a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift index b665ebea658..4b5f6d48dc4 100644 --- a/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift +++ b/wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift @@ -20,6 +20,7 @@ import Combine import Foundation import WireAnalytics import WireDataModel +import WireLogging import WireRequestStrategy import WireSystem diff --git a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj index a00316c2442..b9576e870ce 100644 --- a/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj +++ b/wire-ios-sync-engine/WireSyncEngine.xcodeproj/project.pbxproj @@ -284,6 +284,7 @@ 591B6E132C8B092B009F8A7B /* WireDataModelSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1C30F2B1DEE6E0016F6B2 /* WireDataModelSupport.framework */; }; 59271BE82B908DAC0019B726 /* SecurityClassificationProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BE72B908DAC0019B726 /* SecurityClassificationProviding.swift */; }; 59271BEA2B908E150019B726 /* SecurityClassification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59271BE92B908E150019B726 /* SecurityClassification.swift */; }; + 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59537D882CFF9E7700920B59 /* WireLogging */; }; 597B70C32B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 597B70C22B03984C006C2121 /* ZMUserSession+DeveloperMenu.swift */; }; 598D04362C89C6FB00B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04352C89C6FB00B64D71 /* WireFoundation */; }; 598D04392C89C70500B64D71 /* WireFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = 598D04382C89C70500B64D71 /* WireFoundation */; }; @@ -1429,6 +1430,7 @@ 59B99FAE2C89DF7B00201827 /* WireDomainPackage in Frameworks */, 598D04362C89C6FB00B64D71 /* WireFoundation in Frameworks */, EE67F6C8296F0622001D7C88 /* libPhoneNumberiOS.xcframework in Frameworks */, + 59537D892CFF9E7700920B59 /* WireLogging in Frameworks */, 01F0F8922CCA2B2C00FE4170 /* avs.xcframework in Frameworks */, EE67F6CA296F0622001D7C88 /* ZipArchive.xcframework in Frameworks */, ); @@ -2883,6 +2885,7 @@ 598D04352C89C6FB00B64D71 /* WireFoundation */, 59B99FAD2C89DF7B00201827 /* WireDomainPackage */, E9C60E912C259F3C004E5F13 /* WireAnalytics */, + 59537D882CFF9E7700920B59 /* WireLogging */, ); productName = "WireSyncEngine-ios"; productReference = 549815931A43232400A7CE2E /* WireSyncEngine.framework */; @@ -4104,6 +4107,10 @@ isa = XCSwiftPackageProductDependency; productName = WireAnalyticsSupport; }; + 59537D882CFF9E7700920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; 598D04352C89C6FB00B64D71 /* WireFoundation */ = { isa = XCSwiftPackageProductDependency; productName = WireFoundation; diff --git a/wire-ios-system/Source/ExpiringActivity.swift b/wire-ios-system/Source/ExpiringActivity.swift index 48228419d28..4942ff3dc13 100644 --- a/wire-ios-system/Source/ExpiringActivity.swift +++ b/wire-ios-system/Source/ExpiringActivity.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging protocol ExpiringActivityInterface { diff --git a/wire-ios-system/Source/TimePoint.swift b/wire-ios-system/Source/TimePoint.swift index 667f023b62a..adc6691adb6 100644 --- a/wire-ios-system/Source/TimePoint.swift +++ b/wire-ios-system/Source/TimePoint.swift @@ -17,6 +17,7 @@ // import Foundation +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/Logging/WireLoggerObjc.swift b/wire-ios-system/Source/WireLoggerObjC.swift similarity index 95% rename from wire-ios-system/Source/Logging/WireLoggerObjc.swift rename to wire-ios-system/Source/WireLoggerObjC.swift index 09cd6b23959..39cc63ffdee 100644 --- a/wire-ios-system/Source/Logging/WireLoggerObjc.swift +++ b/wire-ios-system/Source/WireLoggerObjC.swift @@ -17,10 +17,11 @@ // import Foundation +import WireLogging /// Class to proxy WireLogger methods to Objective-C @objcMembers -public final class WireLoggerObjc: NSObject { +public final class WireLoggerObjC: NSObject { static func assertionDumpLog(_ message: String) { WireLogger.system.critical(message, attributes: .safePublic) diff --git a/wire-ios-system/Source/ZMSAsserts.h b/wire-ios-system/Source/ZMSAsserts.h index 77f505dd782..90c5a246705 100644 --- a/wire-ios-system/Source/ZMSAsserts.h +++ b/wire-ios-system/Source/ZMSAsserts.h @@ -131,7 +131,7 @@ do { \ ""]; \ \ /* report error to datadog or other loggers */ \ - [WireLoggerObjc assertionDumpLog:output]; \ + [WireLoggerObjC assertionDumpLog:output]; \ \ /* prepare and dump to file */ \ [ZMAssertionDumpFile writeWithContent:output error:nil]; \ @@ -149,7 +149,7 @@ do { \ message]; \ \ /* report error to datadog or other loggers */ \ - [WireLoggerObjc assertionDumpLog:output]; \ + [WireLoggerObjC assertionDumpLog:output]; \ \ /* prepare and dump to file */ \ [ZMAssertionDumpFile writeWithContent:output error:nil]; \ diff --git a/wire-ios-system/Source/ZMSAsserts.swift b/wire-ios-system/Source/ZMSAsserts.swift index bed44c9e836..5648b337112 100644 --- a/wire-ios-system/Source/ZMSAsserts.swift +++ b/wire-ios-system/Source/ZMSAsserts.swift @@ -17,6 +17,7 @@ // import Foundation +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 ce079b2f8b0..3c338371ce4 100644 --- a/wire-ios-system/Source/ZMSLog.swift +++ b/wire-ios-system/Source/ZMSLog.swift @@ -18,6 +18,7 @@ import Foundation import os.log +import WireLogging import ZipArchive /// 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 b4c7f604356..dceac326995 100644 --- a/wire-ios-system/WireSystem.xcodeproj/project.pbxproj +++ b/wire-ios-system/WireSystem.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 591B6E892C8B0A33009F8A7B /* ZipArchive.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6B58E402B21D8920046B6E1 /* ZipArchive.xcframework */; }; 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 */; }; 598E86ED2BF4DD3100FC5438 /* WireSystemSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 598E86D82BF4DB3700FC5438 /* WireSystemSupport.framework */; }; EE9AEC842BD1585500F7853F /* WireSystem.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC832BD1585500F7853F /* WireSystem.docc */; }; /* End PBXBuildFile section */ @@ -91,6 +92,7 @@ buildActionMask = 2147483647; files = ( 591B6E892C8B0A33009F8A7B /* ZipArchive.xcframework in Frameworks */, + 5953781C2CFF42E900920B59 /* WireLogging in Frameworks */, 013334BC2C204AB0002D97DB /* CocoaLumberjackSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -190,6 +192,7 @@ name = WireSystem; packageProductDependencies = ( 013334BB2C204AB0002D97DB /* CocoaLumberjackSwift */, + 5953781B2CFF42E900920B59 /* WireLogging */, ); productName = SyncEngineSystem; productReference = 3ECC35191AD436750089FD4B /* WireSystem.framework */; @@ -682,6 +685,10 @@ package = 013334BA2C204AB0002D97DB /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; productName = CocoaLumberjackSwift; }; + 5953781B2CFF42E900920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 3ECC34C41AD430BB0089FD4B /* Project object */; diff --git a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift index 9e0fd5a30aa..2ad7c4c8735 100644 --- a/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift +++ b/wire-ios-transport/Source/Authentication/ZMAccessTokenHandler.swift @@ -17,6 +17,7 @@ // import Foundation +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 9f6ade90ad5..bdb0f83a429 100644 --- a/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift +++ b/wire-ios-transport/Source/Background/BackgroundActivityFactory.swift @@ -17,6 +17,7 @@ // import UIKit +import WireLogging import WireUtilities /// Manages the creation and lifecycle of background tasks. diff --git a/wire-ios-transport/Source/Logging/RequestLog.swift b/wire-ios-transport/Source/Logging/RequestLog.swift index 3773033dbd0..889a74ec9ba 100644 --- a/wire-ios-transport/Source/Logging/RequestLog.swift +++ b/wire-ios-transport/Source/Logging/RequestLog.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging struct RequestLog: Codable { var method: String @@ -164,7 +165,7 @@ extension WireLogger { } } -extension WireLoggerObjc { +extension WireLoggerObjC { static func logRequest(_ request: NSURLRequest) { WireLogger.network.log(request: request) } diff --git a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift index 1cd557c309c..69034ac7dee 100644 --- a/wire-ios-transport/Source/Public/ServerCertificateTrust.swift +++ b/wire-ios-transport/Source/Public/ServerCertificateTrust.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging final class ServerCertificateTrust: NSObject, BackendTrustProvider { let trustData: [TrustData] diff --git a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift index 2f7d0455ca2..12b004d09cc 100644 --- a/wire-ios-transport/Source/Public/ZMUpdateEvent.swift +++ b/wire-ios-transport/Source/Public/ZMUpdateEvent.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireUtilities @objc diff --git a/wire-ios-transport/Source/PushChannel/NativePushChannel.swift b/wire-ios-transport/Source/PushChannel/NativePushChannel.swift index 5a323af9fd4..8e514f1c986 100644 --- a/wire-ios-transport/Source/PushChannel/NativePushChannel.swift +++ b/wire-ios-transport/Source/PushChannel/NativePushChannel.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging @objcMembers final class NativePushChannel: NSObject, PushChannelType { diff --git a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift index a22ad820643..ad16ab03e1f 100644 --- a/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift +++ b/wire-ios-transport/Source/PushChannel/StarscreamPushChannel.swift @@ -18,6 +18,7 @@ import Foundation import Starscream +import WireLogging @objcMembers final class StarscreamPushChannel: NSObject, PushChannelType { diff --git a/wire-ios-transport/Source/TransportSession/UnauthenticatedTransportSession.swift b/wire-ios-transport/Source/TransportSession/UnauthenticatedTransportSession.swift index 8c8d77ffad4..01ef5c6fa35 100644 --- a/wire-ios-transport/Source/TransportSession/UnauthenticatedTransportSession.swift +++ b/wire-ios-transport/Source/TransportSession/UnauthenticatedTransportSession.swift @@ -18,6 +18,7 @@ import CoreFoundation import Security +import WireLogging public enum EnqueueResult { case success diff --git a/wire-ios-transport/Source/TransportSession/ZMTransportSession.m b/wire-ios-transport/Source/TransportSession/ZMTransportSession.m index 2a3c182b51a..db2980ada26 100644 --- a/wire-ios-transport/Source/TransportSession/ZMTransportSession.m +++ b/wire-ios-transport/Source/TransportSession/ZMTransportSession.m @@ -238,7 +238,7 @@ - (instancetype)initWithURLSessionsDirectory:(id Void diff --git a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj index e05b4aa0371..d8c697ec71f 100644 --- a/wire-ios/Wire-iOS.xcodeproj/project.pbxproj +++ b/wire-ios/Wire-iOS.xcodeproj/project.pbxproj @@ -336,6 +336,7 @@ 5915B9582BF4BA9700215817 /* DidPresentNotificationPermissionHintUseCaseProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5915B9572BF4BA9700215817 /* DidPresentNotificationPermissionHintUseCaseProtocol.swift */; }; 5915B95A2BF4BAFF00215817 /* DidPresentNotificationPermissionHintUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5915B9592BF4BAFE00215817 /* DidPresentNotificationPermissionHintUseCase.swift */; }; 5915B95C2BF4BB5300215817 /* NativelySupportedUserDefaultsKey+lastTimeNotificationPermissionHintWasShown.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5915B95B2BF4BB5300215817 /* NativelySupportedUserDefaultsKey+lastTimeNotificationPermissionHintWasShown.swift */; }; + 59191A652D0051C7001AB388 /* WireLogging in Frameworks */ = {isa = PBXBuildFile; productRef = 59191A642D0051C7001AB388 /* WireLogging */; }; 591B6E172C8B095B009F8A7B /* WireNotificationEngine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9A8585298B0A3B00064A9C /* WireNotificationEngine.framework */; }; 591B6E182C8B095B009F8A7B /* WireNotificationEngine.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EE9A8585298B0A3B00064A9C /* WireNotificationEngine.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 591B6E192C8B0960009F8A7B /* WireCommonComponents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1FEA14A21DCEB1700790A54 /* WireCommonComponents.framework */; }; @@ -364,6 +365,10 @@ 5950A9472C2F1C31005AB9CE /* AvailabilityMappings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5950A9462C2F1C31005AB9CE /* AvailabilityMappings.swift */; }; 59510DD32CB3E6EE00BCD5FD /* SidebarViewControllerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59510DD22CB3E6E700BCD5FD /* SidebarViewControllerBuilder.swift */; }; 5952693F2BE8C93B001C1E8B /* AppLockView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5952693E2BE8C93B001C1E8B /* AppLockView.swift */; }; + 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 */; }; 595BFD7D2CA9365800D02361 /* ConversationListCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 595BFD7C2CA9365200D02361 /* ConversationListCoordinator.swift */; }; 595C49362CA93D7200F8F881 /* AnyConversationListCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 595C49352CA93D6D00F8F881 /* AnyConversationListCoordinator.swift */; }; 595C49692CA995E900F8F881 /* WireSettingsUI in Frameworks */ = {isa = PBXBuildFile; productRef = 595C49682CA995E900F8F881 /* WireSettingsUI */; }; @@ -3914,6 +3919,7 @@ buildActionMask = 2147483647; files = ( 591B6E212C8B096C009F8A7B /* WireCommonComponents.framework in Frameworks */, + 59537D912CFFA0BA00920B59 /* WireLogging in Frameworks */, EE9A8586298B0A3B00064A9C /* WireNotificationEngine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3924,6 +3930,7 @@ files = ( 591B6E192C8B0960009F8A7B /* WireCommonComponents.framework in Frameworks */, 59C4FBF12C45B7130037030B /* WireShareEngine.framework in Frameworks */, + 59537D932CFFA0DA00920B59 /* WireLogging in Frameworks */, 59CDB3F62C4EA08F0049D1AB /* WireReusableUIComponents in Frameworks */, 5945D02A2C219F7200D039E3 /* WireDesign in Frameworks */, ); @@ -3962,6 +3969,7 @@ 407831AD2AC4636F005C2978 /* DifferenceKit in Frameworks */, EEE25B4429719C950008B894 /* WireSystem.framework in Frameworks */, 591B6E172C8B095B009F8A7B /* WireNotificationEngine.framework in Frameworks */, + 59537D952CFFA11A00920B59 /* WireLogging in Frameworks */, E9FBF3A62C47C23100C65DA8 /* FLAnimatedImage in Frameworks */, 59CD83E52C22CE9800186022 /* WireDesign in Frameworks */, E9BA75C62CD51DF100F6EDDF /* WireMoveToFolderUI in Frameworks */, @@ -3989,6 +3997,7 @@ 5996E8A42C19D074007A52F0 /* WireRequestStrategySupport.framework in Frameworks */, 598E86F72BF4DD5C00FC5438 /* WireSystemSupport.framework in Frameworks */, 598E86D12BF4D97800FC5438 /* WireUtilitiesSupport.framework in Frameworks */, + 59191A652D0051C7001AB388 /* WireLogging in Frameworks */, E9816C9A2CC929FC00D77F22 /* WireFoundationSupport in Frameworks */, 590DCA0A2C971AFF002D0A2C /* WireFoundation in Frameworks */, 591B6E1C2C8B0964009F8A7B /* WireDataModelSupport.framework in Frameworks */, @@ -4018,6 +4027,7 @@ buildActionMask = 2147483647; files = ( E985CB8F2CEB4FCB0075DAD6 /* WireDatadog in Frameworks */, + 59537D8F2CFFA05600920B59 /* WireLogging in Frameworks */, E9816C902CC9244700D77F22 /* WireSyncEngine.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -8603,6 +8613,7 @@ packageProductDependencies = ( 5945D0292C219F7200D039E3 /* WireDesign */, 59CDB3F52C4EA08F0049D1AB /* WireReusableUIComponents */, + 59537D922CFFA0DA00920B59 /* WireLogging */, ); productName = "Wire-iOS Share Extension"; productReference = 168A16A91D9597C2005CFA6C /* Wire Share Extension.appex */; @@ -8651,6 +8662,7 @@ E92C8CC52C942A5C00E0F7F7 /* Inject */, CB43D9BC2CDBBBB900BF5AEB /* WireFolderPickerUI */, E9BA75C52CD51DF100F6EDDF /* WireMoveToFolderUI */, + 59537D942CFFA11A00920B59 /* WireLogging */, ); productName = "ZClient iOS"; productReference = 8F42C538199244A700288E4D /* Wire.app */; @@ -8682,6 +8694,7 @@ E9816C992CC929FC00D77F22 /* WireFoundationSupport */, 59C2F09E2CA54E4900B25E5D /* WireMainNavigationUI */, 59B4046D2CAB141000CC33BF /* WireSettingsUI */, + 59191A642D0051C7001AB388 /* WireLogging */, ); productName = "ZClient-iOS Tests"; productReference = BACB88511AF7C48900DDCDB0 /* Wire-iOS-Tests.xctest */; @@ -8728,6 +8741,7 @@ name = WireCommonComponents; packageProductDependencies = ( 016A141C2CE6BFC4006A7EF5 /* WireDatadog */, + 59537D8E2CFFA05600920B59 /* WireLogging */, ); productName = WireCommonComponents; productReference = F1FEA14A21DCEB1700790A54 /* WireCommonComponents.framework */; @@ -11753,6 +11767,10 @@ isa = XCSwiftPackageProductDependency; productName = WireFoundation; }; + 59191A642D0051C7001AB388 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; 5929CB212CA6C9C800070488 /* WireConversationListUI */ = { isa = XCSwiftPackageProductDependency; productName = WireConversationListUI; @@ -11765,6 +11783,22 @@ isa = XCSwiftPackageProductDependency; productName = WireDesign; }; + 59537D8E2CFFA05600920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; + 59537D902CFFA0BA00920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; + 59537D922CFFA0DA00920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; + 59537D942CFFA11A00920B59 /* WireLogging */ = { + isa = XCSwiftPackageProductDependency; + productName = WireLogging; + }; 595C49682CA995E900F8F881 /* WireSettingsUI */ = { isa = XCSwiftPackageProductDependency; productName = WireSettingsUI; diff --git a/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager+UIAlertController.swift b/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager+UIAlertController.swift index 43988f297c4..0513a44860b 100644 --- a/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager+UIAlertController.swift +++ b/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager+UIAlertController.swift @@ -17,6 +17,7 @@ // import UIKit +import WireLogging import WireSystem extension TrackingManager { diff --git a/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager.swift b/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager.swift index 15dd2b13bdf..92324e16882 100644 --- a/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager.swift +++ b/wire-ios/Wire-iOS/Sources/Analytics/TrackingManager/TrackingManager.swift @@ -19,6 +19,7 @@ import avs import Foundation import WireCommonComponents +import WireLogging import WireSyncEngine final class TrackingManager: NSObject, TrackingInterface { diff --git a/wire-ios/Wire-iOS/Sources/AppDelegate.swift b/wire-ios/Wire-iOS/Sources/AppDelegate.swift index 3ba910d22f2..f1ffbd15c25 100644 --- a/wire-ios/Wire-iOS/Sources/AppDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/AppDelegate.swift @@ -22,6 +22,7 @@ import avs import UIKit import WireCommonComponents import WireCoreCrypto +import WireLogging import WireSyncEngine enum ApplicationLaunchType { diff --git a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift index d0716f2ff54..af1fe13cf27 100644 --- a/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift +++ b/wire-ios/Wire-iOS/Sources/AppStateCalculator.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireSyncEngine enum AppState: Equatable { diff --git a/wire-ios/Wire-iOS/Sources/Authentication/Backup/BackupRestoreController.swift b/wire-ios/Wire-iOS/Sources/Authentication/Backup/BackupRestoreController.swift index db1732613cd..1e2e8c0c439 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Backup/BackupRestoreController.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Backup/BackupRestoreController.swift @@ -19,6 +19,7 @@ import Foundation import UniformTypeIdentifiers import WireDataModel +import WireLogging import WireReusableUIComponents 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 a851a3dd91f..43b86b53fc4 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Coordinator/AuthenticationCoordinator.swift @@ -17,6 +17,7 @@ // import UIKit +import WireLogging 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 27ff674937a..c05b5b60676 100644 --- a/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift +++ b/wire-ios/Wire-iOS/Sources/Authentication/Helpers/PasscodeRules+Shared.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireUtilities extension PasswordRuleSet { diff --git a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift index a275b593829..e8072fd3384 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DebugAlert.swift @@ -20,6 +20,7 @@ import MessageUI import UIKit import WireCommonComponents import WireDataModel +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 084f5d8fefd..04b12efa4aa 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/ConversationDeveloperActionsProvider.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 1382ae9e252..af8998a0311 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/ContextItemsProviders/UserClientDeveloperActionsProvider.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 927975ffc0d..70fe813dbb3 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DebugActions/DeveloperDebugActionsViewModel.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +import WireLogging import WireSyncEngine final class DeveloperDebugActionsViewModel: ObservableObject { 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 f378a216fcb..4452fee0dbc 100644 --- a/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/Developer/DeveloperTools/DeveloperE2ei/DeveloperE2eiViewModel.swift @@ -17,6 +17,7 @@ // import Foundation +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 9fe7bbca026..71735a950d4 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/AuthenticationType.swift @@ -17,6 +17,7 @@ // import LocalAuthentication +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 9cedd63b09a..2c1802e5a70 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/PerformanceDebugger.swift @@ -17,6 +17,7 @@ // import UIKit +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 e50b2e58e33..84ae333d605 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/SaveFileManager.swift @@ -17,6 +17,7 @@ // import UIKit +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 98feab6f52a..6902db30aad 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/TmpFiles/TemporaryFileService.swift @@ -17,6 +17,7 @@ // import Foundation +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 4664c7e47b6..5f87f79ce76 100644 --- a/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift +++ b/wire-ios/Wire-iOS/Sources/Helpers/syncengine/Conversation+Participants.swift @@ -16,6 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +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 67a8968419f..aa8c0bc59ac 100644 --- a/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift +++ b/wire-ios/Wire-iOS/Sources/LaunchSequenceOperation.swift @@ -20,6 +20,7 @@ import avs import Foundation import WireCommonComponents import WireDesign +import WireLogging import WireSyncEngine // MARK: - LaunchSequenceOperation diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/BlockerViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/BlockerViewController.swift index c17701bfefa..a24a5f9c465 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/BlockerViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/BlockerViewController.swift @@ -18,6 +18,7 @@ import MessageUI import UIKit +import WireLogging import WireSyncEngine enum BlockerViewControllerContext { 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 d13a32dc2ef..132621e8cc1 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 struct WireSystem.WireLogger +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 a692a73e876..54eaec6788a 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift @@ -17,6 +17,7 @@ // import UIKit +import WireLogging import WireMainNavigationUI import WireSyncEngine 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 a326a401393..4568e964c59 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Components/NetworkStatus/NetworkStatusView.swift @@ -18,6 +18,7 @@ import UIKit import WireDesign +import WireLogging import WireSystem enum NetworkStatusViewState { 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 f0b75723544..dbe6691f0de 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,6 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // +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 0deb9a6ed6a..c2c4ec92102 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,6 +19,7 @@ import UIKit import WireCommonComponents import WireDesign +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 6948c1e1846..296f76fa0e3 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,6 +18,7 @@ import UIKit import WireDataModel +import WireLogging import WireSyncEngine extension ConversationContentViewController { diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift index 8302fd945da..1f51a2bde7b 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift @@ -19,6 +19,7 @@ import UIKit import WireCommonComponents import WireDesign +import WireLogging import WireMainNavigationUI import WireSyncEngine 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 f69ac0df7ad..5defc9625f8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Create/ConversationCreationController.swift @@ -20,6 +20,7 @@ import UIKit import WireCommonComponents import WireDataModel import WireDesign +import WireLogging import WireSyncEngine protocol ConversationCreationControllerDelegate: AnyObject { 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 8123209ddf3..a9eb605c8e6 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/AudioRecorder.swift @@ -19,6 +19,7 @@ import avs import Foundation import MediaPlayer +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 0960c51cb6e..2726048c6a0 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,6 +20,7 @@ import FLAnimatedImage import MobileCoreServices import Photos import WireCommonComponents +import WireLogging import WireReusableUIComponents import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/EmojiRepository.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/EmojiRepository.swift index 4dd013b339b..82af77df1a8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/EmojiRepository.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/InputBar/EmojiRepository.swift @@ -17,6 +17,7 @@ // import Foundation +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 6391dcac0bd..8cac4e2a6d9 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 @@ -22,6 +22,7 @@ import WireAccountImageUI import WireCommonComponents import WireDataModel import WireFoundation +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 3052cdf7fee..fce80f1a5e2 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/DeviceView/DeviceDetailsViewActionsHandler.swift @@ -18,6 +18,7 @@ import UIKit import WireDataModel +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 c5ea35b24fb..c67972febb8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/E2EINotificationActionsHandler.swift @@ -17,6 +17,7 @@ // import Foundation +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 48689744e4f..fc8b6adc3a9 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/E2EIdentity/OAuthUseCase.swift @@ -18,6 +18,7 @@ import AppAuth import Foundation +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 5de107b3152..276c5ddeb97 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupDetailsViewController.swift @@ -18,6 +18,7 @@ import UIKit import WireDesign +import WireLogging import WireMainNavigationUI import WireSyncEngine 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 507d5226963..68571876ef7 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/GroupParticipantsDetail/GroupParticipantsDetailViewModel.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 7f67cd1402f..484003c2a42 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/GroupDetails/Sections/ParticipantsSectionController.swift @@ -18,6 +18,7 @@ import UIKit import WireDataModel +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 48fabdc2628..4f3033055e8 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift @@ -17,6 +17,7 @@ // import WireDataModel +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 69e39eb46a6..b990059a51a 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController.swift @@ -23,6 +23,7 @@ import WireAccountImageUI import WireCommonComponents import WireDesign import WireFoundation +import WireLogging import WireMainNavigationUI import WireSidebarUI import WireSyncEngine diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift index b4589387b26..54e57159b36 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/SelfProfile/ProfileHeaderViewController.swift @@ -20,6 +20,7 @@ import SwiftUI import UIKit import WireCommonComponents import WireDesign +import WireLogging import WireSyncEngine final class ProfileHeaderViewController: UIViewController { 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 dd3529b7b58..9474db7be4d 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 @@ -18,6 +18,7 @@ import UIKit import WireCommonComponents +import WireLogging import WireSystem import ZipArchive 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 17b41086729..52526de690b 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,6 +18,7 @@ import MessageUI import WireCommonComponents +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 0c4c3d14984..ac6732b72ef 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/DeviceManagement/ClientListViewController.swift @@ -19,6 +19,7 @@ import SwiftUI import WireCommonComponents import WireDesign +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 98d1d4e95ad..cf973e39fc6 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/MFMailComposeViewController+Logs.swift @@ -19,6 +19,7 @@ import Foundation import MessageUI import WireCommonComponents +import WireLogging import WireSystem extension MFMailComposeViewController { 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 a3158c47b1a..338c2f95728 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/Devices/OtherUserClientsListViewController.swift @@ -18,6 +18,7 @@ import SwiftUI import WireDesign +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 afa6f4a1190..6fcea92d953 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileActionsFactory.swift @@ -20,6 +20,7 @@ import Foundation import WireCommonComponents import WireDataModel import WireDesign +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 39c36c2d8f6..44cdde89386 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewController.swift @@ -19,6 +19,7 @@ import UIKit import WireDataModel import WireDesign +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 58ca7e20219..98038e27718 100644 --- a/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift +++ b/wire-ios/Wire-iOS/Sources/UserInterface/UserProfile/ProfileViewControllerViewModel.swift @@ -18,6 +18,7 @@ import Foundation import WireDataModel +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 7305bab352d..93d091cdf3b 100644 --- a/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift +++ b/wire-ios/WireCommonComponents/Analytics/Datadog/WireDatadog+LoggerProtocol.swift @@ -18,9 +18,10 @@ import WireAnalytics import WireDatadog +import WireLogging import WireSystem -extension WireDatadog: WireSystem.LoggerProtocol { +extension WireDatadog: LoggerProtocol { public func debug(_ message: any LogConvertible, attributes: LogAttributes...) { log( level: .debug, diff --git a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift index 451abd17c97..877584dd2f0 100644 --- a/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift +++ b/wire-ios/WireCommonComponents/Analytics/WireAnalytics.swift @@ -17,6 +17,7 @@ // import Foundation +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 0c1b266e5b3..2ede0cf3aa9 100644 --- a/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift +++ b/wire-ios/WireCommonComponents/FileMetaDataGenerator/FileMetaDataGenerator.swift @@ -20,6 +20,7 @@ import AVFoundation import Foundation import MobileCoreServices import WireDataModel +import WireLogging private let zmLog = ZMSLog(tag: "UI") diff --git a/wire-ios/WireCommonComponents/LogFileDestination.swift b/wire-ios/WireCommonComponents/LogFileDestination.swift index fbe4d4f0c0e..3328426854a 100644 --- a/wire-ios/WireCommonComponents/LogFileDestination.swift +++ b/wire-ios/WireCommonComponents/LogFileDestination.swift @@ -17,6 +17,7 @@ // import Foundation +import WireLogging import WireSystem public enum LogFileDestination: CaseIterable, FileLoggerDestination { diff --git a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift index e354b2f263e..45803ab1373 100644 --- a/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift +++ b/wire-ios/WireCommonComponents/Logging/CocoaLumberjackLogger.swift @@ -18,6 +18,7 @@ import CocoaLumberjackSwift import Foundation +import WireLogging import WireSystem /// Logger to write logs to fileSystem via CocoaLumberjack