Merge pull request #537 from yonaskolb/fix_included_template_paths

Fix relative paths in included target templates

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Sources outside a project spec's directory will be correctly referenced as relative paths in the project file. [#524](https://github.com/yonaskolb/XcodeGen/pull/524)
 - Fixed error when `optional` path is missing [#527](https://github.com/yonaskolb/XcodeGen/pull/527) @yonaskolb
 - Fixed excludes within included spec [#535](https://github.com/yonaskolb/XcodeGen/pull/535) @yonaskolb
+- Fixed paths in target templates within included files not being relative [#537](https://github.com/yonaskolb/XcodeGen/pull/537) @yonaskolb
 
 ## 2.2.0
 

Sources/ProjectSpec/Project.swift

@@ -184,6 +184,7 @@ extension Project: PathContainer {
             .string("configFiles"),
             .object("options", SpecOptions.pathProperties),
             .object("targets", Target.pathProperties),
+            .object("targetTemplates", Target.pathProperties),
             .object("aggregateTargets", AggregateTarget.pathProperties),
         ]
     }

Tests/Fixtures/paths_test.yml

@@ -6,6 +6,7 @@ targets:
   NewTarget:
     type: application
     platform: iOS
+    templates: [Template1]
     configFiles:
       Config: config
     sources:

Tests/Fixtures/paths_test/included_paths_test.yml

@@ -30,3 +30,7 @@ aggregateTargets:
       Config: config
     buildScripts:
     - path: buildScript
+targetTemplates:
+  Template1:
+    sources:
+      - template_source

Tests/XcodeGenKitTests/SpecLoadingTests.swift

@@ -81,7 +81,10 @@ class SpecLoadingTests: XCTestCase {
                         type: .application,
                         platform: .iOS,
                         configFiles: ["Config": "config"],
-                        sources: ["source"],
+                        sources: [
+                            "paths_test/template_source",
+                            "source",
+                            ],
                         dependencies: [Dependency(type: .framework, reference: "Framework")],
                         info: Plist(path: "info"),
                         entitlements: Plist(path: "entitlements"),