fix availability gate for JSON sorting

Author: designatednerd

Sources/Apollo/JSONSerialziation+Sorting.swift

@@ -20,10 +20,19 @@ extension JSONSerialization {
     // presently support, but we should use it where we can in
     // order to get stable JSON representations, especially if being
     // used in queries.
-    if #available(iOS 11, macOS 13, watchOS 4, tvOS 11, *) {
+    if #available(iOS 11, macOS 10.13, watchOS 4, tvOS 11, *) {
       return try self.data(withJSONObject: object, options: [.sortedKeys])
     } else {
       return try self.data(withJSONObject: object)
     }
   }
+  
+  /// Wrapper function so we don't have to scatter `if #available` all over the codebase to see if data can be sorted.
+  static func dataCanBeSorted() -> Bool {
+    if #available(iOS 11, macOS 10.13, watchOS 4, tvOS 11, *) {
+      return true
+    } else {
+      return false
+    }
+  }
 }

Tests/ApolloTests/GETTransformerTests.swift

@@ -33,7 +33,7 @@ class GETTransformerTests: XCTestCase {
 
     let url = transformer.createGetURL()
 
-    if #available(iOS 11, macOS 13, tvOS 11, watchOS 4, *) {
+    if JSONSerialization.dataCanBeSorted() {
       // Here, we know that everything should be encoded in a stable order,
       // and we can check the encoded URL string directly.
           XCTAssertEqual(url?.absoluteString, "http://localhost:8080/graphql?operationName=HeroNameTypeSpecificConditionalInclusion&query=query%20HeroNameTypeSpecificConditionalInclusion($episode:%20Episode,%20$includeName:%20Boolean!)%20%7B%20hero(episode:%20$episode)%20%7B%20__typename%20name%20@include(if:%20$includeName)%20...%20on%20Droid%20%7B%20name%20%7D%20%7D%20%7D&variables=%7B%22episode%22:%22JEDI%22,%22includeName%22:true%7D")

Tests/ApolloTests/RequestCreatorTests.swift

@@ -177,7 +177,7 @@ Charlie file content.
 
     let stringToCompare = try self.string(from: data)
 
-    if #available(iOS 11, macOS 13, tvOS 11, watchOS 4, *) {
+    if JSONSerialization.dataCanBeSorted() {
       let expectedString = """
 --TEST.BOUNDARY
 Content-Disposition: form-data; name="operations"
@@ -239,7 +239,7 @@ Alpha file content.
 
     let stringToCompare = try self.string(from: data)
 
-    if #available(iOS 11, macOS 13, tvOS 11, watchOS 4, *) {
+    if JSONSerialization.dataCanBeSorted() {
       let expectedString = """
 --TEST.BOUNDARY
 Content-Disposition: form-data; name="operations"