Skip to content

Commit a6b4871

Browse files
designatednerddesignatednerd
authored
Merge pull request #1280 from apollographql/betas/xcode-12
Xcode 12 + iOS 14 + Swift 5.3 + associated Updates
2 parents abd2b65 + 10f05b9 commit a6b4871

30 files changed

Lines changed: 578 additions & 41 deletions

‎.circleci/config.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ version: 2.1
33
parameters:
44
xcode_version:
55
type: string
6-
default: "11.6.0"
6+
default: "12.0.0"
77
ios_current_version:
88
type: string
9-
default: "13.6"
9+
default: "14.0"
1010
ios_previous_version:
1111
type: string
12-
default: "12.4"
12+
default: "13.5"
1313
ios_sdk:
1414
type: string
15-
default: "iphonesimulator13.6"
15+
default: "iphonesimulator14.0"
1616
macos_version: # The user-facing version string for macOS builds
1717
type: string
18-
default: "10.15"
18+
default: "11.0"
1919
macos_sdk: # The full SDK string to use for macOS builds
2020
type: string
21-
default: "macosx10.15"
21+
default: "macosx11.0"
2222
tvos_version: # The user-facing version string of tvOS builds
2323
type: string
24-
default: "13.4"
24+
default: "14.0"
2525
tvos_sdk:
2626
type: string
27-
default: "appletvsimulator13.4"
27+
default: "appletvsimulator14.0"
2828

2929
commands:
3030
common_test_steps:
@@ -89,7 +89,7 @@ jobs:
8989
macos:
9090
xcode: << pipeline.parameters.xcode_version >>
9191
environment:
92-
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
92+
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
9393
CIRCLE_XCODE_SCHEME: Apollo
9494
CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
9595
steps:
@@ -129,7 +129,7 @@ jobs:
129129
macos:
130130
xcode: << pipeline.parameters.xcode_version >>
131131
environment:
132-
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
132+
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
133133
CIRCLE_XCODE_SCHEME: ApolloSQLite
134134
CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
135135
steps:
@@ -159,7 +159,7 @@ jobs:
159159
macos:
160160
xcode: << pipeline.parameters.xcode_version >>
161161
environment:
162-
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
162+
DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
163163
CIRCLE_XCODE_SCHEME: ApolloWebSocket
164164
CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
165165
steps:

