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

feat: add support for Swift Package Manager #15

Merged
merged 4 commits into from
Jan 30, 2017
Merged

Conversation

krzysztofzablocki
Copy link
Contributor

Ads suport for Swift Package Manager

@krzysztofzablocki krzysztofzablocki force-pushed the feature/spm-support branch 2 times, most recently from 52000f1 to d4dd12b Compare January 27, 2017 14:29
Copy link
Contributor

@AliSoftware AliSoftware left a comment

Choose a reason for hiding this comment

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

Except the #if trick, seems mainly OK to me

But I saw in Slack that you had to do some other changes? And I've only reviewed that in the GitHub web interface and not been able to test it in practice yet, so I'll let you test it in practice and merge once ready.

import Stencil

#if os(Linux)
#if swift(>=3.1)
Copy link
Contributor

Choose a reason for hiding this comment

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

Indeed #if swift(<3.1) isn't a valid syntax… But I think #if ! swift(>=3.1) is. This would avoid an empty #if body and the main logic in the #else

You could even probably just write #if os(Linux) && ! swift(>=3.1)

Copy link
Member

Choose a reason for hiding this comment

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

See the spm branch I made, is esentially this + tests

Copy link
Contributor

Choose a reason for hiding this comment

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

Is it a branch that is based on @krzysztofzablocki 's feature/spm-support branch of this PR or a separate branch from develop? (Sorry I'm in the train, not enough connection for git fetch to work reliably to check myself 😄)

@djbe This branch is on the repo (and not a fork), and you both have ( @krzysztofzablocki + you) push access on this repo, so you should be able to add commits to this branch instead of creating a separate one, any reason not to here?

Copy link
Member

@djbe djbe Jan 27, 2017

Choose a reason for hiding this comment

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

Only because I was playing around and wanted to let him compare. I'll delete mine and push the changes here, gimme a moment while I rebase the rest of the branches (so many branches 😆)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Might be worth adding swift build/test to avoid regression

Copy link
Member

Choose a reason for hiding this comment

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

Dunno, Rakefile (Xcode project) and swift package test the same thing. Testing both would just double the length of the CI tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think its important because dependency bindings between podspec and spm are different, you might end up in situation when we update podspec dependency and forget SPM one and swift test / build would prevent it

Copy link
Member

Choose a reason for hiding this comment

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

Can you add it to the rakefile? swift build && swift test
My rake test is broken for some reason (I really really really hate ruby version shizzle)

@djbe djbe force-pushed the feature/spm-support branch 2 times, most recently from 6ac945a to d50fc84 Compare January 28, 2017 14:43
@djbe djbe force-pushed the feature/spm-support branch from d50fc84 to c630580 Compare January 28, 2017 21:37
Copy link
Member

@djbe djbe left a comment

Choose a reason for hiding this comment

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

Would xcpretty work with SPM's output?

@krzysztofzablocki
Copy link
Contributor Author

not afaik

@krzysztofzablocki
Copy link
Contributor Author

can we merge this?

@AliSoftware AliSoftware merged commit 4cecc56 into master Jan 30, 2017
@AliSoftware AliSoftware mentioned this pull request Jan 30, 2017
@djbe djbe deleted the feature/spm-support branch January 30, 2017 17:10
@djbe djbe modified the milestone: 1.0.0 Jan 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants