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.

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

Fix Swift 3.1 compatibility #55

Merged
merged 2 commits into from
Apr 3, 2017
Merged

Fix Swift 3.1 compatibility #55

merged 2 commits into from
Apr 3, 2017

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Apr 2, 2017

Resolved some Swift 3.1 compiler warnings in unit test code. Some optionals should’ve been force-unwrapped because they’d only be used if the optional turned out to be nil.

Also updated dependencies.

/cc @bsudekum

@1ec5 1ec5 added the build label Apr 2, 2017
@1ec5 1ec5 self-assigned this Apr 2, 2017
@1ec5 1ec5 requested a review from bsudekum April 2, 2017 03:44
@@ -1 +1 @@
github "AliSoftware/OHHTTPStubs" "swift-3.0"
github "AliSoftware/OHHTTPStubs" "master"
Copy link

Choose a reason for hiding this comment

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

Always scared of pinning to master

Copy link
Contributor Author

@1ec5 1ec5 Apr 2, 2017

Choose a reason for hiding this comment

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

We aren’t pinning to master. See Cartfile.resolved, which specifies the exact commit hash that carthage bootstrap will always fetch, regardless of newer commits on master in the future. This just specifies our intent so that we can easily carthage update to intentionally grab the latest master in the future.

I’m checking this change in now because AliSoftware/OHHTTPStubs#240 has landed and the Swift 3 branch will go away soon. Once that happens, this repository will be stranded; carthage update will error out until this PR is merged.

@1ec5 1ec5 requested a review from bsudekum April 3, 2017 19:27
@1ec5 1ec5 merged commit 69e4328 into master Apr 3, 2017
@1ec5 1ec5 deleted the 1ec5-swift3.1 branch April 3, 2017 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants