Updated code

colemancda · colemancda · commit 3520c254493d · 2017-12-18T06:35:45.000-05:00
diff --git a/HTTP.xcodeproj/project.pbxproj b/HTTP.xcodeproj/project.pbxproj
@@ -624,6 +624,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = org.pureswift.http;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
@@ -668,6 +669,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = org.pureswift.http;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -691,8 +693,8 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				NEW_SETTING = "";
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-iOS";
 				PRODUCT_NAME = HTTP;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -713,7 +715,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-iOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -759,7 +761,7 @@
 				INFOPLIST_FILE = Configs/HTTP.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-watchOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -782,7 +784,7 @@
 				INFOPLIST_FILE = Configs/HTTP.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-watchOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -805,7 +807,7 @@
 				INFOPLIST_FILE = Configs/HTTP.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-tvOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
@@ -828,7 +830,7 @@
 				INFOPLIST_FILE = Configs/HTTP.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-tvOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
@@ -854,7 +856,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-macOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -878,7 +880,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HTTP.HTTP-macOS";
+				NEW_SETTING = "";
 				PRODUCT_NAME = HTTP;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
diff --git a/Sources/Client.swift b/Sources/Client.swift
@@ -24,12 +24,10 @@ public extension HTTP {
         
         public func send(request: HTTP.Request) throws -> HTTP.Response {
             
-            var dataTask: URLSessionDataTask?
-            
-            return try send(request: request, dataTask: &dataTask)
+            return try send(request: request).response
         }
         
-        public func send(request: HTTP.Request, dataTask: inout URLSessionDataTask?) throws -> HTTP.Response {
+        public func send(request: HTTP.Request) throws -> (response: HTTP.Response, task: URLSessionDataTask) {
             
             // build request... 
             
@@ -46,7 +44,7 @@ public extension HTTP {
             
             var urlResponse: HTTPURLResponse?
             
-            dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: Foundation.URLResponse?, responseError: Swift.Error?) -> () in
+            let dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: Foundation.URLResponse?, responseError: Swift.Error?) -> () in
                 
                 responseData = data
                 
@@ -57,7 +55,7 @@ public extension HTTP {
                 semaphore.signal()
             }
             
-            dataTask!.resume()
+            dataTask.resume()
             
             // wait for task to finish
             
@@ -78,12 +76,11 @@ public extension HTTP {
             
             response.url = urlResponse!.url
             
-            return response
+            return (response, dataTask)
         }
     }
 }
 
-
 public extension HTTP.Client {
     
     public enum Error: Swift.Error {

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,10 @@ public extension HTTP {`
`24`	`24`
`25`	`25`	`public func send(request: HTTP.Request) throws -> HTTP.Response {`
`26`	`26`
`27`		`- var dataTask: URLSessionDataTask?`
`28`		`-`
`29`		`- return try send(request: request, dataTask: &dataTask)`
	`27`	`+ return try send(request: request).response`
`30`	`28`	`}`
`31`	`29`
`32`		`- public func send(request: HTTP.Request, dataTask: inout URLSessionDataTask?) throws -> HTTP.Response {`
	`30`	`+ public func send(request: HTTP.Request) throws -> (response: HTTP.Response, task: URLSessionDataTask) {`
`33`	`31`
`34`	`32`	`// build request...`
`35`	`33`
`@@ -46,7 +44,7 @@ public extension HTTP {`
`46`	`44`
`47`	`45`	`var urlResponse: HTTPURLResponse?`
`48`	`46`
`49`		`- dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: Foundation.URLResponse?, responseError: Swift.Error?) -> () in`
	`47`	`+ let dataTask = self.session.dataTask(with: urlRequest) { (data: Foundation.Data?, response: Foundation.URLResponse?, responseError: Swift.Error?) -> () in`
`50`	`48`
`51`	`49`	`responseData = data`
`52`	`50`
`@@ -57,7 +55,7 @@ public extension HTTP {`
`57`	`55`	`semaphore.signal()`
`58`	`56`	`}`
`59`	`57`
`60`		`- dataTask!.resume()`
	`58`	`+ dataTask.resume()`
`61`	`59`
`62`	`60`	`// wait for task to finish`
`63`	`61`
`@@ -78,12 +76,11 @@ public extension HTTP {`
`78`	`76`
`79`	`77`	`response.url = urlResponse!.url`
`80`	`78`
`81`		`- return response`
	`79`	`+ return (response, dataTask)`
`82`	`80`	`}`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`
`86`		`-`
`87`	`84`	`public extension HTTP.Client {`
`88`	`85`
`89`	`86`	`public enum Error: Swift.Error {`