Skip to content

Commit

Permalink
Fix skipping of projects with no shared schemes
Browse files Browse the repository at this point in the history
  • Loading branch information
mdiep committed Mar 10, 2017
1 parent 187730f commit 7bfa524
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions Source/CarthageKit/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1000,17 +1000,19 @@ public final class Project {
options.derivedDataPath = derivedDataVersioned.resolvingSymlinksInPath().path

return buildDependencyProject(dependency, self.directoryURL, withOptions: options, sdkFilter: sdkFilter)
.flatMapError { error in
switch error {
case .noSharedFrameworkSchemes:
// Log that building the dependency is being skipped,
// not to error out with `.noSharedFrameworkSchemes`
// to continue building other dependencies.
self._projectEventsObserver.send(value: .skippedBuilding(project, error.description))
return .empty

default:
return SignalProducer(error: error)
.map { producer in
return producer .flatMapError { error in
switch error {
case .noSharedFrameworkSchemes:
// Log that building the dependency is being skipped,
// not to error out with `.noSharedFrameworkSchemes`
// to continue building other dependencies.
self._projectEventsObserver.send(value: .skippedBuilding(project, error.description))
return .empty

default:
return SignalProducer(error: error)
}
}
}
}
Expand Down

0 comments on commit 7bfa524

Please sign in to comment.