chore: fix imports

engine.xcodeproj/project.pbxproj

@@ -96,7 +96,70 @@
 			remoteGlobalIDString = CD592BDA29C2A399009AC14E;
 			remoteInfo = engine;
 		};
-		CDD4760929C4FFC100BDB829 /* PBXContainerItemProxy */ = {
+		CDD4772C29C5492700BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4772629C5492700BDB829 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDD476BD29C5423B00BDB829;
+			remoteInfo = expect;
+		};
+		CDD4772E29C5492700BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4772629C5492700BDB829 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDEC1E8A235248390091D9F2;
+			remoteInfo = "expect-test";
+		};
+		CDD4773D29C5492E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4773729C5492E00BDB829 /* reflection.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CD2FF8FE2310BE7C00ABA548;
+			remoteInfo = "reflection-test";
+		};
+		CDD4773F29C5492E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4773729C5492E00BDB829 /* reflection.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDA9561728726941006ACEC2;
+			remoteInfo = reflection;
+		};
+		CDD4774B29C5493400BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4774129C5493400BDB829 /* serializer.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CD592BFD29C2A5BF009AC14E;
+			remoteInfo = serializer;
+		};
+		CDD4774D29C5493400BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4774129C5493400BDB829 /* serializer.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CD592C1729C3DB32009AC14E;
+			remoteInfo = "serializer-test";
+		};
+		CDD4775129C5498E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4773729C5492E00BDB829 /* reflection.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CDA9561628726941006ACEC2;
+			remoteInfo = reflection;
+		};
+		CDD4775329C5498E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4774129C5493400BDB829 /* serializer.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CD592BFC29C2A5BF009AC14E;
+			remoteInfo = serializer;
+		};
+		CDD4775529C5498E00BDB829 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDD4759D29C4CDB500BDB829 /* shared_random_generator.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CDED6A4121B2F5A700AB91D0;
+			remoteInfo = shared_random_generator;
+		};
+		CDD4777129C54A6000BDB829 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CDD4759D29C4CDB500BDB829 /* shared_random_generator.xcodeproj */;
 			proxyType = 1;
@@ -133,6 +196,9 @@
 		CDD4760029C4D93E00BDB829 /* engine_test_xc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = engine_test_xc.mm; sourceTree = "<group>"; };
 		CDD4760629C4DB2400BDB829 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		CDD4760729C4FE1900BDB829 /* condition_test.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = condition_test.cxx; sourceTree = "<group>"; };
+		CDD4772629C5492700BDB829 /* expect.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = expect.xcodeproj; path = external/expect/expect.xcodeproj; sourceTree = "<group>"; };
+		CDD4773729C5492E00BDB829 /* reflection.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = reflection.xcodeproj; path = external/reflection/reflection.xcodeproj; sourceTree = "<group>"; };
+		CDD4774129C5493400BDB829 /* serializer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = serializer.xcodeproj; path = external/serializer/serializer.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -162,8 +228,11 @@
 			isa = PBXGroup;
 			children = (
 				CDD475B129C4CDBF00BDB829 /* GoogleMock.xcodeproj */,
-				CDD475A729C4CDBA00BDB829 /* string-utils.xcodeproj */,
+				CDD4772629C5492700BDB829 /* expect.xcodeproj */,
+				CDD4773729C5492E00BDB829 /* reflection.xcodeproj */,
+				CDD4774129C5493400BDB829 /* serializer.xcodeproj */,
 				CDD4759D29C4CDB500BDB829 /* shared_random_generator.xcodeproj */,
+				CDD475A729C4CDBA00BDB829 /* string-utils.xcodeproj */,
 				CD592BE529C2A3E0009AC14E /* engine */,
 				CD592BE229C2A3C8009AC14E /* include */,
 				CD592BE429C2A3C8009AC14E /* src */,
@@ -284,6 +353,33 @@
 			path = resources;
 			sourceTree = "<group>";
 		};
+		CDD4772729C5492700BDB829 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDD4772D29C5492700BDB829 /* libexpect.a */,
+				CDD4772F29C5492700BDB829 /* expect-test.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CDD4773829C5492E00BDB829 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDD4773E29C5492E00BDB829 /* reflection-test.xctest */,
+				CDD4774029C5492E00BDB829 /* libreflection.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CDD4774229C5493400BDB829 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDD4774C29C5493400BDB829 /* libserializer.a */,
+				CDD4774E29C5493400BDB829 /* serializer-test.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -316,6 +412,9 @@
 			buildRules = (
 			);
 			dependencies = (
+				CDD4775229C5498E00BDB829 /* PBXTargetDependency */,
+				CDD4775429C5498E00BDB829 /* PBXTargetDependency */,
+				CDD4775629C5498E00BDB829 /* PBXTargetDependency */,
 			);
 			name = engine;
 			productName = engine_base;
