From cd55788144c62a424ae13b1d47d56eae29466667 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sat, 3 Oct 2020 12:15:32 -0700 Subject: [PATCH 1/2] fix(ios): remove VALID_ARCHS from cocoapods for xcode 12 --- lib/services/cocoapods-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/services/cocoapods-service.ts b/lib/services/cocoapods-service.ts index 5ebc257102..4a6439d576 100644 --- 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" From eb2c5e231f4fcecbd319e25d1445b42b9b7f5752 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Sat, 3 Oct 2020 12:18:49 -0700 Subject: [PATCH 2/2] fix: tests --- test/ios-project-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts index e15079f69f..60f18527e1 100644 --- 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"`,