From 7c510af3d7655eb77b4eee231963040ef8795dc8 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Thu, 6 May 2021 08:33:42 +1000 Subject: [PATCH] Fix Xcode alert on generation (#1072) * fix xcode warning alert on regeneration * commit fixture diffs * update changelog --- CHANGELOG.md | 1 + Package.resolved | 8 ++++---- Sources/XcodeGenKit/ProjectGenerator.swift | 3 ++- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../SPM/SPM.xcodeproj/xcshareddata/xcschemes/App.xcscheme | 3 ++- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../xcshareddata/xcschemes/App_Clip.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_Scheme.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_iOS Production.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_iOS Staging.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_iOS Test.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_macOS.xcscheme | 3 ++- .../xcshareddata/xcschemes/App_watchOS.xcscheme | 3 ++- .../xcshareddata/xcschemes/Framework.xcscheme | 3 ++- .../xcshareddata/xcschemes/Tool.xcscheme | 3 ++- .../xcshareddata/xcschemes/iMessageApp.xcscheme | 3 ++- .../xcshareddata/xcschemes/iMessageExtension.xcscheme | 3 ++- .../project.xcworkspace/contents.xcworkspacedata | 2 +- 20 files changed, 36 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 116f1300..4c8b4303 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Fixed - Fixed no such module `DOT` error when package is used as a dependency [#1067](https://github.com/yonaskolb/XcodeGen/pull/1067) @yanamura - Fixed scheme config variant lookups for some configs like `ProdDebug` and `Prod-Debug` that broke in 2.21.0 [#1070](https://github.com/yonaskolb/XcodeGen/pull/1070) @yonaskolb +- Fixed Xcode alerting to project changes after regeneration [#1072](https://github.com/yonaskolb/XcodeGen/pull/1072) @yonaskolb [Commits](https://github.com/yonaskolb/XcodeGen/compare/2.21.0...2.21.1) diff --git a/Package.resolved b/Package.resolved index 26a8147f..9c25e6d4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/tuist/XcodeProj.git", "state": { "branch": null, - "revision": "82bf5efcaa27e94ed8c761c1eb3e397b6dea82b9", - "version": "7.18.0" + "revision": "94e55232d227f9d78b811c98cb2e5d0cbd08987b", + "version": "7.22.0" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/jpsim/Yams.git", "state": { "branch": null, - "revision": "138cf1b701cf825233b92ceac919152d5aba8a3f", - "version": "4.0.1" + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" } } ] diff --git a/Sources/XcodeGenKit/ProjectGenerator.swift b/Sources/XcodeGenKit/ProjectGenerator.swift index 8fb149c6..65f3216e 100644 --- a/Sources/XcodeGenKit/ProjectGenerator.swift +++ b/Sources/XcodeGenKit/ProjectGenerator.swift @@ -32,7 +32,8 @@ public class ProjectGenerator { } func generateWorkspace() throws -> XCWorkspace { - let dataElement: XCWorkspaceDataElement = .file(XCWorkspaceDataFileRef(location: .self(project.defaultProjectPath.lastComponent))) + let selfReference = XCWorkspaceDataFileRef(location: .`self`("")) + let dataElement = XCWorkspaceDataElement.file(selfReference) let workspaceData = XCWorkspaceData(children: [dataElement]) return XCWorkspace(data: workspaceData) } diff --git a/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 881a6dff..919434a6 100644 --- a/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Tests/Fixtures/CarthageProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Tests/Fixtures/SPM/SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tests/Fixtures/SPM/SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 4c49d31b..919434a6 100644 --- a/Tests/Fixtures/SPM/SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Tests/Fixtures/SPM/SPM.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Tests/Fixtures/SPM/SPM.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/Tests/Fixtures/SPM/SPM.xcodeproj/xcshareddata/xcschemes/App.xcscheme index 3c95caf3..ed6efd9a 100644 --- a/Tests/Fixtures/SPM/SPM.xcodeproj/xcshareddata/xcschemes/App.xcscheme +++ b/Tests/Fixtures/SPM/SPM.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -4,7 +4,8 @@ version = "1.3"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + location = "self:"> diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tests/Fixtures/TestProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 881a6dff..919434a6 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Clip.xcscheme b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Clip.xcscheme index 87860eac..45020c38 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Clip.xcscheme +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/App_Clip.xcscheme @@ -4,7 +4,8 @@ version = "1.3"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "NO" + runPostActionsOnFailure = "NO"> diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme index aa620c94..2e8e8130 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/xcshareddata/xcschemes/Tool.xcscheme @@ -4,7 +4,8 @@ version = "1.3"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + buildImplicitDependencies = "YES" + runPostActionsOnFailure = "NO"> + location = "self:">