Rename two internal targets for clarity (with a common prefix)

CONTRIBUTING.md

@@ -603,7 +603,7 @@ For more in-depth technical information about Swift-DocC, please refer to the
 project's technical documentation:
 
 - [`SwiftDocC` framework documentation](https://swiftlang.github.io/swift-docc/documentation/swiftdocc/)
-- [`SwiftDocCUtilities` framework documentation](https://swiftlang.github.io/swift-docc/documentation/swiftdoccutilities/)
+- [`DocCCommandLine` framework documentation](https://swiftlang.github.io/swift-docc/documentation/docccommandline/)
 
 ### Related Projects
 
@@ -628,4 +628,4 @@ project's technical documentation:
   with support for building and viewing documentation for your framework and
   its dependencies.
 
-<!-- Copyright (c) 2021-2023 Apple Inc and the Swift Project authors. All Rights Reserved. -->
+<!-- Copyright (c) 2021-2025 Apple Inc and the Swift Project authors. All Rights Reserved. -->

Package.swift

@@ -58,7 +58,7 @@ let package = Package(
             dependencies: [
                 .target(name: "SwiftDocC"),
                 .target(name: "DocCCommon"),
-                .target(name: "SwiftDocCTestUtilities"),
+                .target(name: "DocCTestUtilities"),
             ],
             resources: [
                 .copy("Test Resources"),
@@ -70,7 +70,7 @@ let package = Package(
         ),
         // Command-line tool library
         .target(
-            name: "SwiftDocCUtilities",
+            name: "DocCCommandLine",
             dependencies: [
                 .target(name: "SwiftDocC"),
                 .target(name: "DocCCommon"),
@@ -81,12 +81,12 @@ let package = Package(
             swiftSettings: swiftSettings
         ),
         .testTarget(
-            name: "SwiftDocCUtilitiesTests",
+            name: "DocCCommandLineTests",
             dependencies: [
-                .target(name: "SwiftDocCUtilities"),
+                .target(name: "DocCCommandLine"),
                 .target(name: "SwiftDocC"),
                 .target(name: "DocCCommon"),
-                .target(name: "SwiftDocCTestUtilities"),
+                .target(name: "DocCTestUtilities"),
             ],
             resources: [
                 .copy("Test Resources"),
@@ -97,7 +97,7 @@ let package = Package(
 
         // Test utility library
         .target(
-            name: "SwiftDocCTestUtilities",
+            name: "DocCTestUtilities",
             dependencies: [
                 .target(name: "SwiftDocC"),
                 .target(name: "DocCCommon"),
@@ -110,7 +110,7 @@ let package = Package(
         .executableTarget(
             name: "docc",
             dependencies: [
-                .target(name: "SwiftDocCUtilities"),
+                .target(name: "DocCCommandLine"),
             ],
             exclude: ["CMakeLists.txt"],
             swiftSettings: swiftSettings
@@ -131,7 +131,7 @@ let package = Package(
             name: "DocCCommonTests",
             dependencies: [
                 .target(name: "DocCCommon"),
-                .target(name: "SwiftDocCTestUtilities"),
+                .target(name: "DocCTestUtilities"),
             ],
             swiftSettings: [.swiftLanguageMode(.v6)]
         ),
@@ -152,16 +152,16 @@ let package = Package(
                 .target(name: "DocCHTML"),
                 .target(name: "SwiftDocC"),
                 .product(name: "Markdown", package: "swift-markdown"),
-                .target(name: "SwiftDocCTestUtilities"),
+                .target(name: "DocCTestUtilities"),
             ],
             swiftSettings: [.swiftLanguageMode(.v6)]
         ),
 
-        // Test app for SwiftDocCUtilities
+        // Test app for DocCCommandLine
         .executableTarget(
             name: "signal-test-app",
             dependencies: [
-                .target(name: "SwiftDocCUtilities"),
+                .target(name: "DocCCommandLine"),
             ],
             path: "Tests/signal-test-app",
             swiftSettings: swiftSettings

Sources/CMakeLists.txt

@@ -10,5 +10,5 @@ See https://swift.org/LICENSE.txt for license information
 add_subdirectory(DocCCommon)
 add_subdirectory(DocCHTML)
 add_subdirectory(SwiftDocC)
-add_subdirectory(SwiftDocCUtilities)
+add_subdirectory(DocCCommandLine)
 add_subdirectory(docc)

Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift → Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift

@@ -76,7 +76,7 @@ public struct DocumentationCoverageOptionsArgument: ParsableArguments {
 //
 // It is safe to add a retroactively conformance here because the other module (SwiftDocC) is in the same package.
 //
-// These conforming types are defined in SwiftDocC and extended in SwiftDocCUtilities, because SwiftDocC doesn't link against ArgumentParse (since it isn't about CLI).
+// These conforming types are defined in SwiftDocC and extended in DocCCommandLine, because SwiftDocC doesn't link against ArgumentParser (since it isn't about CLI).
 // We conform here because this is the first place that we can add the conformance. The implementation is in SwiftDocC.
 extension SwiftDocC.DocumentationCoverageLevel: ArgumentParser.ExpressibleByArgument {}
 extension SwiftDocC.DocumentationCoverageOptions.KindFilterOptions.BitFlagRepresentation: ArgumentParser.ExpressibleByArgument {}

Sources/SwiftDocCUtilities/CMakeLists.txt → Sources/DocCCommandLine/CMakeLists.txt

@@ -7,7 +7,7 @@ Licensed under Apache License v2.0 with Runtime Library Exception
 See https://swift.org/LICENSE.txt for license information
 #]]
 
-add_library(SwiftDocCUtilities STATIC
+add_library(DocCCommandLine STATIC
   Action/Action.swift
   Action/ActionResult.swift
   Action/Actions/Action+MoveOutput.swift
@@ -70,6 +70,6 @@ add_library(SwiftDocCUtilities STATIC
   Utility/PlatformArgumentParser.swift
   Utility/Signal.swift
   Utility/Throttle.swift)
-target_link_libraries(SwiftDocCUtilities PUBLIC
+target_link_libraries(DocCCommandLine PUBLIC
   ArgumentParser
   SwiftDocC)

Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md → Sources/DocCCommandLine/CommandLine.docc/CommandLine.md

@@ -1,12 +1,12 @@
-# ``SwiftDocCUtilities``
+# ``DocCCommandLine``
 
 Build custom documentation workflows by leveraging the DocC compiler pipeline.
 
 ## Overview
 
-SwiftDocCUtilities 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.
+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``.
 
 ```swift
 public import ArgumentParser
@@ -44,4 +44,4 @@ Adding a new sub-command automatically adds routing and execution of its code, a
 - ``Throttle``
 - ``Signal``
 
-<!-- Copyright (c) 2021-2024 Apple Inc and the Swift Project authors. All Rights Reserved. -->
+<!-- Copyright (c) 2021-2025 Apple Inc and the Swift Project authors. All Rights Reserved. -->

Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md → Sources/DocCCommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md

@@ -1,4 +1,4 @@
-# ``SwiftDocCUtilities/InitAction``
+# ``InitAction``
 
 @Metadata {
     @DocumentationExtension(mergeBehavior: override)

Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md → Sources/DocCCommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md

@@ -1,4 +1,4 @@
-# ``SwiftDocCUtilities/Docc``
+# ``Docc``
 
 ## Topics 
 

Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md

@@ -17,12 +17,12 @@ value so that the default initializer can be used.
 
 ### Feature flags on the command line
 
-Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `SwiftDocCUtilities`.
+Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `DocCCommandLine`.
 This type implements the `ParsableArguments` protocol from Swift Argument Parser to create an option
 group for the `convert` and `preview` commands.
 
 These options are then handled in `ConvertAction.init(fromConvertCommand:)`, still in
-`SwiftDocCUtilities`, where they are written into the global feature flags ``FeatureFlags/current``
+`DocCCommandLine`, where they are written into the global feature flags ``FeatureFlags/current``
 instance, which can then be used during the compilation process.
 
 ### Feature flags in Info.plist
@@ -37,4 +37,4 @@ Feature flags that are loaded from an Info.plist file are saved into the global
 the bundle is being registered. To ensure that your new feature flag is properly loaded, update the
 ``FeatureFlags/loadFlagsFromBundle(_:)`` method to load your new field into the global flags.
 
-<!-- Copyright (c) 2024 Apple Inc and the Swift Project authors. All Rights Reserved. -->
+<!-- Copyright (c) 2024-2025 Apple Inc and the Swift Project authors. All Rights Reserved. -->

Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md

@@ -33,7 +33,7 @@ SwiftDocC.docc
 ├ Essentials
 │ ├ ActionManager.md
 │ ├ Action.md
-│ ╰ Getting Started with SwiftDocCUtilities.md
+│ ╰ Getting Started with SwiftDocC.md
 ├ Migration to DocC
 │ ├ DocumentationContext.md
 │ ╰ ...
@@ -104,4 +104,4 @@ The file hierarchy under the output path represents the complete, compiled docum
 ╰ videos
 ```
 
-<!-- Copyright (c) 2021-2024 Apple Inc and the Swift Project authors. All Rights Reserved. -->
+<!-- Copyright (c) 2021-2025 Apple Inc and the Swift Project authors. All Rights Reserved. -->

Sources/docc/CMakeLists.txt

@@ -10,7 +10,7 @@ See https://swift.org/LICENSE.txt for license information
 add_executable(docc
   main.swift)
 target_link_libraries(docc PRIVATE
-  SwiftDocCUtilities)
+  DocCCommandLine)
 
 install(TARGETS docc
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

Sources/docc/main.swift

@@ -1,15 +1,15 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
  See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
 #if os(macOS) || os(Linux) || os(Android) || os(Windows) || os(FreeBSD) || os(OpenBSD)
-import SwiftDocCUtilities
+import DocCCommandLine
 
 await Task {
     await Docc.main()

Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift → Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift

@@ -1,17 +1,17 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2022 Apple Inc. and the Swift project authors
+ Copyright (c) 2022-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
  See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
 import XCTest
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 @testable import SwiftDocC
-import SwiftDocCTestUtilities
+import DocCTestUtilities
 import ArgumentParser
 
 class ConvertSubcommandSourceRepositoryTests: XCTestCase {

Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift → Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift

@@ -1,17 +1,17 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
  See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
 import XCTest
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 @testable import SwiftDocC
-import SwiftDocCTestUtilities
+import DocCTestUtilities
 
 class ConvertSubcommandTests: XCTestCase {
     private let testBundleURL = Bundle.module.url(

Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift → Tests/DocCCommandLineTests/ArgumentParsing/ErrorMessageTests.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -10,7 +10,7 @@
 
 import XCTest
 import Foundation
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 
 class ErrorMessageTests: XCTestCase {
 

Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift → Tests/DocCCommandLineTests/ArgumentParsing/MergeSubcommandTests.swift

@@ -10,8 +10,8 @@
 
 import XCTest
 import ArgumentParser
-@testable import SwiftDocCUtilities
-import SwiftDocCTestUtilities
+@testable import DocCCommandLine
+import DocCTestUtilities
 
 class MergeSubcommandTests: XCTestCase {
     func testCommandLineArgumentValidation() throws {

Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift → Tests/DocCCommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -10,7 +10,7 @@
 
 #if canImport(NIOHTTP1)
 import XCTest
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 
 class PreviewSubcommandTests: XCTestCase {
     func testOptionsValidation() throws {

Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift → Tests/DocCCommandLineTests/ConvertActionIndexerTests.swift

@@ -11,7 +11,7 @@
 import XCTest
 import Foundation
 @testable import SwiftDocC
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 
 class ConvertActionIndexerTests: XCTestCase {
 

Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift → Tests/DocCCommandLineTests/ConvertActionStaticHostableTests.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -11,8 +11,8 @@
 import XCTest
 import Foundation
 @testable import SwiftDocC
-@testable import SwiftDocCUtilities
-import SwiftDocCTestUtilities
+@testable import DocCCommandLine
+import DocCTestUtilities
 
 class ConvertActionStaticHostableTests: StaticHostingBaseTests {
     /// Creates a DocC archive and then archives it with options  to produce static content which is then validated.

Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift → Tests/DocCCommandLineTests/ConvertActionTests.swift

@@ -11,10 +11,10 @@
 import XCTest
 import Foundation
 @testable @_spi(ExternalLinks) import SwiftDocC
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 import SymbolKit
 import Markdown
-@testable import SwiftDocCTestUtilities
+@testable import DocCTestUtilities
 
 class ConvertActionTests: XCTestCase {
     #if !os(iOS)

Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift → Tests/DocCCommandLineTests/DirectoryMonitorTests.swift

@@ -9,7 +9,7 @@
 */
 
 import XCTest
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 
 #if !os(Linux) && !os(Android) && !os(Windows) && !os(FreeBSD) && !os(OpenBSD)
 fileprivate extension NSNotification.Name {

Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift → Tests/DocCCommandLineTests/EmitGeneratedCurationsActionTests.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2024 Apple Inc. and the Swift project authors
+ Copyright (c) 2024-2025 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -10,8 +10,8 @@
 
 import XCTest
 import Foundation
-@testable import SwiftDocCUtilities
-import SwiftDocCTestUtilities
+@testable import DocCCommandLine
+import DocCTestUtilities
 
 class EmitGeneratedCurationsActionTests: XCTestCase {
 

Tests/SwiftDocCUtilitiesTests/FileWritingHTMLContentConsumerTests.swift → Tests/DocCCommandLineTests/FileWritingHTMLContentConsumerTests.swift

@@ -10,11 +10,11 @@
 
 
 import Foundation
-@testable import SwiftDocCUtilities
+@testable import DocCCommandLine
 import SwiftDocC
 import SymbolKit
 import XCTest
-import SwiftDocCTestUtilities
+import DocCTestUtilities
 
 final class FileWritingHTMLContentConsumerTests: XCTestCase {