Skip to content

Fix docc support #1202

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
Apr 5, 2022
Merged

Fix docc support #1202

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
5b550f9
Update FileType.swift
hiragram Mar 31, 2022
954cee1
Update SourceGeneratorTests.swift
hiragram Apr 3, 2022
a689cf8
Update fixture
hiragram Apr 3, 2022
d2ee65b
Update CHANGELOG.md
hiragram Apr 4, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Next Version

#### Fixed

- Fixed an issue where DocC was not added to source file list #1202 @hiragram

## 2.28.0

#### Added
Expand Down
2 changes: 1 addition & 1 deletion Sources/ProjectSpec/FileType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ extension FileType {
"mlmodel": FileType(buildPhase: .sources),
"rcproject": FileType(buildPhase: .sources),
"iig": FileType(buildPhase: .sources),
"docc": FileType(buildPhase: .sources),

// headers
"h": FileType(buildPhase: .headers),
Expand All @@ -113,6 +114,5 @@ extension FileType {
"xcfilelist": FileType(buildPhase: BuildPhaseSpec.none),
"apns": FileType(buildPhase: BuildPhaseSpec.none),
"pch": FileType(buildPhase: BuildPhaseSpec.none),
"docc": FileType(buildPhase: BuildPhaseSpec.none),
]
}
2 changes: 2 additions & 0 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 @@ -42,6 +42,7 @@
1E03FC7312293997599C6435 /* Empty.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 068EDF47F0B087F6A4052AC0 /* Empty.h */; };
1E2A4D61E96521FF7123D7B0 /* XPC Service.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 22237B8EBD9E6BE8EBC8735F /* XPC Service.xpc */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1E457F55331FD2C3E8E00BE2 /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0C5AC2545AE4D4F7F44E2E9B /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1F9168A43FD8E2FCC2699E14 /* Documentation.docc in Sources */ = {isa = PBXBuildFile; fileRef = B5C943D39DD7812CAB94B614 /* Documentation.docc */; settings = {COMPILER_FLAGS = "-Werror"; }; };
210B49C23B9717C668B40C8C /* FrameworkFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5F527F2590C14956518174 /* FrameworkFile.swift */; };
2116F89CF5A04EA0EFA30A89 /* TestProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D88C6BF7355702B74396791 /* TestProjectUITests.swift */; };
212BCB51DAF3212993DDD49E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D51CC8BCCBD68A90E90A3207 /* Assets.xcassets */; };
Expand Down Expand Up @@ -2655,6 +2656,7 @@
buildActionMask = 2147483647;
files = (
09617AB755651FFEB2564CBC /* AppDelegate.swift in Sources */,
1F9168A43FD8E2FCC2699E14 /* Documentation.docc in Sources */,
666DEC173BC78C7641AB22EC /* File1.swift in Sources */,
339578307B9266AB3D7722D9 /* File2.swift in Sources */,
F788A3FA1CE6489BC257C1C3 /* Model.xcdatamodeld in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Tests/XcodeGenKitTests/SourceGeneratorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ class SourceGeneratorTests: XCTestCase {
try pbxProj.expectFileMissing(paths: ["C", "Settings.bundle", "Root.plist"])
try pbxProj.expectFileMissing(paths: ["C", "WithPeriod2.0"])
try pbxProj.expectFile(paths: ["C", "WithPeriod2.0", "file.swift"], buildPhase: .sources)
try pbxProj.expectFile(paths: ["C", "Documentation.docc"], buildPhase: BuildPhaseSpec.none)
try pbxProj.expectFile(paths: ["C", "Documentation.docc"], buildPhase: .sources)
}

$0.it("only omits the defined Info.plist from resource build phases but not other plists") {
Expand Down