Swift 3 support #65
Merged
Swift 3 support #65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Without this, Xcode complains about the legacy Swift version not being set.
|
@hyperspacemark @soffes would you mind reviewing this? |
|
Also, mfw I'm not a maintainer of this project because I'm not part of the @venmo org anymore. |
...because Travis CI is so good.
lionel-alves
approved these changes
Jan 20, 2017
| // MARK: - Helpers | ||
|
|
||
| extension String { | ||
| func UTF8Data() -> NSData { | ||
| return dataUsingEncoding(NSUTF8StringEncoding)! | ||
| fileprivate var utf8Data: Data { |
| // There isn't a mutable NSHTTPURLResponse, so we have to make our own. | ||
| class URLHTTPResponse: NSHTTPURLResponse { | ||
| // There isn't a mutable HTTPURLResponse, so we have to make our own. | ||
| class HTTPURLResponse: Foundation.HTTPURLResponse { |
There was a problem hiding this comment.
Naming this class HTTPURLResponse requires us to use Foundation.HTTPURLResponse in a lot of places here and could be confusing. What do you think about MutableHTTPURLResponse since it's a mutable version of HTTPURLResponse?
There was a problem hiding this comment.
I had a similar concern but since this isn't a part of the public API, I think we can address it later and not block merging this.
| extension HTTPURLResponse { | ||
| convenience init(dictionary: [String: Any]) { | ||
| let url = URL(string: dictionary["url"] as! String)! | ||
| self.init(url: url, mimeType: nil, expectedContentLength: 0, textEncodingName: nil) |
| return addDataTask(request) | ||
| } | ||
|
|
||
| public override func dataTaskWithRequest(request: NSURLRequest, completionHandler: (NSData?, NSURLResponse?, NSError?) -> Void) -> NSURLSessionDataTask { | ||
| open override func dataTask(with request: URLRequest, completionHandler: @escaping ((Data?, Foundation.URLResponse?, Error?) -> Void)) -> URLSessionDataTask { |
| return addDownloadTask(request) | ||
| } | ||
|
|
||
| public override func downloadTaskWithRequest(request: NSURLRequest, completionHandler: (NSURL?, NSURLResponse?, NSError?) -> Void) -> NSURLSessionDownloadTask { | ||
| open override func downloadTask(with request: URLRequest, completionHandler: @escaping (URL?, Foundation.URLResponse?, Error?) -> Void) -> URLSessionDownloadTask { |
| return addUploadTask(request, fromData: bodyData) | ||
| } | ||
|
|
||
| public override func uploadTaskWithRequest(request: NSURLRequest, fromData bodyData: NSData?, completionHandler: (NSData?, NSURLResponse?, NSError?) -> Void) -> NSURLSessionUploadTask { | ||
| open override func uploadTask(with request: URLRequest, from bodyData: Data?, completionHandler: @escaping (Data?, Foundation.URLResponse?, Error?) -> Void) -> URLSessionUploadTask { |
| return addUploadTask(request, fromData: data) | ||
| } | ||
|
|
||
| public override func uploadTaskWithRequest(request: NSURLRequest, fromFile fileURL: NSURL, completionHandler: (NSData?, NSURLResponse?, NSError?) -> Void) -> NSURLSessionUploadTask { | ||
| let data = NSData(contentsOfURL: fileURL)! | ||
| open override func uploadTask(with request: URLRequest, fromFile fileURL: URL, completionHandler: @escaping (Data?, Foundation.URLResponse?, Error?) -> Void) -> URLSessionUploadTask { |
| print("[DVR] Persisted cassette at \(outputPath). Please add this file to your test target") | ||
| return |
|
Thanks for owning this @eliperkins <3 |
olegdanu-newstore
pushed a commit
to NewStore/DVR
that referenced
this pull request
Sep 27, 2018
* Update to Swift 3 * Bump version 0.4.0 * Rename HTTPURLResponse file too * Prefer private over fileprivate * Fix serializating HTTPURLResponse * Don't say we failed if we didn't * Swift 3.0.1 * tvOS target * Swift 3.0.1 * Fix tvOS deployment target * Fix upload tests * Explicitly set SWIFT_VERSION Without this, Xcode complains about the legacy Swift version not being set. * Remove explicit toolchain from CI * Specify SDK for CI * Add destinations for CI ...because Travis CI is so good. * Use latest version of Xcode * Clean up spacing
olegdanu-newstore
pushed a commit
to NewStore/DVR
that referenced
this pull request
Sep 28, 2018
* Update to Swift 3 * Bump version 0.4.0 * Rename HTTPURLResponse file too * Prefer private over fileprivate * Fix serializating HTTPURLResponse * Don't say we failed if we didn't * Swift 3.0.1 * tvOS target * Swift 3.0.1 * Fix tvOS deployment target * Fix upload tests * Explicitly set SWIFT_VERSION Without this, Xcode complains about the legacy Swift version not being set. * Remove explicit toolchain from CI * Specify SDK for CI * Add destinations for CI ...because Travis CI is so good. * Use latest version of Xcode * Clean up spacing
olegdanu-newstore
pushed a commit
to NewStore/DVR
that referenced
this pull request
Sep 28, 2018
* Update to Swift 3 * Bump version 0.4.0 * Rename HTTPURLResponse file too * Prefer private over fileprivate * Fix serializating HTTPURLResponse * Don't say we failed if we didn't * Swift 3.0.1 * tvOS target * Swift 3.0.1 * Fix tvOS deployment target * Fix upload tests * Explicitly set SWIFT_VERSION Without this, Xcode complains about the legacy Swift version not being set. * Remove explicit toolchain from CI * Specify SDK for CI * Add destinations for CI ...because Travis CI is so good. * Use latest version of Xcode * Clean up spacing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This brings in the work that @soffes and @n8armstrong have done on getting the Swift 3 branch going.
Supercedes #60 which seems to have become stale.