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

Make vapor compile with swift 4.1 #1384

Merged
merged 2 commits into from Jan 23, 2018

Conversation

Projects
None yet
3 participants
@vi4m
Copy link
Contributor

vi4m commented Dec 22, 2017

Swift 4.1 on Linux removed protocol Boolean aligning behavior with
the macOS/IOS. This PR fixes compilation on Swift 4.1 - dev which previously errored with:

error: cannot convert return expression of type 'ObjCBool' to return type 'Bool'
            return isDirectory

@vi4m vi4m changed the title Unified boolValue behavior across Linux and Mac [Swift 4.1-dev] Unified boolValue behavior across Linux and Mac Dec 22, 2017

@vzsg
Copy link
Member

vzsg left a comment

Thanks for the PR, but please make sure that Swift 3 and 4.0 don't break in the process.

An if swift directive should help.

Unified boolValue behavior across Linux and Mac
Swift 4.1 on Linux removed protocol Boolean aligning behavior with
the macOS/IOS.

@vi4m vi4m force-pushed the vi4m:patch-1 branch from d9c54ff to 5a31fc8 Dec 23, 2017

@vi4m

This comment has been minimized.

Copy link
Contributor Author

vi4m commented Dec 23, 2017

@vzsg I've added it.

@vi4m vi4m changed the title [Swift 4.1-dev] Unified boolValue behavior across Linux and Mac Make vapor compile with swift 4.1 Jan 1, 2018

@vi4m

This comment has been minimized.

Copy link
Contributor Author

vi4m commented Jan 1, 2018

@vzsg @tanner0101 what do you think now?

@vzsg

vzsg approved these changes Jan 1, 2018

@tanner0101 tanner0101 added this to the 2.4.3 milestone Jan 23, 2018

@tanner0101 tanner0101 self-assigned this Jan 23, 2018

@tanner0101 tanner0101 merged commit a07dc83 into vapor:master Jan 23, 2018

3 checks passed

ci/circleci: linux-3 Your tests passed on CircleCI!
Details
ci/circleci: linux-4 Your tests passed on CircleCI!
Details
ci/circleci: macos Your tests passed on CircleCI!
Details
@tanner0101

This comment has been minimized.

Copy link
Member

tanner0101 commented Jan 23, 2018

sorry for the delay, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment