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

Xcode 12 + iOS 14 + Swift 5.3 + associated Updates #1280

Merged
merged 19 commits into from
Sep 15, 2020
Merged

Xcode 12 + iOS 14 + Swift 5.3 + associated Updates #1280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1a1e85f
(rebased)
designatednerd Jun 26, 2020
6fa0ee5
Update #file -> #filePath in File Finder
designatednerd Jun 26, 2020
2f0fa19
add warning about quoted include in framework header as suggested by …
designatednerd Jun 26, 2020
5251dfe
Add playground demoing mutations / queries / subscriptions [Xcode 12 …
designatednerd Jun 27, 2020
1760e61
point at the Circle 12.0 image and associated versions
designatednerd Jun 29, 2020
b2e2ebf
update macos SDK to 11.0
designatednerd Jun 29, 2020
a05ea3f
Use 10.16 sdk for macosx
designatednerd Jun 29, 2020
9d7a22f
use 13.5 as previous iOS version
designatednerd Jun 29, 2020
7eba72e
The user facing string is 11.0, whatever the underlying value is
designatednerd Jun 29, 2020
840af1a
apparently the 12.0 image doesn't believe in the iPhone Xs
designatednerd Jun 30, 2020
212466f
poke apollo core for Xcode 12
designatednerd Jul 8, 2020
3636ba0
add arm64 to valid macOS architectures to support Apple Silicon
designatednerd Jul 8, 2020
50cd340
Add SQLite setup playground page
designatednerd Jul 14, 2020
9ee6ff1
add note about sqlite file browser and/or kick the build
designatednerd Aug 4, 2020
4ca3610
Update macosx SDK
designatednerd Aug 6, 2020
319fbdd
fix #file -> #filePath that got borked in a rebase
designatednerd Aug 19, 2020
1ffd86a
remove unndecessary _ on a void function
designatednerd Aug 19, 2020
3523002
fix another #file -> #filePath
designatednerd Aug 19, 2020
10f05b9
Get rid of VALID_ARCHS setting since this is now covered by other set…
designatednerd Sep 15, 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
Prev Previous commit
Next Next commit
add arm64 to valid macOS architectures to support Apple Silicon
  • Loading branch information
@designatednerd
designatednerd committed Sep 15, 2020
commit 3636ba05928fafda868b401bf7cadf83f4340bb8
2 changes: 1 addition & 1 deletion Configuration/Apollo/Apollo-Target-ApolloCodegen.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ SDKROOT = macosx
SUPPORTED_PLATFORMS = macosx

ENABLE_BITCODE = NO
VALID_ARCHS = x86_64
VALID_ARCHS = x86_64 arm64
2 changes: 1 addition & 1 deletion Configuration/Apollo/Apollo-Target-ApolloCodegenLib.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
INFOPLIST_FILE = Sources/ApolloCodegenLib/Info.plist
SUPPORTED_PLATFORMS = macosx
SDKROOT = macosx
VALID_ARCHS = x86_64
VALID_ARCHS = x86_64 arm64
4 changes: 2 additions & 2 deletions Configuration/Shared/Workspace-Universal-Framework.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvsimulator appletvos watchs
// iOS-specific default settings
SDKROOT[sdk=iphone*] = iphoneos
VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
VALID_ARCHS[sdk=iphonesimulator*] = x86_64 i386
VALID_ARCHS[sdk=iphonesimulator*] = x86_64 arm64
TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2

// TV-specific default settings
Expand All @@ -19,7 +19,7 @@ TARGETED_DEVICE_FAMILY[sdk=watch*] = 4

// macOS-specific default settings
SDKROOT[sdk=macosx*] = macosx
VALID_ARCHS[sdk=macosx*] = x86_64
VALID_ARCHS[sdk=macosx*] = x86_64 arm64
SUPPORTS_MACCATALYST = YES

// Enable Bitcode only for actual devices, not for macOS or simulators
Expand Down