Merge pull request #1605 from apollographql/drop/ios-9-thru-11

designatednerd · web-flow · commit 88ba36438f57 · 2021-01-11T11:51:27.000-06:00
Drop iOS/tvOS 9-11, watchOS 3-4, macOS 10.10-10.13 support
diff --git a/Apollo.podspec b/Apollo.podspec
@@ -15,10 +15,10 @@ Pod::Spec.new do |s|
 
   s.default_subspecs = 'Core'
 
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.10'
-  s.tvos.deployment_target = '9.1'
-  s.watchos.deployment_target = '3.0'
+  s.ios.deployment_target = '12.0'
+  s.osx.deployment_target = '10.14'
+  s.tvos.deployment_target = '12.0'
+  s.watchos.deployment_target = '5.0'
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'Sources/Apollo/*.swift','Sources/ApolloCore/*.swift'
diff --git a/Apollo.xcodeproj/project.pbxproj b/Apollo.xcodeproj/project.pbxproj
@@ -194,7 +194,6 @@
 		9F27D4641D40379500715680 /* JSONStandardTypeConversions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F27D4631D40379500715680 /* JSONStandardTypeConversions.swift */; };
 		9F295E311E27534800A24949 /* NormalizeQueryResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F295E301E27534800A24949 /* NormalizeQueryResults.swift */; };
 		9F295E381E277B2A00A24949 /* GraphQLResultNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F295E371E277B2A00A24949 /* GraphQLResultNormalizer.swift */; };
-		9F30F02F255EDF8900506DE7 /* DispatchPreconditions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F30F02E255EDF8900506DE7 /* DispatchPreconditions.swift */; };
 		9F39101725493DDC00AF54A6 /* FetchQueryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA6ABC51EC0A9F7000017BE /* FetchQueryTests.swift */; };
 		9F3910272549741400AF54A6 /* MockGraphQLServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3910262549741400AF54A6 /* MockGraphQLServer.swift */; };
 		9F438D071E6C2FD9007BDC1A /* Apollo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FC750441D2A532C00458D91 /* Apollo.framework */; };
@@ -740,7 +739,6 @@
 		9F27D4631D40379500715680 /* JSONStandardTypeConversions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONStandardTypeConversions.swift; sourceTree = "<group>"; };
 		9F295E301E27534800A24949 /* NormalizeQueryResults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NormalizeQueryResults.swift; sourceTree = "<group>"; };
 		9F295E371E277B2A00A24949 /* GraphQLResultNormalizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphQLResultNormalizer.swift; sourceTree = "<group>"; };
-		9F30F02E255EDF8900506DE7 /* DispatchPreconditions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DispatchPreconditions.swift; sourceTree = "<group>"; };
 		9F33D6A32566475600A1543F /* PossiblyDeferred.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PossiblyDeferred.swift; sourceTree = "<group>"; };
 		9F3910262549741400AF54A6 /* MockGraphQLServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockGraphQLServer.swift; sourceTree = "<group>"; };
 		9F438D0B1E6C494C007BDC1A /* BatchedLoadTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatchedLoadTests.swift; sourceTree = "<group>"; };
@@ -1193,7 +1191,6 @@
 			isa = PBXGroup;
 			children = (
 				9B6CB23D238077B60007259D /* Atomic.swift */,
-				9F30F02E255EDF8900506DE7 /* DispatchPreconditions.swift */,
 				9B68F06E241C649E00E97318 /* GraphQLOptional.swift */,
 				9B455CE82492D0A7002255A9 /* Extensions */,
 			);
@@ -2418,7 +2415,6 @@
 				9B455CE52492D0A3002255A9 /* ApolloExtension.swift in Sources */,
 				9B455CEB2492FB03002255A9 /* String+SHA.swift in Sources */,
 				9B455CE62492D0A3002255A9 /* OptionalBoolean.swift in Sources */,
-				9F30F02F255EDF8900506DE7 /* DispatchPreconditions.swift in Sources */,
 				9B455CDF2492D05E002255A9 /* Atomic.swift in Sources */,
 				9B455CE72492D0A3002255A9 /* Collection+Apollo.swift in Sources */,
 			);
diff --git a/Configuration/Shared/Workspace-Deployment-Targets.xcconfig b/Configuration/Shared/Workspace-Deployment-Targets.xcconfig
@@ -1,13 +1,13 @@
 // Base Deployment Targets
