Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude arm64 simulator from CocoaPods-managed targets in Xcode 12 #2667

Merged
merged 3 commits into from
Oct 1, 2020
Merged

Exclude arm64 simulator from CocoaPods-managed targets in Xcode 12 #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dee4e6
Lint podspecs using Xcode 12
1ec5 Sep 30, 2020
f77ae3e
Download Carthage from GitHub instead of Homebrew
1ec5 Sep 30, 2020
b3dc679
Exclude arm64 simulator from CocoaPods-managed projects in Xcode 12
frederoni Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -258,6 +259,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
Expand Down
9 changes: 9 additions & 0 deletions MapboxCoreNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions MapboxNavigation-Documentation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions MapboxNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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