Merge pull request #310 from manicmaniac/support-apollo-0.37.x

Support Apollo 0.37.x

Author: manicmaniac

.github/workflows/test.yml

@@ -38,13 +38,19 @@ jobs:
       fail-fast: false
       matrix:
         apollo:
+        - 0.37.0
         - 0.36.0
         - 0.35.0
         - 0.34.1
         platform:
         - iOS
         - macOS
         include:
+        - apollo: 0.37.0
+          platform: iOS
+          sdk: iphonesimulator
+          xcode: '12'
+          destination: platform=iOS Simulator,OS=14.0,name=iPhone 11
         - apollo: 0.36.0
           platform: iOS
           sdk: iphonesimulator
@@ -60,6 +66,11 @@ jobs:
           sdk: iphonesimulator
           xcode: '12'
           destination: platform=iOS Simulator,OS=14.0,name=iPhone 11
+        - apollo: 0.37.0
+          platform: macOS
+          sdk: macosx
+          xcode: '12'
+          destination: platform=OS X,arch=x86_64
         - apollo: 0.36.0
           platform: macOS
           sdk: macosx

ApolloDeveloperKit.podspec

@@ -18,5 +18,5 @@ Pod::Spec.new do |spec|
   spec.resource = "Sources/ApolloDeveloperKit/Assets"
   spec.cocoapods_version = '>= 1.7.0'
   spec.swift_versions = ['5.0', '5.1', '5.2', '5.3']
-  spec.dependency "Apollo", ">= 0.34.0", "< 0.37.0"
+  spec.dependency "Apollo", ">= 0.34.0", "< 0.38.0"
 end

README.md

@@ -25,7 +25,7 @@ Prerequisites
 -------------
 
 - Xcode `>= 12.0`
-- [Apollo iOS](https://github.com/apollographql/apollo-ios) `>= 0.34.0`, `< 0.37.0`
+- [Apollo iOS](https://github.com/apollographql/apollo-ios) `>= 0.34.0`, `< 0.38.0`
 - [Apollo Client Devtools](https://www.apollographql.com/docs/react/development-testing/developer-tooling/#apollo-client-devtools)
 
 Installation

Sources/ApolloDeveloperKit/JSON/JSONCocoaTypeConversions.swift

@@ -16,14 +16,15 @@ import Foundation
  *  and when I use those utility extensions on them, `fatalError()` occurs because it doesn't conform to `JSONEncodable`.
  *  So to avoid this problem, `ApolloDeveloperKit` have to prepare some more extensions for Cocoa types.
  */
+protocol ExtendedJSONEncodable: JSONEncodable {}
 
-extension NSString: JSONEncodable {
+extension NSString: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as String).jsonValue
     }
 }
 
-extension NSNumber: JSONEncodable {
+extension NSNumber: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         switch CFGetTypeID(self) {
         case CFBooleanGetTypeID():
@@ -36,55 +37,55 @@ extension NSNumber: JSONEncodable {
     }
 }
 
-extension NSDictionary: JSONEncodable {
+extension NSDictionary: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as [NSObject: AnyObject]).jsonValue
     }
 }
 
-extension NSArray: JSONEncodable {
+extension NSArray: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as [AnyObject]).jsonValue
     }
 }
 
-extension NSNull: JSONEncodable {
+extension NSNull: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return self
     }
 }
 
-extension CFString: JSONEncodable {
+extension CFString: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as NSString).jsonValue
     }
 }
 
-extension CFNumber: JSONEncodable {
+extension CFNumber: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as NSNumber).jsonValue
     }
 }
 
-extension CFBoolean: JSONEncodable {
+extension CFBoolean: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return CFBooleanGetValue(self).jsonValue
     }
 }
 
-extension CFDictionary: JSONEncodable {
+extension CFDictionary: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as NSDictionary).jsonValue
     }
 }
 
-extension CFArray: JSONEncodable {
+extension CFArray: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return (self as NSArray).jsonValue
     }
 }
 
-extension CFNull: JSONEncodable {
+extension CFNull: ExtendedJSONEncodable {
     public var jsonValue: JSONValue {
         return self as NSNull
     }