From e6288b49dfee3a7649be50cb1ec9c8a1b13177ad Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Mon, 5 Nov 2018 10:40:25 -0600 Subject: [PATCH] Remove ability to specify copy files phase ordering --- CHANGELOG.md | 3 --- Docs/ProjectSpec.md | 3 --- Sources/ProjectSpec/TargetSource.swift | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7ed8d48..65f8cc6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,6 @@ ## Master -#### Added -- Allow more granular phase ordering for Copy File and Run Script phases. [402](https://github.com/yonaskolb/XcodeGen/pull/402) @brentleyjones - #### Fixed - Fixed XPC Service package type [#435](https://github.com/yonaskolb/XcodeGen/pull/435) @alvarhansen - Fixed phase ordering for modulemap and static libary header Copy File phases. [402](https://github.com/yonaskolb/XcodeGen/pull/402) @brentleyjones diff --git a/Docs/ProjectSpec.md b/Docs/ProjectSpec.md index 8ce6e59c..ecf64a6a 100644 --- a/Docs/ProjectSpec.md +++ b/Docs/ProjectSpec.md @@ -286,9 +286,6 @@ A source can be provided via a string (the path) or an object of the form: - `sharedSupport` - `plugins` - [ ] **subpath**: **String** - The path inside of the destination to copy the files. - - [ ] **phaseOrder**: **String** - When the Copy Files phase should execute in relation to other phases. This can be one of the following values: - - `preCompile`: Run before the Compile Sources phase - - `postCompile`: Run after the Compile Sources phase - `none` - Will not be added to any build phases - [ ] **type**: **String**: This can be one of the following values - `file`: a file reference with a parent group will be created (Default for files or directories with extensions) diff --git a/Sources/ProjectSpec/TargetSource.swift b/Sources/ProjectSpec/TargetSource.swift index 6bcbfc21..edf27612 100644 --- a/Sources/ProjectSpec/TargetSource.swift +++ b/Sources/ProjectSpec/TargetSource.swift @@ -204,6 +204,6 @@ extension TargetSource.BuildPhase.CopyFilesSettings: JSONObjectConvertible { public init(jsonDictionary: JSONDictionary) throws { destination = try jsonDictionary.json(atKeyPath: "destination") subpath = jsonDictionary.json(atKeyPath: "subpath") ?? "" - phaseOrder = jsonDictionary.json(atKeyPath: "phaseOrder") ?? .postCompile + phaseOrder = .postCompile } }