resolve compilation conflicts for merges

Author: roninopf

swift-sdk.xcodeproj/project.pbxproj

@@ -364,7 +364,7 @@
 		5531CDAD22A9C992000D05E2 /* ClassExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassExtensionsTests.swift; sourceTree = "<group>"; };
 		5536781E2576FF9000DB3652 /* IterableUtilTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableUtilTests.swift; sourceTree = "<group>"; };
 		556FB1E9244FAF6A00EDF6BD /* InAppPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InAppPresenter.swift; sourceTree = "<group>"; };
-		55705A6825A78BF3009BDEE2 /* InAppPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = InAppPriorityTests.swift; path = "tests/swift-sdk-swift-tests/in-app-tests/InAppPriorityTests.swift"; sourceTree = SOURCE_ROOT; };
+		55705A6825A78BF3009BDEE2 /* InAppPriorityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = InAppPriorityTests.swift; path = "tests/swift-sdk-swift-tests/InAppPriorityTests.swift"; sourceTree = SOURCE_ROOT; };
 		557AE6BE24A56E5E00B57750 /* Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Auth.swift; sourceTree = "<group>"; };
 		5585DF8E22A73390000A32B9 /* IterableInboxViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableInboxViewControllerTests.swift; sourceTree = "<group>"; };
 		5585DF9022A877E6000A32B9 /* IterableInboxViewControllerUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableInboxViewControllerUITests.swift; sourceTree = "<group>"; };
@@ -678,57 +678,6 @@
 			path = "swift-sdk/misc";
 			sourceTree = "<group>";
 		};
-		55A8F6E92613E0B800184ECC /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-				ACC3FD9D2536D7A30004A2E0 /* InAppFilePersistenceTests.swift */,
-				AC750A49234CD67900561902 /* InAppHelperTests.swift */,
-				AC6FDD8B20F56309005D811E /* InAppParsingTests.swift */,
-				55B37FED229F59290042F13A /* InAppPersistenceTests.swift */,
-				55CC257A2462064F00A77FD5 /* InAppPresenterTests.swift */,
-				55705A6825A78BF3009BDEE2 /* InAppPriorityTests.swift */,
-				ACA8D1A821965B7D001B1332 /* InAppTests.swift */,
-			);
-			path = "in-app-tests";
-			sourceTree = "<group>";
-		};
-		557059BC25A69352009BDEE2 /* inbox-tests */ = {
-			isa = PBXGroup;
-			children = (
-				5585DF8E22A73390000A32B9 /* IterableInboxViewControllerTests.swift */,
-				55B549852397462300243E87 /* InboxImpressionTrackerTests.swift */,
-				55B37FC722975A840042F13A /* InboxMessageViewModelTests.swift */,
-				55B5498323973B5C00243E87 /* InboxSessionManagerTests.swift */,
-				AC1670CC2230A91C00989F8E /* InboxTests.swift */,
-				AC8F35A1239806B500302994 /* InboxViewControllerViewModelTests.swift */,
-			);
-			path = "inbox-tests";
-			sourceTree = "<group>";
-		};
-		557059C525A6938B009BDEE2 /* foundational-tests */ = {
-			isa = PBXGroup;
-			children = (
-				00B6FACB210E8484007535CF /* APNSTypeCheckerTests.swift */,
-				5531CDAD22A9C992000D05E2 /* ClassExtensionsTests.swift */,
-				55B37FC0229620D20042F13A /* CommerceItemTests.swift */,
-				5536781E2576FF9000DB3652 /* IterableUtilTests.swift */,
-				ACE34AB4213776CB00691224 /* LocalStorageTests.swift */,
-				ACED4C00213F50B30055A497 /* LoggingTests.swift */,
-				55B37FC5229752DD0042F13A /* OrderedDictionaryTests.swift */,
-				ACEDF41E2183C436000B9BFE /* PromiseTests.swift */,
-			);
-			path = "foundational-tests";
-			sourceTree = "<group>";
-		};
-		557059EE25A69752009BDEE2 /* deep-linking-tests */ = {
-			isa = PBXGroup;
-			children = (
-				55E6F45E238E066400808BCE /* DeepLinkTests.swift */,
-				55E6F45D238E066400808BCE /* DeferredDeepLinkTests.swift */,
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 		AC0248062279132400495FB9 /* Dwifft */ = {
 			isa = PBXGroup;
 			children = (
@@ -785,7 +734,6 @@
 				ACDA975A23159C37004C412E /* inbox-ui-tests-app */,
 				ACFCA72920EB02DB00BFB277 /* tests */,
 				5550F22324217CFC0014456A /* misc */,
-				55A8F6E92613E0B800184ECC /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -1007,13 +955,14 @@
 				55B37FC0229620D20042F13A /* CommerceItemTests.swift */,
 				55E6F45E238E066400808BCE /* DeepLinkTests.swift */,
 				551E5C0F234D485A005FEE9E /* DeprecatedFunctionsTests.swift */,
-				AC750A49234CD67900561902 /* InAppHelperTests.swift */,
 				55AEA95825F05B7D00B38CED /* InAppMessageProcessorTests.swift */,
+				ACC3FD9D2536D7A30004A2E0 /* InAppFilePersistenceTests.swift */,
+				AC750A49234CD67900561902 /* InAppHelperTests.swift */,
 				AC6FDD8B20F56309005D811E /* InAppParsingTests.swift */,
 				55B37FED229F59290042F13A /* InAppPersistenceTests.swift */,
 				55CC257A2462064F00A77FD5 /* InAppPresenterTests.swift */,
+				55705A6825A78BF3009BDEE2 /* InAppPriorityTests.swift */,
 				ACA8D1A821965B7D001B1332 /* InAppTests.swift */,
-				ACC3FD9D2536D7A30004A2E0 /* InAppFilePersistenceTests.swift */,
 				55B549852397462300243E87 /* InboxImpressionTrackerTests.swift */,
 				55B37FC722975A840042F13A /* InboxMessageViewModelTests.swift */,
 				55B5498323973B5C00243E87 /* InboxSessionManagerTests.swift */,

tests/swift-sdk-swift-tests/InAppPriorityTests.swift

@@ -79,7 +79,7 @@ class InAppPriorityTests: XCTestCase {
             condition1.fulfill()
         }
 
-        let internalAPI = InternalIterableAPI.initializeForTesting(inAppFetcher: mockInAppFetcher,
+        let internalAPI = IterableAPIInternal.initializeForTesting(inAppFetcher: mockInAppFetcher,
                                                                    inAppDisplayer: mockInAppDisplayer)
         mockInAppFetcher.mockMessagesAvailableFromServer(internalApi: internalAPI, messages: messages)
 
@@ -99,7 +99,7 @@ class InAppPriorityTests: XCTestCase {
 
         let mockInAppFetcher = MockInAppFetcher()
 
-        let internalAPI = InternalIterableAPI.initializeForTesting(inAppFetcher: mockInAppFetcher)
+        let internalAPI = IterableAPIInternal.initializeForTesting(inAppFetcher: mockInAppFetcher)
 
         mockInAppFetcher.mockMessagesAvailableFromServer(internalApi: internalAPI, messages: messages).onSuccess { [weak internalAPI = internalAPI] _ in
             let originalMessages = messages.dropFirst()
@@ -131,7 +131,7 @@ class InAppPriorityTests: XCTestCase {
         }
 
         // Test will fail without assigning to internalAPI because InAppManager will be deallocated
-        let internalAPI = InternalIterableAPI.initializeForTesting(inAppFetcher: mockInAppFetcher,
+        let internalAPI = IterableAPIInternal.initializeForTesting(inAppFetcher: mockInAppFetcher,
                                                                    inAppDisplayer: mockInAppDisplayer)
         XCTAssertNotNil(internalAPI)
         wait(for: [condition1], timeout: testExpectationTimeout)
@@ -148,7 +148,7 @@ class InAppPriorityTests: XCTestCase {
         let mockInAppFetcher = MockInAppFetcher(messages: messages)
         let mockInAppPersister = MockInAppPersister()
 
-        _ = InternalIterableAPI.initializeForTesting(inAppFetcher: mockInAppFetcher,
+        _ = IterableAPIInternal.initializeForTesting(inAppFetcher: mockInAppFetcher,
                                                      inAppPersister: mockInAppPersister)
 
         XCTAssertEqual(messages.map { $0.priorityLevel }, mockInAppPersister.getMessages().map { $0.priorityLevel })