Skip to content

Conversation

@jspahrsummers
Copy link
Contributor

The unit tests don't currently build, because Specta/Expecta haven't yet been updated for Xcode 6.

@joshaber
Copy link
Member

So... we shouldn't merge these until the unit tests work, yes?

@jspahrsummers jspahrsummers changed the title Xcode 6 support [WIP] Xcode 6.1 support Oct 22, 2014
@jspahrsummers
Copy link
Contributor Author

😩

(still a work in progress)

Unfortunately, this affects all importers of ObjectiveGit, because
otherwise Clang will complain about libgit2 headers not being imported
directly.
This partially reverts commit 884c069.

Conflicts:
	Classes/GTCredential.h
	Classes/GTDiff.h
	Classes/GTDiffDelta.h
	Classes/GTEnumerator.h
	Classes/GTRepository.h
This way, we’ll look for framework-style imports within the source tree
first, instead of jumping straight to the build products and
potentially causing duplicate definitions.
@jspahrsummers
Copy link
Contributor Author

Here are the build failures I'm seeing.

@isaac It looks like you wrote the original iOS build scripts. Do you have any idea what might be going on?

@libgit2/classy-objective-c-collaborators Have any of you used the iOS target? Would you know how to get it to build on this branch? 😕

@alanjrogers
Copy link
Contributor

@jspahrsummers I think I was the last one to mess with those build scripts... I can take a look.

@jspahrsummers
Copy link
Contributor Author

@alanjrogers ❤️

jspahrsummers and others added 2 commits October 27, 2014 23:03
Fix the iOS build scripts for Xcode 6 building
We can’t actually run them because we don’t have NSTask on iOS, so we
can’t unarchive the fixtures.
@joshvera
Copy link
Member

Is this ready for review?

@jspahrsummers
Copy link
Contributor Author

@joshvera Now it should be.

Note that there are no iOS tests, because NSTask (which we use in the tests) doesn't exist there. This isn't a regression.

I also had to bump the iOS deployment target to 8.0 to make framework builds sane. See ReactiveCocoa/ReactiveCocoa#1413 (comment) for more context.

@jspahrsummers jspahrsummers changed the title [WIP] Xcode 6.1 support Xcode 6.1 support Oct 28, 2014
@joshaber joshaber self-assigned this Oct 28, 2014
@joshaber
Copy link
Member

joshaber added a commit that referenced this pull request Oct 28, 2014
@joshaber joshaber merged commit 876c099 into master Oct 28, 2014
@phatblat phatblat deleted the xcode6 branch April 8, 2016 01:59
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.

5 participants