chore: fix imports

external/expect

@@ -1 +1 @@
-Subproject commit d044ccd4c55d936f71e5c97f0f05f15bfaac859e
+Subproject commit ff7cd322bd883b085d383253ceefb27933e6d6cf

serializer.xcodeproj/project.pbxproj

@@ -68,6 +68,48 @@
 			remoteGlobalIDString = CD266886252FFAAE00B3E667;
 			remoteInfo = "string_utils-test";
 		};
+		CDD476CC29C5468E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD476C629C5468E00BDB829 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDD476BD29C5423B00BDB829;
+			remoteInfo = expect;
+		};
+		CDD476CE29C5468E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD476C629C5468E00BDB829 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDEC1E8A235248390091D9F2;
+			remoteInfo = "expect-test";
+		};
+		CDD476D629C5469300BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD476C629C5468E00BDB829 /* expect.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CDD476BC29C5423B00BDB829;
+			remoteInfo = expect;
+		};
+		CDD476D829C5469300BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CD592C3729C3DC84009AC14E /* string-utils.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CD266861252FF4B600B3E667;
+			remoteInfo = "string-utils";
+		};
+		CDD4770C29C5472200BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD476C629C5468E00BDB829 /* expect.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CDD476BC29C5423B00BDB829;
+			remoteInfo = expect;
+		};
+		CDD4770E29C5472200BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CD592C3729C3DC84009AC14E /* string-utils.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CD266861252FF4B600B3E667;
+			remoteInfo = "string-utils";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -85,6 +127,7 @@
 		CD592C2629C3DC65009AC14E /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = ../../../../../../../../opt/local/lib/libjsoncpp.a; sourceTree = "<group>"; };
 		CD592C2829C3DC76009AC14E /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CD592C3729C3DC84009AC14E /* string-utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "string-utils.xcodeproj"; path = "external/string-utils/string-utils.xcodeproj"; sourceTree = "<group>"; };
+		CDD476C629C5468E00BDB829 /* expect.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = expect.xcodeproj; path = external/expect/expect.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -111,6 +154,7 @@
 			isa = PBXGroup;
 			children = (
 				CD592C2829C3DC76009AC14E /* GoogleMock.xcodeproj */,
+				CDD476C629C5468E00BDB829 /* expect.xcodeproj */,
 				CD592C3729C3DC84009AC14E /* string-utils.xcodeproj */,
 				CD592C0629C2A5EB009AC14E /* serializer */,
 				CD592C0429C2A5E0009AC14E /* include */,
@@ -195,6 +239,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		CDD476C729C5468E00BDB829 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDD476CD29C5468E00BDB829 /* libexpect.a */,
+				CDD476CF29C5468E00BDB829 /* expect-test.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -225,6 +278,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				CDD476D729C5469300BDB829 /* PBXTargetDependency */,
+				CDD476D929C5469300BDB829 /* PBXTargetDependency */,
 			);
 			name = serializer;
 			productName = serializer;
@@ -242,6 +297,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				CDD4770D29C5472200BDB829 /* PBXTargetDependency */,
+				CDD4770F29C5472200BDB829 /* PBXTargetDependency */,
 				CD592C1D29C3DB32009AC14E /* PBXTargetDependency */,
 			);
 			name = "serializer-test";
@@ -279,6 +336,10 @@
 			productRefGroup = CD592BFE29C2A5BF009AC14E /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = CDD476C729C5468E00BDB829 /* Products */;
+					ProjectRef = CDD476C629C5468E00BDB829 /* expect.xcodeproj */;
+				},
 				{
 					ProductGroup = CD592C2929C3DC76009AC14E /* Products */;
 					ProjectRef = CD592C2829C3DC76009AC14E /* GoogleMock.xcodeproj */;
@@ -339,6 +400,20 @@
 			remoteRef = CD592C3F29C3DC85009AC14E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		CDD476CD29C5468E00BDB829 /* libexpect.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libexpect.a;
+			remoteRef = CDD476CC29C5468E00BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD476CF29C5468E00BDB829 /* expect-test.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "expect-test.xctest";
+			remoteRef = CDD476CE29C5468E00BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -375,6 +450,26 @@
 			target = CD592BFC29C2A5BF009AC14E /* serializer */;
 			targetProxy = CD592C1C29C3DB32009AC14E /* PBXContainerItemProxy */;
 		};
+		CDD476D729C5469300BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = expect;
+			targetProxy = CDD476D629C5469300BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD476D929C5469300BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "string-utils";
+			targetProxy = CDD476D829C5469300BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD4770D29C5472200BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = expect;
+			targetProxy = CDD4770C29C5472200BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD4770F29C5472200BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "string-utils";
+			targetProxy = CDD4770E29C5472200BDB829 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -434,11 +529,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = (
+					/usr/local/include,
 					/opt/local/include,
 					"$(PROJECT_DIR)/include",
-					"$(PROJECT_DIR)/external/string-utils/include",
-					"$(PROJECT_DIR)/external/magic_enum/include",
-					"$(PROJECT_DIR)/external/expect/include",
+					"$(TARGET_BUILD_DIR)/usr/local/include",
 				);
 			};
 			name = Debug;
@@ -492,11 +586,10 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = (
+					/usr/local/include,
 					/opt/local/include,
 					"$(PROJECT_DIR)/include",
-					"$(PROJECT_DIR)/external/string-utils/include",
-					"$(PROJECT_DIR)/external/magic_enum/include",
-					"$(PROJECT_DIR)/external/expect/include",
+					"$(TARGET_BUILD_DIR)/usr/local/include",
 				);
 			};
 			name = Release;