‎Apollo.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@
582582
9BAEEC14234C132600808306 /* CLIExtractorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLIExtractorTests.swift; sourceTree = "<group>"; };
583583
9BAEEC16234C275600808306 /* ApolloSchemaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloSchemaTests.swift; sourceTree = "<group>"; };
584584
9BAEEC18234C297800808306 /* ApolloCodegenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloCodegenTests.swift; sourceTree = "<group>"; };
585+
9BB1DAC624A66B2500396235 /* ApolloMacPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = ApolloMacPlayground.playground; path = Playgrounds/ApolloMacPlayground.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
585586
9BC2D9CE233C3531007BD083 /* Apollo-Target-ApolloCodegen.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-ApolloCodegen.xcconfig"; sourceTree = "<group>"; };
586587
9BC2D9D1233C6DC0007BD083 /* Basher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Basher.swift; sourceTree = "<group>"; };
587588
9BCF0CD923FC9CA50031D2A2 /* TestCacheProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCacheProvider.swift; sourceTree = "<group>"; };
@@ -1377,6 +1378,7 @@
13771378
9FC750461D2A532C00458D91 /* Apollo */ = {
13781379
isa = PBXGroup;
13791380
children = (
1381+
9BB1DAC624A66B2500396235 /* ApolloMacPlayground.playground */,
13801382
9FC750621D2A59F600458D91 /* ApolloClient.swift */,
13811383
9B708AAC2305884500604A11 /* ApolloClientProtocol.swift */,
13821384
9FC9A9D21E2FD48B0023C4D5 /* GraphQLError.swift */,
@@ -1898,7 +1900,7 @@
18981900
isa = PBXProject;
18991901
attributes = {
19001902
LastSwiftUpdateCheck = 1130;
1901-
LastUpgradeCheck = 1130;
1903+
LastUpgradeCheck = 1200;
19021904
ORGANIZATIONNAME = "Apollo GraphQL";
19031905
TargetAttributes = {
19041906
9B2DFBB524E1FA0D00ED3AE6 = {

‎Apollo.xcodeproj/xcshareddata/xcschemes/Apollo Playground.xcscheme‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1200"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "9FC750431D2A532C00458D91"
18+
BuildableName = "Apollo.framework"
19+
BlueprintName = "Apollo"
20+
ReferencedContainer = "container:Apollo.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "9FCE2CF91E6C213D00E34457"
32+
BuildableName = "StarWarsAPI.framework"
33+
BlueprintName = "StarWarsAPI"
34+
ReferencedContainer = "container:Apollo.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "YES"
40+
buildForProfiling = "YES"
41+
buildForArchiving = "YES"
42+
buildForAnalyzing = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "9B7BDA7C23FDE90400ACD198"
46+
BuildableName = "ApolloWebSocket.framework"
47+
BlueprintName = "ApolloWebSocket"
48+
ReferencedContainer = "container:Apollo.xcodeproj">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
</BuildActionEntries>
52+
</BuildAction>
53+
<TestAction
54+
buildConfiguration = "Debug"
55+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
56+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57+
shouldUseLaunchSchemeArgsEnv = "NO"
58+
codeCoverageEnabled = "YES"
59+
onlyGenerateCoverageForSpecifiedTargets = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "9FC750431D2A532C00458D91"
64+
BuildableName = "Apollo.framework"
65+
BlueprintName = "Apollo"
66+
ReferencedContainer = "container:Apollo.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
<EnvironmentVariables>
70+
<EnvironmentVariable
71+
key = "APOLLO_TEST_CACHE_PROVIDER"
72+
value = "ApolloTestSupport.InMemoryTestCacheProvider"
73+
isEnabled = "YES">
74+
</EnvironmentVariable>
75+
</EnvironmentVariables>
76+
<CodeCoverageTargets>
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "9FC750431D2A532C00458D91"
80+
BuildableName = "Apollo.framework"
81+
BlueprintName = "Apollo"
82+
ReferencedContainer = "container:Apollo.xcodeproj">
83+
</BuildableReference>
84+
</CodeCoverageTargets>
85+
<Testables>
86+
<TestableReference
87+
skipped = "NO">
88+
<BuildableReference
89+
BuildableIdentifier = "primary"
90+
BlueprintIdentifier = "9FC7504D1D2A532D00458D91"
91+
BuildableName = "ApolloTests.xctest"
92+
BlueprintName = "ApolloTests"
93+
ReferencedContainer = "container:Apollo.xcodeproj">
94+
</BuildableReference>
95+
</TestableReference>
96+
<TestableReference
97+
skipped = "NO">
98+
<BuildableReference
99+
BuildableIdentifier = "primary"
100+
BlueprintIdentifier = "9FA6ABBB1EC0A988000017BE"
101+
BuildableName = "ApolloCacheDependentTests.xctest"
102+
BlueprintName = "ApolloCacheDependentTests"
103+
ReferencedContainer = "container:Apollo.xcodeproj">
104+
</BuildableReference>
105+
<SkippedTests>
106+
<Test
107+
Identifier = "SQLiteFetchQueryTests">
108+
</Test>
109+
<Test
110+
Identifier = "SQLiteLoadQueryFromStoreTests">
111+
</Test>
112+
<Test
113+
Identifier = "SQLiteReadWriteFromStoreTests">
114+
</Test>
115+
<Test
116+
Identifier = "SQLiteStarWarsServerAPQsGetMethodTests">
117+
</Test>
118+
<Test
119+
Identifier = "SQLiteStarWarsServerAPQsTests">
120+
</Test>
121+
<Test
122+
Identifier = "SQLiteStarWarsServerCachingRoundtripTests">
123+
</Test>
124+
<Test
125+
Identifier = "SQLiteStarWarsServerTests">
126+
</Test>
127+
<Test
128+
Identifier = "SQLiteWatchQueryTests">
129+
</Test>
130+
</SkippedTests>
131+
</TestableReference>
132+
</Testables>
133+
</TestAction>
134+
<LaunchAction
135+
buildConfiguration = "Debug"
136+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
137+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
138+
launchStyle = "0"
139+
useCustomWorkingDirectory = "NO"
140+
ignoresPersistentStateOnLaunch = "NO"
141+
debugDocumentVersioning = "YES"
142+
debugServiceExtension = "internal"
143+
allowLocationSimulation = "YES">
144+
<MacroExpansion>
145+
<BuildableReference
146+
BuildableIdentifier = "primary"
147+
BlueprintIdentifier = "9FC750431D2A532C00458D91"
148+
BuildableName = "Apollo.framework"
149+
BlueprintName = "Apollo"
150+
ReferencedContainer = "container:Apollo.xcodeproj">
151+
</BuildableReference>
152+
</MacroExpansion>
153+
</LaunchAction>
154+
<ProfileAction
155+
buildConfiguration = "Release"
156+
shouldUseLaunchSchemeArgsEnv = "YES"
157+
savedToolIdentifier = ""
158+
useCustomWorkingDirectory = "NO"
159+
debugDocumentVersioning = "YES">
160+
<MacroExpansion>
161+
<BuildableReference
162+
BuildableIdentifier = "primary"
163+
BlueprintIdentifier = "9FC750431D2A532C00458D91"
164+
BuildableName = "Apollo.framework"
165+
BlueprintName = "Apollo"
166+
ReferencedContainer = "container:Apollo.xcodeproj">
167+
</BuildableReference>
168+
</MacroExpansion>
169+
</ProfileAction>
170+
<AnalyzeAction
171+
buildConfiguration = "Debug">
172+
</AnalyzeAction>
173+
<ArchiveAction
174+
buildConfiguration = "Release"
175+
revealArchiveInOrganizer = "YES">
176+
</ArchiveAction>
177+
</Scheme>

‎Apollo.xcodeproj/xcshareddata/xcschemes/Apollo.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCodegenLib.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCore.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1150"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Apollo.xcodeproj/xcshareddata/xcschemes/ApolloSQLite.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Apollo.xcodeproj/xcshareddata/xcschemes/ApolloWebSocket.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Configuration/Apollo/Apollo-Target-ApolloCodegen.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ SDKROOT = macosx
44
SUPPORTED_PLATFORMS = macosx
55

66
ENABLE_BITCODE = NO
7-
VALID_ARCHS = x86_64

‎Configuration/Apollo/Apollo-Target-ApolloCodegenLib.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
INFOPLIST_FILE = Sources/ApolloCodegenLib/Info.plist
44
SUPPORTED_PLATFORMS = macosx
55
SDKROOT = macosx
6-
VALID_ARCHS = x86_64

0 commit comments

Comments
 (0)
⚡