Skip to content

Commit

Permalink
No need carthage copy-frameworks for macOS app (#76)
Browse files Browse the repository at this point in the history
* No need carthage copy-frameworks for macOS

* Update CHANGELOG.md
  • Loading branch information
toshi0383 authored and yonaskolb committed Sep 29, 2017
1 parent 6901f8b commit 4227ac2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,7 @@

### Fixed
- Fixed wrong carthage directory name reference for macOS [#74](https://github.com/yonaskolb/XcodeGen/pull/74)
- Removed unnecessary `carthage copy-frameworks` for macOS app target [#76](https://github.com/yonaskolb/XcodeGen/pull/76)

## 1.2.2

Expand Down
2 changes: 1 addition & 1 deletion Sources/XcodeGenKit/PBXProjGenerator.swift
Expand Up @@ -383,7 +383,7 @@ public class PBXProjGenerator {

if !carthageFrameworks.isEmpty {

if target.type.isApp {
if target.type.isApp && target.platform != .macOS {
let inputPaths = carthageFrameworks.map { "$(SRCROOT)/\(carthageBuildPath)/\(target.platform)/\($0)\($0.contains(".") ? "" : ".framework")" }
let carthageScript = PBXShellScriptBuildPhase(reference: generateUUID(PBXShellScriptBuildPhase.self, "Carthage" + target.name), files: [], name: "Carthage", inputPaths: inputPaths, outputPaths: [], shellPath: "/bin/sh", shellScript: "/usr/local/bin/carthage copy-frameworks\n")
addObject(carthageScript)
Expand Down

0 comments on commit 4227ac2

Please sign in to comment.