Merge pull request #751 from PycKamil/use_relative_path_for_XcodeProj

Use full path for XcodeProj
yonaskolb · Jan 12, 2020 · 480477a · 480477a
2 parents 308b351 + 74203dc
commit 480477a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 #### Fixed
 - Fixed resolving a relative path for `projectReference.path` [#740](https://github.com/yonaskolb/XcodeGen/pull/740) @kateinoigakukun
 - Don't add framework dependency's directory to `FRAMEWORK_SEARCH_PATHS` if it is implicit [#744](https://github.com/yonaskolb/XcodeGen/pull/744) @ikesyo @yutailang0119
+- Fixed resolving relative path passed to `XcodeProj` [#751](https://github.com/yonaskolb/XcodeGen/pull/751) @PycKamil
 
 #### Internal
 - Update to SwiftCLI 6.0 and use the new property wrappers [#749](https://github.com/yonaskolb/XcodeGen/pull/749) @yonaskolb

diff --git a/Sources/XcodeGenKit/SchemeGenerator.swift b/Sources/XcodeGenKit/SchemeGenerator.swift
@@ -1,6 +1,7 @@
 import Foundation
 import ProjectSpec
 import XcodeProj
+import PathKit
 
 private func suitableConfig(for type: ConfigType, in project: Project) -> Config {
     if let defaultConfig = Config.defaultConfigs.first(where: { $0.type == type }),
@@ -34,7 +35,7 @@ public class SchemeGenerator {
         if let cachedProject = projects[reference] {
             return cachedProject
         }
-        let pbxproj = try XcodeProj(pathString: reference.path).pbxproj
+        let pbxproj = try XcodeProj(path: project.basePath + Path(reference.path)).pbxproj
         projects[reference] = pbxproj
         return pbxproj
     }