Merge pull request #401 from calabash/feature/Xcode12_2

Support Xcode 12.2
calabash · Nov 25, 2020 · 1a1a762 · 1a1a762
2 parents 144f3ca + bc777c1
commit 1a1a762
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/DeviceAgent.xcodeproj/project.pbxproj b/DeviceAgent.xcodeproj/project.pbxproj
@@ -3876,7 +3876,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Karl Krukow (YTTN6Y2QS9)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = FYD86LA7RE;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
@@ -3918,7 +3918,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = FYD86LA7RE;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
@@ -4161,7 +4161,7 @@
 				DEVELOPMENT_TEAM = FYD86LA7RE;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = armv7s;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor",
@@ -4202,7 +4202,7 @@
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=*]" = armv7s;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator14.0]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Vendor",

diff --git a/bin/make/unit-tests.rb b/bin/make/unit-tests.rb
@@ -30,6 +30,8 @@
         "-destination", "id=#{sim_udid}",
         "-sdk", "iphonesimulator",
         "-configuration", "Debug",
+        "ARCHS=x86_64",
+        "VALID_ARCHS=x86_64",
         "GCC_TREAT_WARNINGS_AS_ERRORS=YES",
         "CLANG_ENABLE_CODE_COVERAGE=NO",
         "OTHER_CFLAGS=-Xclang -Wno-switch"