Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NSURL -> URL in Swift code #797

Merged
merged 2 commits into from
Sep 21, 2018
Merged

NSURL -> URL in Swift code #797

merged 2 commits into from
Sep 21, 2018

Conversation

funkyboy
Copy link
Contributor

Fix #794

ricardopereira
ricardopereira suggested changes Sep 13, 2018
View reviewed changes
Spec/Auth.swift Outdated
@@ -382,7 +382,7 @@ class Auth : QuickSpec {
// - authCallback and authUrl are both specified
let cases: [String: (ARTAuthOptions) -> ()] = [
"useTokenAuth and no key":{ $0.useTokenAuth = true },
"authCallback and authUrl":{ $0.authCallback = { params, callback in /*nothing*/ }; $0.authUrl = NSURL(string: "http://auth.ably.io") as URL? }
"authCallback and authUrl":{ $0.authCallback = { params, callback in /*nothing*/ }; $0.authUrl = URL(string: "http://auth.ably.io") as URL? }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove the as URL? too:

URL(string: "http://auth.ably.io") as URL?
                                   ^~~~~~~

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ricardopereira good point :) ae08377

paddybyers
paddybyers approved these changes Sep 13, 2018
View reviewed changes
Copy link
Member

@paddybyers paddybyers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks

@ricardopereira ricardopereira merged commit dc744e2 into develop Sep 21, 2018
@ricardopereira ricardopereira deleted the replace-nsurl branch September 21, 2018 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paddybyers paddybyers paddybyers approved these changes

@ricardopereira ricardopereira ricardopereira approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@funkyboy @paddybyers @ricardopereira