Skip to content

Conversation

@d-ronnqvist
Copy link
Contributor

@d-ronnqvist d-ronnqvist commented Nov 11, 2025

This reverts #1342 and adds a "DocC" prefix to targets so that they don't conflict with other packages in the toolchain

@d-ronnqvist
Copy link
Contributor Author

I'm tentatively trying a different target name in swiftlang/swift#84510 (comment)

@d-ronnqvist d-ronnqvist marked this pull request as draft November 11, 2025 09:41
@d-ronnqvist d-ronnqvist marked this pull request as ready for review November 14, 2025 15:41
@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist d-ronnqvist changed the title Revert "Revert "Rename two internal targets for clarity"" Rename two internal targets for clarity (with a common prefix) Nov 14, 2025
@d-ronnqvist
Copy link
Contributor Author

The cross-repo tests, passed here https://ci.swift.org/job/swift-PR-Linux/24867/ so these names (with the "DocC" prefix) don't collide with anything (not that surprising)

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

I'll run one last cross-repo there swiftlang/swift#84510 (comment) before merging this just to make ensure that it doesn't break the Windows CI—which I have no other way to verify currently.

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

d-ronnqvist commented Nov 20, 2025

The cross-repo tests for all platforms (macOS, Linux, Windows) already passed so it is safe to merge this.

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

I ran another cross-repo test in swiftlang/swift#84510 (comment) to verify that this still doesn't break anything.

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

Copy link
Contributor

@anferbui anferbui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested fixes for a couple of typos, and built the DocCCommandLine catalog locally to verify it was all still working. Found a legitimate warning and some unrelated warnings which I've reported here as comments but that we can fix in a separate PR.

I'm only expecting the 2 comments about typos to be addressed before giving approval, overall looks good.

### Command Line Options

- ``DocCArchiveOption``
- ``DocumentationBundleOption``
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: This type has been renamed to DocumentationCatalogOption -- we can fix it in a subsequent PR.

Comment on lines +7 to +9
DocCCommandLine provides a default, command-line workflow for DocC, powered by Swift [Argument Parser](https://apple.github.io/swift-argument-parser/documentation/argumentparser/). `docc` commands, such as `convert` and `preview`, are conformant ``Action`` types that use DocC to perform documentation tasks.

Use SwiftDocCUtilities to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``.
Use DocCCommandLine to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: The Action type no longer exists, it is now called AsyncAction but it has package-level access so the symbol is not accessible in the catalog. We can fix this in a subsequent PR.

Comment on lines 39 to 41
- ``Action``
- ``ActionResult``
- ``RecreatingContext``
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: Both Action and RecreatingContext types no longer exist. Action is now called AsyncAction, but not sure whether RecreatingContext has been renamed or no longer exists. We can fix this in a subsequent PR.

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

Suggested fixes for a couple of typos, and built the DocCCommandLine catalog locally to verify it was all still working. Found a legitimate warning and some unrelated warnings which I've reported here as comments but that we can fix in a separate PR.

I'm only expecting the 2 comments about typos to be addressed before giving approval, overall looks good.

Thanks. I fixed those two typos in b7bb045.

Copy link
Contributor

@anferbui anferbui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@d-ronnqvist d-ronnqvist merged commit bc197f4 into main Dec 18, 2025
2 checks passed
@d-ronnqvist d-ronnqvist deleted the revert-1342-revert-1330-rename-target-for-clarity branch December 18, 2025 11:47
d-ronnqvist added a commit to d-ronnqvist/swift-docc that referenced this pull request Dec 18, 2025
d-ronnqvist added a commit that referenced this pull request Dec 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants