8000 Support Cocoapods 1.5 by davidahouse · Pull Request #781 · Quick/Quick · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Support Cocoapods 1.5 #781

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
Merged
merged 2 commits into from
Apr 17, 2018
Merged

Support Cocoapods 1.5 #781

merged 2 commits into from
Apr 17, 2018

Conversation

davidahouse
Copy link

This PR fixes #780 in relation to Cocoapods 1.5. In this new version of Cocoapods, some things have changed in how header files are found. The recommendation from the Cocoapods team seems to be to change the imports to this:

#if __has_include("Quick-Swift.h")
#import "Quick-Swift.h"
#else
#import <Quick/Quick-Swift.h>
#endif

I tested this against my app and it seems to work fine with no side-effects.

ikesyo
ikesyo requested changes Apr 17, 2018
View reviewed changes
Copy link
Member
@ikesyo ikesyo left a comment

Choose a reason for hiding this comment

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

Could you please remove some extra empty lines? Otherwise looks good 👍

Sources/QuickObjectiveC/DSL/World+DSL.h
#import <Quick/Quick-Swift.h>
#endif

Copy link
Member

Choose a reason for hiding this comment

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

[nit] An extra empty line.

Sources/QuickObjectiveC/QuickSpec.m
#import <Quick/Quick-Swift.h>
#endif

Copy link
Member

Choose a reason for hiding this comment

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

Ditto

Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m
#import <Quick/Quick-Swift.h>
#endif

Copy link
Member

Choose a reason for hiding this comment

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

Ditto

@QuickBot
Copy link
QuickBot commented Apr 17, 2018 •
edited
Loading
1 Warning
⚠️ Need to add an unit test if you’re modifying swift source

Generated by 🚫 danger

@davidahouse
Copy link
Author

@ikesyo fixed!

@ikesyo
Copy link
Member
ikesyo commented Apr 17, 2018

I can’t see any differences unfortunately 🤔

@davidahouse
Copy link
Author

It looks correct on Github. I did force-push to my branch so if you have it locally then you should delete and grab it again. Sorry about that.

@ikesyo
Copy link
Member
ikesyo commented Apr 17, 2018

The three extra empty lines I noted above still exist on GitHub GUI. But those are just stylistic ones so let’s merge this as is.

Thanks for the pull request!

@ikesyo ikesyo merged commit 2b1e62f into Quick:master Apr 17, 2018
@Machipla Machipla mentioned this pull request Dec 27, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ikesyo ikesyo ikesyo requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Can't compile because "Nimble/Nimble-Swift.h" can't be found. CocoaPods 1.5 & static
4 participants
@davidahouse @QuickBot @ikesyo @KPMobileDevOps
0