Fix framework search paths

Make the frameworks search path recursive

Set build active archs to yes on test targets

Add x86_64 to valid archs

Add VALID_ARCHS

Add standard archs to test targets

Restore Xcodeproj

Make framework search paths non-recursive

Add individual search paths to test target

Remove catch-all search path

Link the test frameworks with the test apps

Author: Widcket

Guardian.xcodeproj/project.pbxproj

@@ -44,6 +44,12 @@
 		5C19E567266515DF00F167EC /* Nimble.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C19E561266515D000F167EC /* Nimble.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5C19E568266515DF00F167EC /* OHHTTPStubs.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C19E562266515D100F167EC /* OHHTTPStubs.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5C19E569266515DF00F167EC /* Quick.xcframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C19E563266515D100F167EC /* Quick.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5C19E56D266571C400F167EC /* Nimble.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E561266515D000F167EC /* Nimble.xcframework */; };
+		5C19E56E266571C400F167EC /* OHHTTPStubs.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E562266515D100F167EC /* OHHTTPStubs.xcframework */; };
+		5C19E56F266571C400F167EC /* Quick.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E563266515D100F167EC /* Quick.xcframework */; };
+		5C19E570266571C800F167EC /* Nimble.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E561266515D000F167EC /* Nimble.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5C19E571266571C800F167EC /* OHHTTPStubs.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E562266515D100F167EC /* OHHTTPStubs.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		5C19E572266571C800F167EC /* Quick.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5C19E563266515D100F167EC /* Quick.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5F07A58521092C7D00819FA2 /* ClientInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F07A58421092C7D00819FA2 /* ClientInfo.swift */; };
 		5F07A58721092F2300819FA2 /* ClientInfoSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F07A58621092F2300819FA2 /* ClientInfoSpec.swift */; };
 		5F07A589210A57C200819FA2 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F07A588210A57C200819FA2 /* Events.swift */; };
@@ -137,6 +143,9 @@
 			files = (
 				23FE50841D949EC400407A1D /* Guardian.framework in Embed Frameworks */,
 				5C19E55E266515A600F167EC /* SimpleKeychain.xcframework in Embed Frameworks */,
+				5C19E570266571C800F167EC /* Nimble.xcframework in Embed Frameworks */,
+				5C19E571266571C800F167EC /* OHHTTPStubs.xcframework in Embed Frameworks */,
+				5C19E572266571C800F167EC /* Quick.xcframework in Embed Frameworks */,
 				5C19E560266515A600F167EC /* QRCodeReader.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -285,6 +294,9 @@
 				23FE50831D949EC400407A1D /* Guardian.framework in Frameworks */,
 				5C19E55D266515A600F167EC /* SimpleKeychain.xcframework in Frameworks */,
 				5C19E55F266515A600F167EC /* QRCodeReader.xcframework in Frameworks */,
+				5C19E56D266571C400F167EC /* Nimble.xcframework in Frameworks */,
+				5C19E56E266571C400F167EC /* OHHTTPStubs.xcframework in Frameworks */,
+				5C19E56F266571C400F167EC /* Quick.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1029,10 +1041,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				DEVELOPMENT_TEAM = 86WQXF56BC;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = GuardianTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1052,10 +1061,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				DEVELOPMENT_TEAM = 86WQXF56BC;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = GuardianTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1080,7 +1086,7 @@
 				DEVELOPMENT_TEAM = 86WQXF56BC;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
+					"$(PROJECT_DIR)/Carthage/Build/**",
 				);
 				INFOPLIST_FILE = GuardianApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -1110,7 +1116,7 @@
 				DEVELOPMENT_TEAM = 86WQXF56BC;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
+					"$(PROJECT_DIR)/Carthage/Build/**",
 				);
 				INFOPLIST_FILE = GuardianApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;