apollographql · designatednerd · Sep 15, 2020 · Jun 26, 2020 · Jun 26, 2020 · Jun 26, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,28 +3,28 @@ version: 2.1
 parameters:
   xcode_version:
     type: string
-    default: "11.6.0"
+    default: "12.0.0"
   ios_current_version:
     type: string
-    default: "13.6"
+    default: "14.0"
   ios_previous_version:
     type: string
-    default: "12.4"
+    default: "13.5"
   ios_sdk:
     type: string
-    default: "iphonesimulator13.6"
+    default: "iphonesimulator14.0"
   macos_version: # The user-facing version string for macOS builds
     type: string
-    default: "10.15"
+    default: "11.0"
   macos_sdk: # The full SDK string to use for macOS builds
     type: string
-    default: "macosx10.15"
+    default: "macosx11.0"
   tvos_version: # The user-facing version string of tvOS builds
     type: string
-    default: "13.4"
+    default: "14.0"
   tvos_sdk:
     type: string
-    default: "appletvsimulator13.4"
+    default: "appletvsimulator14.0"
 
 commands:
   common_test_steps:
@@ -89,7 +89,7 @@ jobs:
     macos:
       xcode: << pipeline.parameters.xcode_version >>
     environment:
-      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
+      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
       CIRCLE_XCODE_SCHEME: Apollo
       CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
     steps:
@@ -129,7 +129,7 @@ jobs:
     macos:
       xcode: << pipeline.parameters.xcode_version >>
     environment:
-      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
+      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
       CIRCLE_XCODE_SCHEME: ApolloSQLite
       CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
     steps:
@@ -159,7 +159,7 @@ jobs:
     macos:
       xcode: << pipeline.parameters.xcode_version >>
     environment:
-      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone Xs
+      DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 11
       CIRCLE_XCODE_SCHEME: ApolloWebSocket
       CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >>
     steps:

diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj
@@ -582,6 +582,7 @@
 		9BAEEC14234C132600808306 /* CLIExtractorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLIExtractorTests.swift; sourceTree = "<group>"; };
 		9BAEEC16234C275600808306 /* ApolloSchemaTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloSchemaTests.swift; sourceTree = "<group>"; };
 		9BAEEC18234C297800808306 /* ApolloCodegenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloCodegenTests.swift; sourceTree = "<group>"; };
+		9BB1DAC624A66B2500396235 /* ApolloMacPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = ApolloMacPlayground.playground; path = Playgrounds/ApolloMacPlayground.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		9BC2D9CE233C3531007BD083 /* Apollo-Target-ApolloCodegen.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-ApolloCodegen.xcconfig"; sourceTree = "<group>"; };
 		9BC2D9D1233C6DC0007BD083 /* Basher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Basher.swift; sourceTree = "<group>"; };
 		9BCF0CD923FC9CA50031D2A2 /* TestCacheProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestCacheProvider.swift; sourceTree = "<group>"; };
@@ -1377,6 +1378,7 @@
 		9FC750461D2A532C00458D91 /* Apollo */ = {
 			isa = PBXGroup;
 			children = (
+				9BB1DAC624A66B2500396235 /* ApolloMacPlayground.playground */,
 				9FC750621D2A59F600458D91 /* ApolloClient.swift */,
 				9B708AAC2305884500604A11 /* ApolloClientProtocol.swift */,
 				9FC9A9D21E2FD48B0023C4D5 /* GraphQLError.swift */,
@@ -1898,7 +1900,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Apollo GraphQL";
 				TargetAttributes = {
 					9B2DFBB524E1FA0D00ED3AE6 = {

diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/Apollo Playground.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/Apollo Playground.xcscheme
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1200"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FC750431D2A532C00458D91"
+               BuildableName = "Apollo.framework"
+               BlueprintName = "Apollo"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FCE2CF91E6C213D00E34457"
+               BuildableName = "StarWarsAPI.framework"
+               BlueprintName = "StarWarsAPI"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9B7BDA7C23FDE90400ACD198"
+               BuildableName = "ApolloWebSocket.framework"
+               BlueprintName = "ApolloWebSocket"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FC750431D2A532C00458D91"
+            BuildableName = "Apollo.framework"
+            BlueprintName = "Apollo"
+            ReferencedContainer = "container:Apollo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "APOLLO_TEST_CACHE_PROVIDER"
+            value = "ApolloTestSupport.InMemoryTestCacheProvider"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FC750431D2A532C00458D91"
+            BuildableName = "Apollo.framework"
+            BlueprintName = "Apollo"
+            ReferencedContainer = "container:Apollo.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FC7504D1D2A532D00458D91"
+               BuildableName = "ApolloTests.xctest"
+               BlueprintName = "ApolloTests"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9FA6ABBB1EC0A988000017BE"
+               BuildableName = "ApolloCacheDependentTests.xctest"
+               BlueprintName = "ApolloCacheDependentTests"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "SQLiteFetchQueryTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteLoadQueryFromStoreTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteReadWriteFromStoreTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteStarWarsServerAPQsGetMethodTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteStarWarsServerAPQsTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteStarWarsServerCachingRoundtripTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteStarWarsServerTests">
+               </Test>
+               <Test
+                  Identifier = "SQLiteWatchQueryTests">
+               </Test>
+            </SkippedTests>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FC750431D2A532C00458D91"
+            BuildableName = "Apollo.framework"
+            BlueprintName = "Apollo"
+            ReferencedContainer = "container:Apollo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "9FC750431D2A532C00458D91"
+            BuildableName = "Apollo.framework"
+            BlueprintName = "Apollo"
+            ReferencedContainer = "container:Apollo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/Apollo.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/Apollo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCodegenLib.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCodegenLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCore.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloSQLite.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloSQLite.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloWebSocket.xcscheme b/Apollo.xcodeproj/xcshareddata/xcschemes/ApolloWebSocket.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Configuration/Apollo/Apollo-Target-ApolloCodegen.xcconfig b/Configuration/Apollo/Apollo-Target-ApolloCodegen.xcconfig
@@ -4,4 +4,3 @@ SDKROOT = macosx
 SUPPORTED_PLATFORMS = macosx
 
 ENABLE_BITCODE = NO
-VALID_ARCHS = x86_64
diff --git a/Configuration/Apollo/Apollo-Target-ApolloCodegenLib.xcconfig b/Configuration/Apollo/Apollo-Target-ApolloCodegenLib.xcconfig
@@ -3,4 +3,3 @@
 INFOPLIST_FILE = Sources/ApolloCodegenLib/Info.plist
 SUPPORTED_PLATFORMS = macosx
 SDKROOT = macosx
-VALID_ARCHS = x86_64
diff --git a/Configuration/Shared/Workspace-Debug.xcconfig b/Configuration/Shared/Workspace-Debug.xcconfig
@@ -20,3 +20,4 @@ SWIFT_COMPILATION_MODE = singlefile
 DEBUG_INFORMATION_FORMAT = dwarf
 
 ENABLE_NS_ASSERTIONS = YES
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
diff --git a/Configuration/Shared/Workspace-Release.xcconfig b/Configuration/Shared/Workspace-Release.xcconfig
@@ -19,3 +19,4 @@ LLVM_LTO = YES
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
 
 ENABLE_NS_ASSERTIONS = NO
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
diff --git a/Configuration/Shared/Workspace-Universal-Framework.xcconfig b/Configuration/Shared/Workspace-Universal-Framework.xcconfig
@@ -5,8 +5,6 @@ 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
 TARGETED_DEVICE_FAMILY[sdk=iphone*]  = 1,2
 
 // TV-specific default settings
@@ -19,7 +17,6 @@ TARGETED_DEVICE_FAMILY[sdk=watch*] = 4
 
 // macOS-specific default settings
 SDKROOT[sdk=macosx*] = macosx
-VALID_ARCHS[sdk=macosx*] = x86_64
 SUPPORTS_MACCATALYST = YES
 
 // Enable Bitcode only for actual devices, not for macOS or simulators

diff --git a/Playgrounds/ApolloMacPlayground.playground/Contents.swift b/Playgrounds/ApolloMacPlayground.playground/Contents.swift
@@ -0,0 +1,31 @@
+import Foundation
+import Apollo
+import StarWarsAPI
+import PlaygroundSupport
+
+/// Taking a query and working with its results
+
+let url = URL(string: "http://localhost:8080/graphql")!
+let client = ApolloClient(url: url)
+
+// You can change the episode here if you want, or omit the episode to receive the default value.
+let query = HeroDetailsQuery(episode: .empire)
+
+client.fetch(query: query) { result in
+  switch result {
+  case .success(let graphQLResult):
+    if let errors = graphQLResult.errors {
+      print("GraphQL errors: \(errors)")
+    }
+
+    if let hero = graphQLResult.data?.hero {
+      print("Hero name: \(hero.name)")
+    }
+  case .failure(let error):
+    print("Network error: \(error)")
+  }
+
+  PlaygroundPage.current.finishExecution()
+}
+
+PlaygroundPage.current.needsIndefiniteExecution = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ SDKROOT = macosx
		SUPPORTED_PLATFORMS = macosx

		ENABLE_BITCODE = NO
		VALID_ARCHS = x86_64
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ SWIFT_COMPILATION_MODE = singlefile
		DEBUG_INFORMATION_FORMAT = dwarf

		ENABLE_NS_ASSERTIONS = YES
		CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ LLVM_LTO = YES
		DEBUG_INFORMATION_FORMAT = dwarf-with-dsym

		ENABLE_NS_ASSERTIONS = NO
		CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES