fix(ios): remove VALID_ARCHS from cocoapods for xcode 12 (#5407)

* fix(ios): remove VALID_ARCHS from cocoapods for xcode 12 * fix: tests
NativeScript · Oct 3, 2020 · 03ecac9 · 03ecac9
1 parent 78d0e73
commit 03ecac9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/services/cocoapods-service.ts b/lib/services/cocoapods-service.ts
@@ -146,6 +146,7 @@ ${versionResolutionHint}`);
 			const exclusions = `
 post_install do |installer|
   installer.pods_project.build_configurations.each do |config|
+    config.build_settings.delete "VALID_ARCHS"
     config.build_settings["EXCLUDED_ARCHS_x86_64"] = "arm64 arm64e"
     config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))"
     config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"

diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
@@ -268,6 +268,7 @@ describe("Cocoapods support", () => {
 				`# Begin Podfile - ${projectPath}/platforms/ios/Podfile-exclusions`,
 				`def post_installNativeScript_CLI_Architecture_Exclusions_0 (installer)`,
 				`  installer.pods_project.build_configurations.each do |config|`,
+				`    config.build_settings.delete "VALID_ARCHS"`,
 				`    config.build_settings["EXCLUDED_ARCHS_x86_64"] = "arm64 arm64e"`,
 				`    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))"`,
 				`    config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"`,