Bugfix/SimulateLocation Fix (yonaskolb#973)

* Preemptively fix compilation for latest XcodeProj

* Add StoreKitConfiguration to scheme and generator

* Add scheme generator test

* Fix and add tests

* Support StoreKitConfiguration in TargetScheme

* Set default type of `storekit` to `.none`

* Upgrade XcodeProj to 7.15.0

* Create struct for StoreKitConfiguration

* Update tests

* Add storekit configuration to test project

* Update changelog

* Update project spec

* Fix xcodeprojs

* Fix projects

* Capitalize String

* Update CHANGELOG.md

Co-authored-by: Gemma Barlow <gemmakbarlow@gmail.com>

* Refactor StoreKitConfiguration init from json

* Change `forWorkspace` to `pathPrefix` and add tests

* Replace StoreKitConfiguration struct with string + option

* Fix tests

* Update project spec

* Fixup changelog

* Add `See Options` to `storeKitConfiguration` in project spec

* Make `simulateLocation` respect `schemePathPrefix`

* Update docs

Co-authored-by: Gemma Barlow <gemmakbarlow@gmail.com>

CHANGELOG.md

@@ -14,6 +14,7 @@
 #### Changed
 - **Breaking**: Info.plists with custom prefixes are no longer added to the Copy Bundle Resources build phase [#945](https://github.com/yonaskolb/XcodeGen/pull/945) @anivaros
 - **Breaking**: `workingDirectory` of included legacy targets is now made relative to including project [#981](https://github.com/yonaskolb/XcodeGen/pull/981) @jcolicchio
+- **Breaking**: Make `simulateLocation` respect `schemePathPrefix` option. [#973](https://github.com/yonaskolb/XcodeGen/pull/973) @jcolicchio
 
 #### Fixed
 - Fixed error message output for `minimumXcodeGenVersion`. [#967](https://github.com/yonaskolb/XcodeGen/pull/967) @joshwalker

Docs/ProjectSpec.md

@@ -840,6 +840,8 @@ targets:
  - location.gpx
 ```
 
+Note that the path the gpx file will be prefixed according to the `schemePathPrefix` option in order to support both `.xcodeproj` and `.xcworkspace` setups. See [Options](#options).
+
 
 ### Environment Variable
 

Sources/XcodeGenKit/SchemeGenerator.swift

@@ -228,7 +228,7 @@ public class SchemeGenerator {
  var locationScenarioReference: XCScheme.LocationScenarioReference?
  if let simulateLocation = scheme.run?.simulateLocation, var identifier = simulateLocation.defaultLocation, let referenceType = simulateLocation.referenceType {
  if referenceType == .gpx {
- var path = Path("../\(identifier)")
+ var path = Path(components: [project.options.schemePathPrefix, identifier])
  path = path.simplifyingParentDirectoryReferences()
  identifier = path.string
  }

Tests/XcodeGenKitTests/SchemeGeneratorTests.swift

@@ -164,7 +164,7 @@ class SchemeGeneratorTests: XCTestCase {
  let scheme = Scheme(
  name: "EnvironmentVariablesScheme",
  build: Scheme.Build(targets: [buildTarget]),
- run: Scheme.Run(config: "Debug", environmentVariables: runVariables, storeKitConfiguration: "Configuration.storekit"),
+ run: Scheme.Run(config: "Debug", environmentVariables: runVariables, simulateLocation: .init(allow: true, defaultLocation: "File.gpx"), storeKitConfiguration: "Configuration.storekit"),
  test: Scheme.Test(config: "Debug"),
  profile: Scheme.Profile(config: "Debug")
  )
@@ -184,6 +184,8 @@ class SchemeGeneratorTests: XCTestCase {
  ).beTrue()
  try expect(xcscheme.launchAction?.environmentVariables) == runVariables
  try expect(xcscheme.launchAction?.storeKitConfigurationFileReference?.identifier) == "../Configuration.storekit"
+ try expect(xcscheme.launchAction?.locationScenarioReference?.referenceType) == Scheme.SimulateLocation.ReferenceType.gpx.rawValue
+ try expect(xcscheme.launchAction?.locationScenarioReference?.identifier) == "../File.gpx"
  try expect(xcscheme.testAction?.environmentVariables).to.beNil()
  try expect(xcscheme.profileAction?.environmentVariables).to.beNil()
  }
@@ -238,7 +240,7 @@ class SchemeGeneratorTests: XCTestCase {
  let scheme = Scheme(
  name: "TestScheme",
  build: Scheme.Build(targets: [buildTarget]),
- run: Scheme.Run(config: "Debug", debugEnabled: false, storeKitConfiguration: "Configuration.storekit")
+ run: Scheme.Run(config: "Debug", debugEnabled: false, simulateLocation: .init(allow: true, defaultLocation: "File.gpx"), storeKitConfiguration: "Configuration.storekit")
  )
  let project = Project(
  name: "test",
@@ -252,6 +254,8 @@ class SchemeGeneratorTests: XCTestCase {
  try expect(xcscheme.launchAction?.selectedDebuggerIdentifier) == ""
  try expect(xcscheme.launchAction?.selectedLauncherIdentifier) == "Xcode.IDEFoundation.Launcher.PosixSpawn"
  try expect(xcscheme.launchAction?.storeKitConfigurationFileReference?.identifier) == "../../Configuration.storekit"
+ try expect(xcscheme.launchAction?.locationScenarioReference?.referenceType) == Scheme.SimulateLocation.ReferenceType.gpx.rawValue
+ try expect(xcscheme.launchAction?.locationScenarioReference?.identifier) == "../../File.gpx"
  }
 
  $0.it("generate scheme without debugger - test") {