From 8dee4e6ea85e62c8369376e7f98854631ce45941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 30 Sep 2020 08:32:25 -0700 Subject: [PATCH 1/3] Lint podspecs using Xcode 12 --- .circleci/config.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8871301828..f546feaa9bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -258,6 +258,17 @@ workflows: iOS: "10.3.1" test: false device: "iPhone 7 Plus" + - pod-job: + name: "Xcode_12.0_iOS_14.0_CP_install" + update: false + xcode: "12.0.0" + iOS: "14.0" + - pod-job: + name: "Xcode_12.0_iOS_14.0_CP_update" + update: true + xcode: "12.0.0" + iOS: "14.0" + lint: true - pod-job: name: "Xcode_11.4.1_iOS_12.2_CP_install" update: false From f77ae3eb7e792e38fd35fece03c8ea72a4c0c136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 30 Sep 2020 08:58:43 -0700 Subject: [PATCH 2/3] Download Carthage from GitHub instead of Homebrew --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f546feaa9bf..8d88ec05dd5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,8 @@ step-library: run: name: Update Carthage version command: | - brew update && brew upgrade carthage + curl -OL "https://github.com/Carthage/Carthage/releases/download/0.36.0/Carthage.pkg" + sudo installer -pkg Carthage.pkg -target / - &verify-missing-localizable-strings run: From b3dc679d182a065da4add6e7ec8cf32c2e99ee33 Mon Sep 17 00:00:00 2001 From: Fredrik Karlsson Date: Wed, 30 Sep 2020 08:20:14 -0700 Subject: [PATCH 3/3] Exclude arm64 simulator from CocoaPods-managed projects in Xcode 12 --- MapboxCoreNavigation.podspec | 9 +++++++++ MapboxNavigation-Documentation.podspec | 9 +++++++++ MapboxNavigation.podspec | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index 75f2f3c5a7e..27c052e4826 100644 --- a/MapboxCoreNavigation.podspec +++ b/MapboxCoreNavigation.podspec @@ -48,4 +48,13 @@ Pod::Spec.new do |s| s.swift_version = "5.0" + # https://github.com/mapbox/mapbox-navigation-ios/issues/2665 + s.user_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))', + 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8' + } + s.pod_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))', + 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8' + } end diff --git a/MapboxNavigation-Documentation.podspec b/MapboxNavigation-Documentation.podspec index 63aff7bc1c5..936cb1883d6 100644 --- a/MapboxNavigation-Documentation.podspec +++ b/MapboxNavigation-Documentation.podspec @@ -57,4 +57,13 @@ Pod::Spec.new do |s| s.swift_version = "5.0" + # https://github.com/mapbox/mapbox-navigation-ios/issues/2665 + s.user_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))', + 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8' + } + s.pod_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))', + 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8' + } end diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 06666a9d2d4..82442b8f120 100644 --- a/MapboxNavigation.podspec +++ b/MapboxNavigation.podspec @@ -51,4 +51,9 @@ Pod::Spec.new do |s| s.swift_version = "5.0" + # https://github.com/mapbox/mapbox-navigation-ios/issues/2665 + s.pod_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))', + 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8' + } end