From 475b3810e4e3b85231f8ef7eeec2fed53347042c Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Mon, 26 Feb 2018 17:05:56 +1100 Subject: [PATCH] add a folder of headers to Test fixture --- Tests/Fixtures/TestProject/Headers/Folder1/Header2.h | 0 Tests/Fixtures/TestProject/Headers/Header1.h | 0 .../TestProject/Project.xcodeproj/project.pbxproj | 10 ++++++++++ Tests/Fixtures/TestProject/spec.yml | 8 ++++++-- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 Tests/Fixtures/TestProject/Headers/Folder1/Header2.h create mode 100644 Tests/Fixtures/TestProject/Headers/Header1.h diff --git a/Tests/Fixtures/TestProject/Headers/Folder1/Header2.h b/Tests/Fixtures/TestProject/Headers/Folder1/Header2.h new file mode 100644 index 00000000..e69de29b diff --git a/Tests/Fixtures/TestProject/Headers/Header1.h b/Tests/Fixtures/TestProject/Headers/Header1.h new file mode 100644 index 00000000..e69de29b diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index dbda2620..b6ceacc3 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -16,7 +16,9 @@ BF_211435872001 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = VG_473000061463 /* Localizable.strings */; }; BF_225293845818 = {isa = PBXBuildFile; fileRef = FR_507023492251 /* App_watchOS Extension.appex */; }; BF_237760701422 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR_987043315473 /* Assets.xcassets */; }; + BF_239684316986 /* Headers in Headers */ = {isa = PBXBuildFile; fileRef = FR_815403394914 /* Headers */; settings = {ATTRIBUTES = (Public, ); }; }; BF_243071719122 /* FrameworkFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_172952167809 /* FrameworkFile.swift */; }; + BF_259448131292 /* Headers in Headers */ = {isa = PBXBuildFile; fileRef = FR_815403394914 /* Headers */; settings = {ATTRIBUTES = (Public, ); }; }; BF_268392110450 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR_587738154368 /* Assets.xcassets */; }; BF_279581961655 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FR_868653349092 /* Assets.xcassets */; settings = {COMPILER_FLAGS = "-Werror"; }; }; BF_280535243540 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = VG_609193904586 /* Main.storyboard */; }; @@ -35,6 +37,7 @@ BF_470396236719 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_410645050443 /* Alamofire.framework */; }; BF_496472559782 /* MyFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_183521624014 /* MyFramework.h */; settings = {ATTRIBUTES = (Public, ); }; }; BF_503484983186 /* MoreUnder.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_196911129660 /* MoreUnder.swift */; }; + BF_510053944904 /* Headers in Headers */ = {isa = PBXBuildFile; fileRef = FR_815403394914 /* Headers */; settings = {ATTRIBUTES = (Public, ); }; }; BF_511197657446 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_452853029807 /* Alamofire.framework */; }; BF_532503207298 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_752394658615 /* Alamofire.framework */; }; BF_538515166673 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = VG_256263906698 /* LaunchScreen.storyboard */; }; @@ -55,6 +58,7 @@ BF_892119987440 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_854336462818 /* AppDelegate.swift */; settings = {COMPILER_FLAGS = "-Werror"; }; }; BF_901390118565 /* FrameworkFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_172952167809 /* FrameworkFile.swift */; }; BF_905038616071 /* Framework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FR_472296042419 /* Framework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + BF_905617636654 /* Headers in Headers */ = {isa = PBXBuildFile; fileRef = FR_815403394914 /* Headers */; settings = {ATTRIBUTES = (Public, ); }; }; BF_940936137577 = {isa = PBXBuildFile; fileRef = FR_123503999387 /* App_iOS_UITests.xctest */; }; /* End PBXBuildFile section */ @@ -175,6 +179,7 @@ FR_752394658615 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = ""; }; FR_771029596306 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; FR_783122899910 /* App_iOS_Tests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = App_iOS_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + FR_815403394914 /* Headers */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Headers; sourceTree = SOURCE_ROOT; }; FR_825232110500 /* App_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; FR_854336462818 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; FR_868653349092 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -403,6 +408,7 @@ G_8620238527590 /* Products */, G_7189434949822 /* Resources */, G_6651250437419 /* StandaloneFiles */, + FR_815403394914 /* Headers */, FR_257073931060 /* ResourceFolder */, ); indentWidth = 2; @@ -442,6 +448,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + BF_239684316986 /* Headers in Headers */, BF_813358525536 /* MyFramework.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -450,6 +457,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + BF_510053944904 /* Headers in Headers */, BF_425679397292 /* MyFramework.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -458,6 +466,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + BF_905617636654 /* Headers in Headers */, BF_496472559782 /* MyFramework.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -466,6 +475,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + BF_259448131292 /* Headers in Headers */, BF_734036107922 /* MyFramework.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Tests/Fixtures/TestProject/spec.yml b/Tests/Fixtures/TestProject/spec.yml index 5862bad3..8bfc791d 100644 --- a/Tests/Fixtures/TestProject/spec.yml +++ b/Tests/Fixtures/TestProject/spec.yml @@ -81,7 +81,11 @@ targets: Framework: type: framework platform: [iOS, tvOS, watchOS, macOS] - sources: Framework + sources: + - Framework + - path: Headers + buildPhase: headers + type: folder postbuildScripts: - name: MyScript path: scripts/script.sh @@ -102,7 +106,7 @@ targets: schemes: Framework: build: - parallelizeBuild: false + parallelizeBuild: false buildImplicitDependencies: false targets: Framework_iOS: all