Skip to content
This repository has been archived by the owner on Jan 19, 2020. It is now read-only.

Added support for xcode 8.x #43

Merged
merged 7 commits into from Jun 16, 2017
Merged

Conversation

karnikad
Copy link
Contributor

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.

Fixes #41 and #42

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.
@karnikad
Copy link
Contributor Author

@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.

@misterfifths
Copy link
Collaborator

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!

@misterfifths
Copy link
Collaborator

misterfifths commented Jun 15, 2017

Hm.. well, not the most scientific approach, but I did a few things and got it working:

  • Switched to the xcode8.1 image for Travis
  • Switched from xctool back to xcodebuild. xctool's build functionality is apparently deprecated.
  • Updated xcconfigs and Cocoapods integration

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.
@misterfifths misterfifths merged commit ad52145 into crushlovely:master Jun 16, 2017
@misterfifths
Copy link
Collaborator

👍 Looks good to me! All merged.

@karnikad
Copy link
Contributor Author

Thank you for the merge.

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

Successfully merging this pull request may close these issues.

None yet

2 participants