Merge pull request #7 from shingt/apollo-0-53-0

Bump up apollo-ios to 0.53.0

Author: shingt

Diff for: GitHub-GraphQL-API-Example-iOS.xcodeproj/project.pbxproj

@@ -402,7 +402,7 @@
 			repositoryURL = "https://github.com/apollographql/apollo-ios.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.43.0;
+				minimumVersion = 0.53.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Diff for: GitHub-GraphQL-API-Example-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,70 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Apollo",
-        "repositoryURL": "https://github.com/apollographql/apollo-ios.git",
-        "state": {
-          "branch": null,
-          "revision": "c6e2f6c7936ea0dcf2f09319fecedcbac2d03350",
-          "version": "0.43.0"
-        }
-      },
-      {
-        "package": "InflectorKit",
-        "repositoryURL": "https://github.com/apollographql/InflectorKit",
-        "state": {
-          "branch": null,
-          "revision": "b1d0099abe36facd198113633f502889842906af",
-          "version": "0.0.2"
-        }
-      },
-      {
-        "package": "PathKit",
-        "repositoryURL": "https://github.com/kylef/PathKit.git",
-        "state": {
-          "branch": null,
-          "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "package": "Spectre",
-        "repositoryURL": "https://github.com/kylef/Spectre.git",
-        "state": {
-          "branch": null,
-          "revision": "f79d4ecbf8bc4e1579fbd86c3e1d652fb6876c53",
-          "version": "0.9.2"
-        }
-      },
-      {
-        "package": "SQLite.swift",
-        "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
-        "state": {
-          "branch": null,
-          "revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1",
-          "version": "0.12.2"
-        }
-      },
-      {
-        "package": "Starscream",
-        "repositoryURL": "https://github.com/daltoniam/Starscream",
-        "state": {
-          "branch": null,
-          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
-          "version": "4.0.4"
-        }
-      },
-      {
-        "package": "Stencil",
-        "repositoryURL": "https://github.com/stencilproject/Stencil.git",
-        "state": {
-          "branch": null,
-          "revision": "973e190edf5d09274e4a6bc2e636c86899ed84c3",
-          "version": "0.14.1"
-        }
+  "pins" : [
+    {
+      "identity" : "apollo-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apollographql/apollo-ios.git",
+      "state" : {
+        "revision" : "42646f765d22dac0f22bfff48590102195c76da4",
+        "version" : "0.53.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "sqlite.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/stephencelis/SQLite.swift.git",
+      "state" : {
+        "revision" : "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54",
+        "version" : "0.13.3"
+      }
+    }
+  ],
+  "version" : 2
 }

Diff for: GitHub-GraphQL-API-Example-iOS/API.swift

@@ -16,6 +16,7 @@ public final class SearchRepositoriesQuery: GraphQLQuery {
           node {
             __typename
             ... on Repository {
+              __typename
               ...RepositoryDetails
             }
           }
@@ -220,6 +221,7 @@ public final class SearchRepositoriesQuery: GraphQLQuery {
 
             public static var selections: [GraphQLSelection] {
               return [
+                GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
                 GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
                 GraphQLFragmentSpread(RepositoryDetails.self),
               ]

Diff for: GitHub-GraphQL-API-Example-iOS/RepositoriesViewController.swift

@@ -3,7 +3,7 @@ import Apollo
 
 private let token = "YOUR_TOKEN"
 
-class TokenAddingInterceptor: ApolloInterceptor {
+final class TokenAddingInterceptor: ApolloInterceptor {
     func interceptAsync<Operation: GraphQLOperation>(
         chain: RequestChain,
         request: HTTPRequest<Operation>,
@@ -14,11 +14,21 @@ class TokenAddingInterceptor: ApolloInterceptor {
     }
 }
 
-class NetworkInterceptorProvider: LegacyInterceptorProvider {
-    override func interceptors<Operation: GraphQLOperation>(for operation: Operation) -> [ApolloInterceptor] {
-        var interceptors = super.interceptors(for: operation)
-        interceptors.insert(TokenAddingInterceptor(), at: 0)
-        return interceptors
+final class NetworkInterceptorProvider: InterceptorProvider {
+    private let client: URLSessionClient
+    private let store: ApolloStore
+
+    init(client: URLSessionClient, store: ApolloStore) {
+        self.client = client
+        self.store = store
+    }
+
+    func interceptors<Operation>(for operation: Operation) -> [ApolloInterceptor] where Operation : GraphQLOperation {
+        [
+            TokenAddingInterceptor(),
+            NetworkFetchInterceptor(client: self.client),
+            JSONResponseParsingInterceptor(cacheKeyForObject: self.store.cacheKeyForObject),
+        ]
     }
 }