Skip to content

Conversation

AnZhg
Copy link
Contributor

@AnZhg AnZhg commented Jan 9, 2017

Changes are updated due to PR #30 . Sorry I have to delete the previous branch (It was polluted by Chinese support, but I intended not to include) and start over.

Two new categories are added.

@kostub
Copy link
Owner

kostub commented Jan 10, 2017

This is great work! Thanks for the PR. I'm merging the changes in.

It would be useful to write a travis build for the MacOS project as well. That way someone won't break it by accidentally importing UIKit without the TARGET_IPHONE directive.

@kostub kostub merged commit eff878b into kostub:master Jan 10, 2017
@AnZhg
Copy link
Contributor Author

AnZhg commented Jan 10, 2017

I don't know what happened. Actually, this PR is merged, but #29 also shows merged. Maybe they have the same name?

How did you write the travis build for iOS? I need some help. I never work with that.

@kostub
Copy link
Owner

kostub commented Jan 10, 2017

I think I know what happened. This PR has the commits from Chinese support PR and then it has a Cleanup commit that undoes it. Here is what you should do on your master branch:

git revert 4532586

That will undo your cleanup commit which will bring back the Chinese support. Then push your branch and create a new PR.

@AnZhg
Copy link
Contributor Author

AnZhg commented Jan 10, 2017

I have my Chinese support in master branch, and I think it needs improvements. So I created this branch and issued a PR. Anyway, I messed up my commits.

@kostub
Copy link
Owner

kostub commented Jan 10, 2017

For travis, create a scheme file for building the MacOS version and then add it to the .travis.yml file. The xcode_schemes can be an array.

See: https://docs.travis-ci.com/user/languages/objective-c/ for documentation on how to create a scheme file.

@AnZhg
Copy link
Contributor Author

AnZhg commented Jan 10, 2017

Thank you! I learned a lot from you.

I will try to write travis build tonight when I have access to my Mac.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants