Update project for Xcode 7 and Swift 2 #159
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
jakecraige
force-pushed
the
jc-swift-upgrade
branch
2 times, most recently
from
75ba944
to
91e1f28
Compare
- Required config updates - Remove redundant Printable protocol - Fix custom Temperature compare function args - Move storyboard from Sources into Resources More info: liftoffcli/liftoff#239 - Fix naming conflict of `describe` from Quick and Specta in TRTemperatureComparisonFormatterSpec.m by using Quick instead of Specta. - Update Pod dependencies - Update Carthage dependencies - Update CircleCI xcode version - Use `bin/test` in Circle since xctool is not working properly with Xcode 7 Make bin/test work again
jakecraige
force-pushed
the
jc-swift-upgrade
branch
from
4b73746
to
97e62c6
Compare
| @@ -13,7 +13,7 @@ func -(lhs: Temperature, rhs: Temperature) -> Temperature { | |||
| return Temperature(fahrenheitValue: lhs.fahrenheitValue - rhs.fahrenheitValue) | |||
| } | |||
|
|
|||
| @objc class Temperature: NSObject, Printable { | |||
| @objc class Temperature: NSObject { | |||
There was a problem hiding this comment.
Couldn't we still declare conformance to CustomStringConvertible? That would let us string-interpolate an instance of Temperature in the future.
There was a problem hiding this comment.
If I remember correctly, I think Xcode was now complaining that it was redundant since NSObject already does it. We still have the implementation https://github.com/thoughtbot/Tropos/blob/jc-swift-upgrade/Tropos/Models/Temperature.swift#L42-L45
There was a problem hiding this comment.
Aha! Didn't know that. Cool. Thanks!
|
👍 |
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.
More info: Add documentation about fixing crashes when upgrading to Xcode 7 liftoffcli/liftoff#239
describefrom Quick and Spectain TRTemperatureComparisonFormatterSpec.m by using Quick instead
of Specta.