@@ -333,7 +432,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				CDD4760A29C4FFC100BDB829 /* PBXTargetDependency */,
+				CDD4777229C54A6000BDB829 /* PBXTargetDependency */,
 				CDD475CA29C4D2BF00BDB829 /* PBXTargetDependency */,
 			);
 			name = "engine-test";
@@ -371,10 +470,22 @@
 			productRefGroup = CD592BDC29C2A399009AC14E /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = CDD4772729C5492700BDB829 /* Products */;
+					ProjectRef = CDD4772629C5492700BDB829 /* expect.xcodeproj */;
+				},
 				{
 					ProductGroup = CDD475B229C4CDBF00BDB829 /* Products */;
 					ProjectRef = CDD475B129C4CDBF00BDB829 /* GoogleMock.xcodeproj */;
 				},
+				{
+					ProductGroup = CDD4773829C5492E00BDB829 /* Products */;
+					ProjectRef = CDD4773729C5492E00BDB829 /* reflection.xcodeproj */;
+				},
+				{
+					ProductGroup = CDD4774229C5493400BDB829 /* Products */;
+					ProjectRef = CDD4774129C5493400BDB829 /* serializer.xcodeproj */;
+				},
 				{
 					ProductGroup = CDD4759E29C4CDB500BDB829 /* Products */;
 					ProjectRef = CDD4759D29C4CDB500BDB829 /* shared_random_generator.xcodeproj */;
@@ -449,6 +560,48 @@
 			remoteRef = CDD475BE29C4CDBF00BDB829 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		CDD4772D29C5492700BDB829 /* libexpect.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libexpect.a;
+			remoteRef = CDD4772C29C5492700BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD4772F29C5492700BDB829 /* expect-test.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "expect-test.xctest";
+			remoteRef = CDD4772E29C5492700BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD4773E29C5492E00BDB829 /* reflection-test.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "reflection-test.xctest";
+			remoteRef = CDD4773D29C5492E00BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD4774029C5492E00BDB829 /* libreflection.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libreflection.a;
+			remoteRef = CDD4773F29C5492E00BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD4774C29C5493400BDB829 /* libserializer.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libserializer.a;
+			remoteRef = CDD4774B29C5493400BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDD4774E29C5493400BDB829 /* serializer-test.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "serializer-test.xctest";
+			remoteRef = CDD4774D29C5493400BDB829 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -494,10 +647,25 @@
 			target = CD592BDA29C2A399009AC14E /* engine */;
 			targetProxy = CDD475C929C4D2BF00BDB829 /* PBXContainerItemProxy */;
 		};
-		CDD4760A29C4FFC100BDB829 /* PBXTargetDependency */ = {
+		CDD4775229C5498E00BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = reflection;
+			targetProxy = CDD4775129C5498E00BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD4775429C5498E00BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = serializer;
+			targetProxy = CDD4775329C5498E00BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD4775629C5498E00BDB829 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = shared_random_generator;
+			targetProxy = CDD4775529C5498E00BDB829 /* PBXContainerItemProxy */;
+		};
+		CDD4777229C54A6000BDB829 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = shared_random_generator;
-			targetProxy = CDD4760929C4FFC100BDB829 /* PBXContainerItemProxy */;
+			targetProxy = CDD4777129C54A6000BDB829 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -558,14 +726,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = (
+					/usr/local/include,
 					/opt/local/include,
 					"$(PROJECT_DIR)/include",
-					"$(PROJECT_DIR)/external/expect/include",
-					"$(PROJECT_DIR)/external/magic_enum/include",
-					"$(PROJECT_DIR)/external/reflection/include",
-					"$(PROJECT_DIR)/external/serializer/include",
-					"$(PROJECT_DIR)/external/shared_random_generator/include",
-					"$(PROJECT_DIR)/external/string-utils/include",
+					"$(TARGET_BUILD_DIR)/usr/local/include",
 				);
 			};
 			name = Debug;
@@ -619,14 +783,10 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = (
+					/usr/local/include,
 					/opt/local/include,
 					"$(PROJECT_DIR)/include",
-					"$(PROJECT_DIR)/external/expect/include",
-					"$(PROJECT_DIR)/external/magic_enum/include",
-					"$(PROJECT_DIR)/external/reflection/include",
-					"$(PROJECT_DIR)/external/serializer/include",
-					"$(PROJECT_DIR)/external/shared_random_generator/include",
-					"$(PROJECT_DIR)/external/string-utils/include",
+					"$(TARGET_BUILD_DIR)/usr/local/include",
 				);
 			};
 			name = Release;

external/expect

@@ -1 +1 @@
-Subproject commit f096edddd9d8eb2ba07c2dd7ec385500c0576214
+Subproject commit ff7cd322bd883b085d383253ceefb27933e6d6cf

external/serializer

@@ -1 +1 @@
-Subproject commit 36cebc397311635b3cb6708e7836e0ab8dea34f2
+Subproject commit f8cb7ab65da9b002884d3f56e76bb44bb9e7ae61