Migrate codebase to Swift 3.0 #345
Merged
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
Changed router to class as can’t reference mutating structs in closure Refactored Range<Int> to CountableClosedRange<Int> Some ugly explicit bridging Change func option(…) to withOptions(…) in Lock.Swift
Removed test code
hzalaz
suggested changes
Nov 25, 2016
| didSet { | ||
| self.iconView?.tintColor = self.titleColor | ||
| self.button?.setTitleColor(self.titleColor, forState: .Normal) | ||
| self.button?.setTitleColor(self.titleColor, for: UIControlState()) |
| guard case .Big = self.size else { return } | ||
| self.button?.setTitle(self.title, forState: .Normal) | ||
| guard case .big = self.size else { return } | ||
| self.button?.setTitle(self.title, for: UIControlState()) |
|
|
||
| public init(size: Size) { | ||
| self.size = size | ||
| super.init(frame: CGRectZero) | ||
| super.init(frame: CGRect.zero) |
| self.logger.error("Response was not NSHTTURLResponse") | ||
| return callback(nil) | ||
| } | ||
|
|
||
| let payload: String? | ||
| if let data = data { | ||
| payload = String(data: data, encoding: NSUTF8StringEncoding) | ||
| payload = String(data: data, encoding: String.Encoding.utf8) |
| } | ||
| } | ||
| } | ||
|
|
||
| private mutating func updateEmail(value: String?) -> ErrorType? { | ||
| self.user.email = value?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()) | ||
| private mutating func updateEmail(_ value: String?) -> Error? { |
There was a problem hiding this comment.
it will be more swifter to use update(email: String?) -> Error?
| let error = self.emailValidator.validate(value) | ||
| self.user.validEmail = error == nil | ||
| return error | ||
| } | ||
|
|
||
| private mutating func updateUsername(value: String?) -> ErrorType? { | ||
| self.user.username = value?.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet()) | ||
| private mutating func updateUsername(_ value: String?) -> Error? { |
There was a problem hiding this comment.
it will be more swifter to use update(username: String?) -> Error?
| let error = self.usernameValidator.validate(value) | ||
| self.user.validUsername = error == nil | ||
| return error | ||
| } | ||
|
|
||
| private mutating func updatePassword(value: String?) -> ErrorType? { | ||
| private mutating func updatePassword(_ value: String?) -> Error? { |
There was a problem hiding this comment.
it will be more swifter to use update(password: String?) -> Error?
| self.user.password = value | ||
| let error = self.passwordValidator.validate(value) | ||
| self.user.validPassword = error == nil | ||
| return error | ||
| } | ||
|
|
||
| private func handleLoginResult(result: Auth0.Result<Credentials>, callback: DatabaseAuthenticatableError? -> ()) { | ||
| private func handleLoginResult(_ result: Auth0.Result<Credentials>, callback: (DatabaseAuthenticatableError?) -> ()) { |
There was a problem hiding this comment.
here just use handle(result: Auth0.Result<Credentials>, callback: (DatabaseAuthenticatableError?) -> (
Don’t suppress Lock returns
hzalaz
approved these changes
Nov 25, 2016
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.
No description provided.