-IPHONEOS_DEPLOYMENT_TARGET = 9.0
-MACOSX_DEPLOYMENT_TARGET = 10.10
-TVOS_DEPLOYMENT_TARGET = 9.1
-WATCHOS_DEPLOYMENT_TARGET = 3.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
+MACOSX_DEPLOYMENT_TARGET = 10.14
+TVOS_DEPLOYMENT_TARGET = 12.0
+WATCHOS_DEPLOYMENT_TARGET = 5.0
 
-WARNING_CFLAGS[sdk=iphone*] = $(inherited) -DAPI_TO_BE_DEPRECATED=8_0
-WARNING_CFLAGS[sdk=macosx*] = $(inherited) -DAPI_TO_BE_DEPRECATED=10_10
-WARNING_CFLAGS[sdk=tvos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=9_1
-WARNING_CFLAGS[sdk=watchos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=3_0
+WARNING_CFLAGS[sdk=iphone*] = $(inherited) -DAPI_TO_BE_DEPRECATED=12_0
+WARNING_CFLAGS[sdk=macosx*] = $(inherited) -DAPI_TO_BE_DEPRECATED=10_14
+WARNING_CFLAGS[sdk=tvos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=12_0
+WARNING_CFLAGS[sdk=watchos*] = $(inherited) -DAPI_TO_BE_DEPRECATED=5_0
 
 // macOS-specific default settings
 COMBINE_HIDPI_IMAGES[sdk=macosx*] = YES
diff --git a/Package.swift b/Package.swift
@@ -5,6 +5,12 @@ import PackageDescription
 
 let package = Package(
     name: "Apollo",
+    platforms: [
+      .iOS(.v12),
+      .macOS(.v10_14),
+      .tvOS(.v12),
+      .watchOS(.v5)
+    ],
     products: [
     .library(
       name: "ApolloCore",
diff --git a/Sources/Apollo/GraphQLGETTransformer.swift b/Sources/Apollo/GraphQLGETTransformer.swift
@@ -28,7 +28,7 @@ public struct GraphQLGETTransformer {
     do {
       _ = try self.body.sorted(by: {$0.key < $1.key}).compactMap({ arg in
         if let value = arg.value as? GraphQLMap {
-          let data = try JSONSerialization.dataSortedIfPossible(withJSONObject: value.jsonValue)
+          let data = try JSONSerialization.sortedData(withJSONObject: value.jsonValue)
           if let string = String(data: data, encoding: .utf8) {
             queryItems.append(URLQueryItem(name: arg.key, value: string))
           }
diff --git a/Sources/Apollo/JSONSerialization+Sorting.swift b/Sources/Apollo/JSONSerialization+Sorting.swift
@@ -2,29 +2,12 @@ import Foundation
 
 extension JSONSerialization {
 
-  /// Uses `sortedKeys` to create a stable representation of JSON objects when the operating system supports it.
+  /// Uses `sortedKeys` to create a stable representation of JSON objects.
   ///
   /// - Parameter object: The object to serialize
   /// - Returns: The serialized data
   /// - Throws: Errors related to the serialization of data.
-  static func dataSortedIfPossible(withJSONObject object: Any) throws -> Data {
-    // The `sortedKeys` option is not available on all platforms we
-    // 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 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
-    }
+  static func sortedData(withJSONObject object: Any) throws -> Data {
+    return try self.data(withJSONObject: object, options: [.sortedKeys])
   }
 }
diff --git a/Sources/Apollo/JSONSerializationFormat.swift b/Sources/Apollo/JSONSerializationFormat.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public final class JSONSerializationFormat {
   public class func serialize(value: JSONEncodable) throws -> Data {
-    return try JSONSerialization.dataSortedIfPossible(withJSONObject: value.jsonValue)
+    return try JSONSerialization.sortedData(withJSONObject: value.jsonValue)
   }
 
   public class func deserialize(data: Data) throws -> JSONValue {
diff --git a/Sources/Apollo/URLSessionClient.swift b/Sources/Apollo/URLSessionClient.swift
@@ -154,7 +154,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat
     self.clearAllTasks()
   }
   
-  @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
   open func urlSession(_ session: URLSession,
                        task: URLSessionTask,
                        didFinishCollecting metrics: URLSessionTaskMetrics) {
@@ -234,7 +233,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat
     // No default implementation
   }
   
-  @available(iOS 11.0, OSXApplicationExtension 10.13, OSX 10.13, tvOS 11.0, watchOS 4.0, *)
   open func urlSession(_ session: URLSession,
                        task: URLSessionTask,
                        willBeginDelayedRequest request: URLRequest,
@@ -265,7 +263,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat
     }
   }
   
-  @available(iOS 9.0, OSXApplicationExtension 10.11, OSX 10.11, *)
   open func urlSession(_ session: URLSession,
                        dataTask: URLSessionDataTask,
                        didBecome streamTask: URLSessionStreamTask) {
diff --git a/Sources/ApolloCodegenLib/Basher.swift b/Sources/ApolloCodegenLib/Basher.swift
@@ -37,17 +37,10 @@ public struct Basher {
     ]
     task.launchPath = "/bin/bash"
     
-    if #available(OSX 10.13, *) {
-      if let url = url {
-        task.currentDirectoryURL = url
-      }
-      try task.run()
-    } else {
-      if let path = url?.path {
-        task.currentDirectoryPath = path
-      }
-      task.launch()
+    if let url = url {
+      task.currentDirectoryURL = url
     }
+    try task.run()
     
     task.waitUntilExit()
     
diff --git a/Sources/ApolloCore/DispatchPreconditions.swift b/Sources/ApolloCore/DispatchPreconditions.swift
diff --git a/SwiftScripts/Package.swift b/SwiftScripts/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Codegen",
     platforms: [
-        .macOS(.v10_13)
+        .macOS(.v10_14)
     ],
     dependencies: [
         .package(name: "Apollo", path: ".."),
diff --git a/Tests/ApolloTests/GETTransformerTests.swift b/Tests/ApolloTests/GETTransformerTests.swift
@@ -40,51 +40,9 @@ class GETTransformerTests: XCTestCase {
     
     let url = transformer.createGetURL()
     
-    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%0A%20%20hero(episode:%20$episode)%20%7B%0A%20%20%20%20__typename%0A%20%20%20%20name%20@include(if:%20$includeName)%0A%20%20%20%20...%20on%20Droid%20%7B%0A%20%20%20%20%20%20name%0A%20%20%20%20%7D%0A%20%20%7D%0A%7D&variables=%7B%22episode%22:%22JEDI%22,%22includeName%22:true%7D")
-    } else {
-      // We can't guarantee order of encoding, so we need to pull the JSON back
-      // out and check that it has the correct and correctly typed properties.
-      let transformedURL = try XCTUnwrap(url,
-                                         "URL not created!")
-      
-      let urlComponents = try XCTUnwrap(URLComponents(url: transformedURL, resolvingAgainstBaseURL: false),
-                                        "Couldn't access URL components")
-      
-      let queryItems = try XCTUnwrap(urlComponents.queryItems,
-                                     "No query items!")
-      
-      guard
-        let operationNameItem = queryItems.first(where: { $0.name == "operationName" }),
-        let operationName = operationNameItem.value else {
-          XCTFail("Query items did not contain operation name!")
-          return
-      }
-      
-      XCTAssertEqual(operationName, "HeroNameTypeSpecificConditionalInclusion")
-      
-      guard
-        let variablesQueryItem = queryItems.first(where: { $0.name == "variables" }),
-        let variables = variablesQueryItem.value else {
-          XCTFail("Query items did not contain variables!")
-          return
-      }
-      
-      let data = try XCTUnwrap(variables.data(using: .utf8),
-                               "Couldn't convert data to UTF8 string!")
-      
-      guard
-        let object = try? JSONSerialization.jsonObject(with: data),
-        let dict = object as? [String: Any] else {
-          XCTFail("Couldn't get dictionary out of json!")
-          return
-      }
-      
-      XCTAssertEqual(dict["includeName"] as? Bool, true)
-      XCTAssertEqual(dict["episode"] as? String, "JEDI")
-    }
+    // 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%0A%20%20hero(episode:%20$episode)%20%7B%0A%20%20%20%20__typename%0A%20%20%20%20name%20@include(if:%20$includeName)%0A%20%20%20%20...%20on%20Droid%20%7B%0A%20%20%20%20%20%20name%0A%20%20%20%20%7D%0A%20%20%7D%0A%7D&variables=%7B%22episode%22:%22JEDI%22,%22includeName%22:true%7D")
   }
   
   func testEncodingQueryWith2DParameter() throws {
@@ -109,40 +67,9 @@ class GETTransformerTests: XCTestCase {
     
     let url = transformer.createGetURL()
     
-    if #available(iOS 11, macOS 13, watchOS 4, tvOS 11, *) {
-      let queryString = url?.absoluteString == "http://localhost:8080/graphql?extensions=%7B%22persistedQuery%22:%7B%22sha256Hash%22:%22f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671%22,%22version%22:1%7D%7D&query=query%20HeroName($episode:%20Episode)%20%7B%0A%20%20hero(episode:%20$episode)%20%7B%0A%20%20%20%20__typename%0A%20%20%20%20name%0A%20%20%7D%0A%7D&variables=%7B%22episode%22:%22EMPIRE%22%7D"
-
-      XCTAssertTrue(queryString)
-    } else {
-      let query = try XCTUnwrap(url?.queryItemDictionary?["query"],
-                                "query should not be nil")
-      XCTAssertTrue(query == operation.queryDocument)
-      
-      let variables = try XCTUnwrap(url?.queryItemDictionary?["variables"],
-                                    "variables should not nil")
-      XCTAssertEqual(variables, "{\"episode\":\"EMPIRE\"}")
-      
-      guard
-        let ext = url?.queryItemDictionary?["extensions"],
-        let data = ext.data(using: .utf8),
-        let jsonBody = try? JSONSerializationFormat.deserialize(data: data) as? JSONObject
-        else {
-          XCTFail("extensions json data should not be nil")
-          return
-      }
-      
-      let comparePersistedQuery = try XCTUnwrap(jsonBody["persistedQuery"] as? JSONObject,
-                                                "persistedQuery is missing")
-      
-      let sha256Hash = try XCTUnwrap(comparePersistedQuery["sha256Hash"] as? String,
-                                     "sha256Hash is missing")
-      
-      let version = try XCTUnwrap(comparePersistedQuery["version"] as? Int,
-                                  "version is missing")
-      
-      XCTAssertEqual(version, 1)
-      XCTAssertEqual(sha256Hash, "f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671")
-    }
+    let queryString = url?.absoluteString == "http://localhost:8080/graphql?extensions=%7B%22persistedQuery%22:%7B%22sha256Hash%22:%22f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671%22,%22version%22:1%7D%7D&query=query%20HeroName($episode:%20Episode)%20%7B%0A%20%20hero(episode:%20$episode)%20%7B%0A%20%20%20%20__typename%0A%20%20%20%20name%0A%20%20%7D%0A%7D&variables=%7B%22episode%22:%22EMPIRE%22%7D"
+    
+    XCTAssertTrue(queryString)
   }
   
   func testEncodingQueryWith2DWOQueryParameter() throws {
@@ -166,37 +93,8 @@ class GETTransformerTests: XCTestCase {
     
     let url = transformer.createGetURL()
     
-    if #available(iOS 11, macOS 13, watchOS 4, tvOS 11, *) {
-      let queryString = url?.absoluteString == "http://localhost:8080/graphql?extensions=%7B%22persistedQuery%22:%7B%22sha256Hash%22:%22f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671%22,%22version%22:1%7D%7D&variables=%7B%22episode%22:%22EMPIRE%22%7D"
-      XCTAssertTrue(queryString)
-    } else {
-
-      let variables = try XCTUnwrap(url?.queryItemDictionary?["variables"],
-                                    "variables should not nil")
-
-      XCTAssertEqual(variables, "{\"episode\":\"EMPIRE\"}")
-      
-      guard
-        let ext = url?.queryItemDictionary?["extensions"],
-        let data = ext.data(using: .utf8),
-        let jsonBody = try? JSONSerializationFormat.deserialize(data: data) as? JSONObject
-        else {
-          XCTFail("extensions json data should not be nil")
-          return
-      }
-      
-      let comparePersistedQuery = try XCTUnwrap(jsonBody["persistedQuery"] as? JSONObject,
-                                                "persistedQuery is missing")
-      
-      let sha256Hash = try XCTUnwrap(comparePersistedQuery["sha256Hash"] as? String,
-                                     "sha256Hash is missing")
-      
-      let version = try XCTUnwrap(comparePersistedQuery["version"] as? Int,
-                                  "version is missing")
-      
-      XCTAssertEqual(version, 1)
-      XCTAssertEqual(sha256Hash, "f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671")
-    }
+    let queryString = url?.absoluteString == "http://localhost:8080/graphql?extensions=%7B%22persistedQuery%22:%7B%22sha256Hash%22:%22f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671%22,%22version%22:1%7D%7D&variables=%7B%22episode%22:%22EMPIRE%22%7D"
+    XCTAssertTrue(queryString)
   }
   
   func testEncodingQueryWithNullDefaultParameter() {
@@ -235,34 +133,7 @@ class GETTransformerTests: XCTestCase {
     
     let url = transformer.createGetURL()
     
-    if #available(iOS 11, macOS 13, watchOS 4, tvOS 11, *) {
     let queryString = url?.absoluteString == "http://localhost:8080/graphql?extensions=%7B%22persistedQuery%22:%7B%22sha256Hash%22:%22f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671%22,%22version%22:1%7D%7D&query=query%20HeroName($episode:%20Episode)%20%7B%0A%20%20hero(episode:%20$episode)%20%7B%0A%20%20%20%20__typename%0A%20%20%20%20name%0A%20%20%7D%0A%7D&variables=%7B%22episode%22:null%7D"
-      XCTAssertTrue(queryString)
-    } else {
-      let variables = try XCTUnwrap(url?.queryItemDictionary?["variables"],
-                                    "variables should not nil")
-      XCTAssertEqual(variables, "{\"episode\":null}")
-      
-      guard
-        let ext = url?.queryItemDictionary?["extensions"],
-        let data = ext.data(using: .utf8),
-        let jsonBody = try? JSONSerializationFormat.deserialize(data: data) as? JSONObject
-        else {
-          XCTFail("extensions json data should not be nil")
-          return
-      }
-      
-      let comparePersistedQuery = try XCTUnwrap(jsonBody["persistedQuery"] as? JSONObject,
-                                                "persistedQuery is missing")
-      
-      let sha256Hash = try XCTUnwrap(comparePersistedQuery["sha256Hash"] as? String,
-                                     "sha256Hash is missing")
-      
-      let version = try XCTUnwrap(comparePersistedQuery["version"] as? Int,
-                                  "version is missing")
-      
-      XCTAssertEqual(version, 1)
-      XCTAssertEqual(sha256Hash, "f6e76545cd03aa21368d9969cb39447f6e836a16717823281803778e7805d671")
-    }
+    XCTAssertTrue(queryString)
   }
 }
diff --git a/Tests/ApolloTests/UploadTests.swift b/Tests/ApolloTests/UploadTests.swift

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public struct GraphQLGETTransformer {`
`28`	`28`	`do {`
`29`	`29`	`_ = try self.body.sorted(by: {$0.key < $1.key}).compactMap({ arg in`
`30`	`30`	`if let value = arg.value as? GraphQLMap {`
`31`		`- let data = try JSONSerialization.dataSortedIfPossible(withJSONObject: value.jsonValue)`
	`31`	`+ let data = try JSONSerialization.sortedData(withJSONObject: value.jsonValue)`
`32`	`32`	`if let string = String(data: data, encoding: .utf8) {`
`33`	`33`	`queryItems.append(URLQueryItem(name: arg.key, value: string))`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import Foundation`
`2`	`2`
`3`	`3`	`public final class JSONSerializationFormat {`
`4`	`4`	`public class func serialize(value: JSONEncodable) throws -> Data {`
`5`		`- return try JSONSerialization.dataSortedIfPossible(withJSONObject: value.jsonValue)`
	`5`	`+ return try JSONSerialization.sortedData(withJSONObject: value.jsonValue)`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`public class func deserialize(data: Data) throws -> JSONValue {`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat`
`154`	`154`	`self.clearAllTasks()`
`155`	`155`	`}`
`156`	`156`
`157`		`- @available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)`
`158`	`157`	`open func urlSession(_ session: URLSession,`
`159`	`158`	`task: URLSessionTask,`
`160`	`159`	`didFinishCollecting metrics: URLSessionTaskMetrics) {`
`@@ -234,7 +233,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat`
`234`	`233`	`// No default implementation`
`235`	`234`	`}`
`236`	`235`
`237`		`- @available(iOS 11.0, OSXApplicationExtension 10.13, OSX 10.13, tvOS 11.0, watchOS 4.0, *)`
`238`	`236`	`open func urlSession(_ session: URLSession,`
`239`	`237`	`task: URLSessionTask,`
`240`	`238`	`willBeginDelayedRequest request: URLRequest,`
`@@ -265,7 +263,6 @@ open class URLSessionClient: NSObject, URLSessionDelegate, URLSessionTaskDelegat`
`265`	`263`	`}`
`266`	`264`	`}`
`267`	`265`
`268`		`- @available(iOS 9.0, OSXApplicationExtension 10.11, OSX 10.11, *)`
`269`	`266`	`open func urlSession(_ session: URLSession,`
`270`	`267`	`dataTask: URLSessionDataTask,`
`271`	`268`	`didBecome streamTask: URLSessionStreamTask) {`