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

Fixes CardFlight integration #695

Merged
merged 3 commits into from
Oct 29, 2018
Merged

Fixes CardFlight integration #695

merged 3 commits into from
Oct 29, 2018

Conversation

ashfurrow
Copy link
Contributor

This PR unblocks work on our Q4 Kiosk Updates.

This reverts #687. See this Jira ticket for more info. We need to build against Xcode 9 because Xcode 10 removes libstdc++.6.0.9 and CardFlight v3 requires it to link against. To that end, I'm merging into the Xcode-9 branch, which can run parallel to master for now.

In the mean time, this PR also includes a fix for the initial problem that prompted me to upgrade to CardFlight 4:
2a2a48f

@ashfurrow ashfurrow self-assigned this Oct 29, 2018
@ashfurrow
Copy link
Contributor Author

Okay..... Circle CI needs upgrading too. I've opened a ticket to track that and have verified that the tests pass locally.

@ashfurrow ashfurrow merged commit b0ef368 into xcode-9 Oct 29, 2018
@ashfurrow ashfurrow deleted the cardflight-revert branch October 29, 2018 21:01
ashfurrow added a commit that referenced this pull request Oct 30, 2018
ashfurrow added a commit that referenced this pull request Oct 30, 2018
ashfurrow added a commit that referenced this pull request Oct 30, 2018
ashfurrow added a commit that referenced this pull request Oct 30, 2018
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.

1 participant