Fix header phase for static frameworks (#705)

yonaskolb · Nov 6, 2019 · c590558 · c590558
1 parent 1cdb5dc
commit c590558
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 #### Fixed
 - Improved variable expansion runtime [#704](https://github.com/yonaskolb/XcodeGen/pull/704) @rcari
+- Fixed missing headers for static framework targets [#705](https://github.com/yonaskolb/XcodeGen/pull/705) @wag-miles
 
 #### Changed
 - Deprecated `$old_form` variables in favor of `${new_form}` variables [#704](https://github.com/yonaskolb/XcodeGen/pull/704) @rcari

diff --git a/Sources/ProjectSpec/XCProjExtensions.swift b/Sources/ProjectSpec/XCProjExtensions.swift
@@ -15,7 +15,7 @@ extension PBXProductType {
     }
 
     public var isFramework: Bool {
-        return self == .framework
+        return self == .framework || self == .staticFramework
     }
 
     public var isLibrary: Bool {

diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift
@@ -710,7 +710,7 @@ public class PBXProjGenerator {
 
         let headersBuildPhaseFiles = getBuildFilesForPhase(.headers)
         if !headersBuildPhaseFiles.isEmpty {
-            if target.type == .framework || target.type == .dynamicLibrary {
+            if target.type.isFramework || target.type == .dynamicLibrary {
                 let headersBuildPhase = addObject(PBXHeadersBuildPhase(files: headersBuildPhaseFiles))
                 buildPhases.append(headersBuildPhase)
             } else {

diff --git a/Tests/XcodeGenKitTests/ProjectGeneratorTests.swift b/Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
@@ -739,7 +739,7 @@ class ProjectGeneratorTests: XCTestCase {
                 try expect(app3OtherLinkerSettings.contains("-ObjC")) == true
             }
 
-            $0.it("copies Swfit Objective-C Interface Header") {
+            $0.it("copies Swift Objective-C Interface Header") {
                 let swiftStaticLibraryWithHeader = Target(
                     name: "swiftStaticLibraryWithHeader",
                     type: .staticLibrary,