This repository has been archived by the owner on Jan 19, 2020. It is now read-only.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Modified the code to make it work with xcode 8.x. Had to make the following changes: 1. Changed the xcode version check to now allow Xcode 8.x 2. Added --allow-unrelated-histories flag to git as git 2.11 is shipped with mac os x sierra and the previous command was failing here.
@misterfifths can you please help me with this PR. Seems like the tests have timed out. I don't know whether it is due to the TravisCI configuration. They have now xcode 7.3.1 images from November 2016. |
Hey! This looks great! Sorry for the delay.. it's been a crazy week. I'll take a look at the Travis situation tomorrow. Thanks for your work! |
Hm.. well, not the most scientific approach, but I did a few things and got it working:
The branch is here: https://github.com/crushlovely/Amaro/tree/karnikad-master. Probably what makes sense is for you to merge that into your fork, which will update this PR. From your clone of your fork, something like this: $ git remote add upstream https://github.com/crushlovely/Amaro.git
$ git fetch upstream
$ git merge upstream/karnikad-master
# make sure everything is to your liking for the PR, and then:
$ git push Thanks again! |
Modified the code to make it work with xcode 8.x. Had to make the following changes: 1. Changed the xcode version check to now allow Xcode 8.x 2. Added --allow-unrelated-histories flag to git as git 2.11 is shipped with mac os x sierra and the previous command was failing here.
👍 Looks good to me! All merged. |
Thank you for the merge. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modified the code to make it work with xcode 8.x. Had to make the
following changes:
with mac os x sierra and the previous command was failing here.
Fixes #41 and #42