From 90b0d18dbeb6f65f1f97a4d96b6a5a757f60952e Mon Sep 17 00:00:00 2001 From: Vlad Gorloff Date: Fri, 17 Aug 2018 09:22:06 +0200 Subject: [PATCH] Fixes issue with wrong build phase for Metal files. https://github.com/yonaskolb/XcodeGen/issues/379 --- Sources/XcodeGenKit/SourceGenerator.swift | 2 +- Tests/XcodeGenKitTests/SourceGeneratorTests.swift | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift index 87e27df3..77a6f5d6 100644 --- a/Sources/XcodeGenKit/SourceGenerator.swift +++ b/Sources/XcodeGenKit/SourceGenerator.swift @@ -188,7 +188,7 @@ class SourceGenerator { } if let fileExtension = path.extension { switch fileExtension { - case "swift", "m", "mm", "cpp", "c", "cc", "S", "xcdatamodeld": return .sources + case "swift", "m", "mm", "cpp", "c", "cc", "S", "xcdatamodeld", "metal": return .sources case "h", "hh", "hpp", "ipp", "tpp", "hxx", "def": return .headers case "modulemap": guard targetType == .staticLibrary else { return nil } diff --git a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift index 11525791..b382ab9c 100644 --- a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift +++ b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift @@ -390,6 +390,7 @@ class SourceGeneratorTests: XCTestCase { - file.apns - file.123 - file.xcassets + - file.metal - Info.plist """ try createDirectories(directories) @@ -437,6 +438,7 @@ class SourceGeneratorTests: XCTestCase { try pbxProj.expectFile(paths: ["C", "file.xcassets"], buildPhase: .resources) try pbxProj.expectFile(paths: ["C", "file.123"], buildPhase: .resources) try pbxProj.expectFile(paths: ["C", "Info.plist"], buildPhase: .none) + try pbxProj.expectFile(paths: ["C", "file.metal"], buildPhase: .sources) } $0.it("duplicate TargetSource is included once in sources build phase") {