diff --git a/CHANGELOG.md b/CHANGELOG.md index 6784539a..d77f1d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Next Version +### Added + +- Added support for DocC Catalogs [#1091](https://github.com/yonaskolb/XcodeGen/pull/1091) @brevansio + ## 2.23.1 ### Changed diff --git a/Sources/ProjectSpec/FileType.swift b/Sources/ProjectSpec/FileType.swift index 732f8b7c..1cde9514 100644 --- a/Sources/ProjectSpec/FileType.swift +++ b/Sources/ProjectSpec/FileType.swift @@ -111,5 +111,6 @@ extension FileType { "xcfilelist": FileType(buildPhase: BuildPhaseSpec.none), "apns": FileType(buildPhase: BuildPhaseSpec.none), "pch": FileType(buildPhase: BuildPhaseSpec.none), + "docc": FileType(buildPhase: BuildPhaseSpec.none), ] } diff --git a/Tests/Fixtures/TestProject/App_iOS/Documentation.docc/Documentation.md b/Tests/Fixtures/TestProject/App_iOS/Documentation.docc/Documentation.md new file mode 100644 index 00000000..7afe5dd3 --- /dev/null +++ b/Tests/Fixtures/TestProject/App_iOS/Documentation.docc/Documentation.md @@ -0,0 +1,7 @@ +# ``App_Clip`` + +Test + +## Overview + +Test diff --git a/Tests/Fixtures/TestProject/App_iOS/Documentation.docc/Resources/resource.png b/Tests/Fixtures/TestProject/App_iOS/Documentation.docc/Resources/resource.png new file mode 100644 index 00000000..e69de29b diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index b9ce9220..f4704f0f 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -674,6 +674,7 @@ B198242976C3395E31FE000A /* MessagesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagesViewController.swift; sourceTree = ""; }; B1C33BB070583BE3B0EC0E68 /* App_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = App_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; B221F5A689AD7D3AD52F56B8 /* libStaticLibrary_ObjC.a */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = archive.ar; path = libStaticLibrary_ObjC.a; sourceTree = BUILT_PRODUCTS_DIR; }; + B5C943D39DD7812CAB94B614 /* Documentation.docc */ = {isa = PBXFileReference; path = Documentation.docc; sourceTree = ""; }; B76E17CE3574081D5BF45B44 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = ""; }; BA040F1F7D6CA08878323A55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; BB178D03E75929F3F5B10C56 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = ""; }; @@ -862,6 +863,7 @@ 7F1A2F579A6F79C62DDA0571 /* AppDelegate.swift */, 3797E591F302ECC0AA2FC607 /* Assets.xcassets */, 9D4AB3FCF725428EFB56F542 /* Configuration.storekit */, + B5C943D39DD7812CAB94B614 /* Documentation.docc */, C9DDE1B06BCC1CDE0ECF1589 /* Info.plist */, AAA49985DFFE797EE8416887 /* inputList.xcfilelist */, CE1F06D99242F4223D081F0D /* LaunchScreen.storyboard */, diff --git a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift index 6ee094a4..3ef69102 100644 --- a/Tests/XcodeGenKitTests/SourceGeneratorTests.swift +++ b/Tests/XcodeGenKitTests/SourceGeneratorTests.swift @@ -598,6 +598,7 @@ class SourceGeneratorTests: XCTestCase { - Root.plist - WithPeriod2.0: - file.swift + - Documentation.docc """ try createDirectories(directories) @@ -654,6 +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) } $0.it("only omits the defined Info.plist from resource build phases but not other plists") {