Skip to content

Skip compile sources for watch apps #1185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yonaskolb merged 4 commits into from
Mar 20, 2022
Merged

Skip compile sources for watch apps #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d4caf0
Skip compile sources build phase for watch2 apps if empty
evandcoleman Mar 1, 2022
2199ef4
add changelog entry
evandcoleman Mar 1, 2022
7521844
Fix tests
evandcoleman Mar 1, 2022
a14f536
Merge branch 'master' into bug/skip-compile-sources-for-watch-app
yonaskolb Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

## Next Version

### Added

- Added `coverageTargets` for target test schemes. This enables to gather code coverage for specific targets. [#1189](https://github.com/yonaskolb/XcodeGen/pull/1189) @gabriellanata

### Fixed

- Fixed crash caused by a simultaneous write during a glob processing [#1177](https://github.com/yonaskolb/XcodeGen/issues/1177) @tr1ckyf0x
- Skip generating empty compile sources build phases for watch apps [#1185](https://github.com/yonaskolb/XcodeGen/issues/1185) @evandcoleman

### Added

- Added `coverageTargets` for target test schemes. This enables to gather code coverage for specific targets. [#1189](https://github.com/yonaskolb/XcodeGen/pull/1189) @gabriellanata

## 2.26.0

Expand Down
4 changes: 2 additions & 2 deletions Sources/ProjectSpec/XCProjExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ extension PBXProductType {

public var canSkipCompileSourcesBuildPhase: Bool {
switch self {
case .bundle, .stickerPack, .messagesApplication:
// Bundles, sticker packs and simple messages applications without sources should not include a
case .bundle, .watch2App, .stickerPack, .messagesApplication:
// Bundles, watch apps, sticker packs and simple messages applications without sources should not include a
// compile sources build phase. Doing so can cause Xcode to produce an error on build.
return true
default:
Expand Down
8 changes: 0 additions & 8 deletions Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 6B5C5F08C0EF06457756E379 /* Build configuration list for PBXNativeTarget "App_watchOS" */;
buildPhases = (
91C895DE8170C96A75D29426 /* Sources */,
B7B71FA7D279029BF7A7FC7C /* Resources */,
C765431E5FF4B02F59DE79B0 /* Embed App Extensions */,
);
Expand Down Expand Up @@ -2706,13 +2705,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
91C895DE8170C96A75D29426 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
96BB43F4706B031DA45166E8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down