diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da6d76fb8f..71eff08cab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -520,7 +520,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/) +- [`CommandLine` framework documentation](https://swiftlang.github.io/swift-docc/documentation/commandline/) ### Related Projects @@ -545,4 +545,4 @@ project's technical documentation: with support for building and viewing documentation for your framework and its dependencies. - + diff --git a/Package.swift b/Package.swift index 9ad6fa6d7a..544c13b596 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,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 @@ -55,7 +55,7 @@ let package = Package( name: "SwiftDocCTests", dependencies: [ .target(name: "SwiftDocC"), - .target(name: "SwiftDocCTestUtilities"), + .target(name: "TestUtilities"), ], resources: [ .copy("Test Resources"), @@ -67,7 +67,7 @@ let package = Package( ), // Command-line tool library .target( - name: "SwiftDocCUtilities", + name: "CommandLine", dependencies: [ .target(name: "SwiftDocC"), .product(name: "NIOHTTP1", package: "swift-nio", condition: .when(platforms: [.macOS, .iOS, .linux, .android])), @@ -77,11 +77,11 @@ let package = Package( swiftSettings: swiftSettings ), .testTarget( - name: "SwiftDocCUtilitiesTests", + name: "CommandLineTests", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), .target(name: "SwiftDocC"), - .target(name: "SwiftDocCTestUtilities"), + .target(name: "TestUtilities"), ], resources: [ .copy("Test Resources"), @@ -92,7 +92,7 @@ let package = Package( // Test utility library .target( - name: "SwiftDocCTestUtilities", + name: "TestUtilities", dependencies: [ .target(name: "SwiftDocC"), .product(name: "SymbolKit", package: "swift-docc-symbolkit"), @@ -104,17 +104,17 @@ let package = Package( .executableTarget( name: "docc", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), ], exclude: ["CMakeLists.txt"], swiftSettings: swiftSettings ), - // Test app for SwiftDocCUtilities + // Test app for CommandLine .executableTarget( name: "signal-test-app", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), ], path: "Tests/signal-test-app", swiftSettings: swiftSettings diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 8f8e806655..4362f918d0 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -8,5 +8,5 @@ See https://swift.org/LICENSE.txt for license information #]] add_subdirectory(SwiftDocC) -add_subdirectory(SwiftDocCUtilities) +add_subdirectory(CommandLine) add_subdirectory(docc) diff --git a/Sources/SwiftDocCUtilities/Action/Action.swift b/Sources/CommandLine/Action/Action.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Action.swift rename to Sources/CommandLine/Action/Action.swift diff --git a/Sources/SwiftDocCUtilities/Action/ActionResult.swift b/Sources/CommandLine/Action/ActionResult.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/ActionResult.swift rename to Sources/CommandLine/Action/ActionResult.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Action+MoveOutput.swift b/Sources/CommandLine/Action/Actions/Action+MoveOutput.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Action+MoveOutput.swift rename to Sources/CommandLine/Action/Actions/Action+MoveOutput.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertAction.swift b/Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertAction.swift rename to Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertFileWritingConsumer.swift b/Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertFileWritingConsumer.swift rename to Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift b/Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift rename to Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/Indexer.swift b/Sources/CommandLine/Action/Actions/Convert/Indexer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/Indexer.swift rename to Sources/CommandLine/Action/Actions/Convert/Indexer.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift b/Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift rename to Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/CoverageAction.swift b/Sources/CommandLine/Action/Actions/CoverageAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/CoverageAction.swift rename to Sources/CommandLine/Action/Actions/CoverageAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/EmitGeneratedCurationAction.swift b/Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/EmitGeneratedCurationAction.swift rename to Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/IndexAction.swift b/Sources/CommandLine/Action/Actions/IndexAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/IndexAction.swift rename to Sources/CommandLine/Action/Actions/IndexAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplate.swift b/Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplate.swift rename to Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplateKind.swift b/Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplateKind.swift rename to Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/InitAction.swift b/Sources/CommandLine/Action/Actions/Init/InitAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/InitAction.swift rename to Sources/CommandLine/Action/Actions/Init/InitAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift b/Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift rename to Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction.swift b/Sources/CommandLine/Action/Actions/Merge/MergeAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction.swift rename to Sources/CommandLine/Action/Actions/Merge/MergeAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/PreviewAction.swift b/Sources/CommandLine/Action/Actions/PreviewAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/PreviewAction.swift rename to Sources/CommandLine/Action/Actions/PreviewAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/TransformForStaticHostingAction.swift b/Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/TransformForStaticHostingAction.swift rename to Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift b/Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift rename to Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DirectoryPathOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DirectoryPathOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationArchiveOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationArchiveOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift similarity index 97% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift index f1812bbfc5..25b5aabbd3 100644 --- a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift +++ b/Sources/CommandLine/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 CommandLine, 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 {} diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/InitOptions.swift b/Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/InitOptions.swift rename to Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift b/Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/PreviewOptions.swift b/Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/PreviewOptions.swift rename to Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift b/Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift rename to Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/TemplateOption.swift b/Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/TemplateOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Index.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Index.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Init.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Init.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Merge.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Merge.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Preview.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Preview.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessArchive.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessArchive.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessCatalog.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessCatalog.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/TransformForStaticHosting.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/TransformForStaticHosting.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md b/Sources/CommandLine/CommandLine.docc/CommandLine.md similarity index 54% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md rename to Sources/CommandLine/CommandLine.docc/CommandLine.md index 0e3a8b4f47..defdb873b6 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine.md @@ -1,12 +1,12 @@ -# ``SwiftDocCUtilities`` +# ``CommandLine`` 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. +CommandLine 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 CommandLine 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`` - + diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md b/Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md similarity index 98% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md rename to Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md index be46e30b13..70faf36635 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md @@ -1,4 +1,4 @@ -# ``SwiftDocCUtilities/InitAction`` +# ``InitAction`` @Metadata { @DocumentationExtension(mergeBehavior: override) diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md b/Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md similarity index 90% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md rename to Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md index f7e904530e..70d767f9d3 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md @@ -1,4 +1,4 @@ -# ``SwiftDocCUtilities/Docc`` +# ``Docc`` ## Topics diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/footer.html b/Sources/CommandLine/CommandLine.docc/footer.html similarity index 100% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/footer.html rename to Sources/CommandLine/CommandLine.docc/footer.html diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/header.html b/Sources/CommandLine/CommandLine.docc/header.html similarity index 100% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/header.html rename to Sources/CommandLine/CommandLine.docc/header.html diff --git a/Sources/SwiftDocCUtilities/Docc.swift b/Sources/CommandLine/Docc.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Docc.swift rename to Sources/CommandLine/Docc.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/PreviewHTTPHandler.swift b/Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/PreviewHTTPHandler.swift rename to Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/PreviewServer.swift b/Sources/CommandLine/PreviewServer/PreviewServer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/PreviewServer.swift rename to Sources/CommandLine/PreviewServer/PreviewServer.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/DefaultRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/DefaultRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/ErrorRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/ErrorRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/FileRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/FileRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift b/Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/RequestHandlerFactory.swift b/Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/RequestHandlerFactory.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift diff --git a/Sources/SwiftDocCUtilities/Transformers/StaticHostableTransformer.swift b/Sources/CommandLine/Transformers/StaticHostableTransformer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Transformers/StaticHostableTransformer.swift rename to Sources/CommandLine/Transformers/StaticHostableTransformer.swift diff --git a/Sources/SwiftDocCUtilities/Utility/DirectoryMonitor.swift b/Sources/CommandLine/Utility/DirectoryMonitor.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/DirectoryMonitor.swift rename to Sources/CommandLine/Utility/DirectoryMonitor.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/Sequence+Unique.swift b/Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/Sequence+Unique.swift rename to Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/String+Path.swift b/Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/String+Path.swift rename to Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift b/Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift rename to Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+Relative.swift b/Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+Relative.swift rename to Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift diff --git a/Sources/SwiftDocCUtilities/Utility/PlatformArgumentParser.swift b/Sources/CommandLine/Utility/PlatformArgumentParser.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/PlatformArgumentParser.swift rename to Sources/CommandLine/Utility/PlatformArgumentParser.swift diff --git a/Sources/SwiftDocCUtilities/Utility/Signal.swift b/Sources/CommandLine/Utility/Signal.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/Signal.swift rename to Sources/CommandLine/Utility/Signal.swift diff --git a/Sources/SwiftDocCUtilities/Utility/Throttle.swift b/Sources/CommandLine/Utility/Throttle.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/Throttle.swift rename to Sources/CommandLine/Utility/Throttle.swift diff --git a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md index 3712ca2aa0..52d7220981 100644 --- a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md +++ b/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 `CommandLine`. 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`` +`CommandLine`, 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. - + diff --git a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md index eb63941f1b..afd5e55ed7 100644 --- a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md +++ b/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 ``` - + diff --git a/Sources/SwiftDocCUtilities/CMakeLists.txt b/Sources/SwiftDocCUtilities/CMakeLists.txt index c419ba4807..a0552f96dc 100644 --- a/Sources/SwiftDocCUtilities/CMakeLists.txt +++ b/Sources/SwiftDocCUtilities/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(CommandLine STATIC Action/Action.swift Action/ActionResult.swift Action/Actions/Action+MoveOutput.swift @@ -69,6 +69,6 @@ add_library(SwiftDocCUtilities STATIC Utility/PlatformArgumentParser.swift Utility/Signal.swift Utility/Throttle.swift) -target_link_libraries(SwiftDocCUtilities PUBLIC +target_link_libraries(CommandLine PUBLIC ArgumentParser SwiftDocC) diff --git a/Sources/SwiftDocCTestUtilities/FilesAndFolders.swift b/Sources/TestUtilities/FilesAndFolders.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/FilesAndFolders.swift rename to Sources/TestUtilities/FilesAndFolders.swift diff --git a/Sources/SwiftDocCTestUtilities/SymbolGraphCreation.swift b/Sources/TestUtilities/SymbolGraphCreation.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/SymbolGraphCreation.swift rename to Sources/TestUtilities/SymbolGraphCreation.swift diff --git a/Sources/SwiftDocCTestUtilities/TestFileSystem.swift b/Sources/TestUtilities/TestFileSystem.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/TestFileSystem.swift rename to Sources/TestUtilities/TestFileSystem.swift diff --git a/Sources/SwiftDocCTestUtilities/XCTestCase+TemporaryDirectory.swift b/Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/XCTestCase+TemporaryDirectory.swift rename to Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift diff --git a/Sources/docc/CMakeLists.txt b/Sources/docc/CMakeLists.txt index 4289856b76..722df3a849 100644 --- a/Sources/docc/CMakeLists.txt +++ b/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) + CommandLine) install(TARGETS docc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/Sources/docc/main.swift b/Sources/docc/main.swift index 1715eed8e1..51180b0335 100644 --- a/Sources/docc/main.swift +++ b/Sources/docc/main.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 @@ -9,7 +9,7 @@ */ #if os(macOS) || os(Linux) || os(Android) || os(Windows) || os(FreeBSD) -import SwiftDocCUtilities +import CommandLine await Task { await Docc.main() diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift index 654006839c..e77b39a535 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift @@ -1,7 +1,7 @@ /* 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 @@ -9,9 +9,9 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import ArgumentParser class ConvertSubcommandSourceRepositoryTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift index 41027fbba1..69f4c7373b 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.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 @@ -9,9 +9,9 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ConvertSubcommandTests: XCTestCase { private let testBundleURL = Bundle.module.url( diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift b/Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift rename to Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift b/Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift similarity index 93% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift index 335ac9f3d5..2a331cb9e7 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift +++ b/Tests/CommandLineTests/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 CommandLine class ErrorMessageTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift index 85731b8e9c..d073d6b34e 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift @@ -10,8 +10,8 @@ import XCTest import ArgumentParser -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class MergeSubcommandTests: XCTestCase { func testCommandLineArgumentValidation() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift index 1f586324d3..d475294290 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift +++ b/Tests/CommandLineTests/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 CommandLine class PreviewSubcommandTests: XCTestCase { func testOptionsValidation() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/C+Extensions.swift b/Tests/CommandLineTests/C+Extensions.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/C+Extensions.swift rename to Tests/CommandLineTests/C+Extensions.swift diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift b/Tests/CommandLineTests/ConvertActionIndexerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift rename to Tests/CommandLineTests/ConvertActionIndexerTests.swift index 4d3db2bdbf..e28af46ab5 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift +++ b/Tests/CommandLineTests/ConvertActionIndexerTests.swift @@ -11,7 +11,7 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine class ConvertActionIndexerTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift b/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift rename to Tests/CommandLineTests/ConvertActionStaticHostableTests.swift index 0c2c0498b1..be300dc869 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift +++ b/Tests/CommandLineTests/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 CommandLine +import TestUtilities class ConvertActionStaticHostableTests: StaticHostingBaseTests { /// Creates a DocC archive and then archives it with options to produce static content which is then validated. diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift b/Tests/CommandLineTests/ConvertActionTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift rename to Tests/CommandLineTests/ConvertActionTests.swift index a4f76bcd53..ea32665a99 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift +++ b/Tests/CommandLineTests/ConvertActionTests.swift @@ -11,10 +11,10 @@ import XCTest import Foundation @testable @_spi(ExternalLinks) import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import SymbolKit import Markdown -@testable import SwiftDocCTestUtilities +@testable import TestUtilities class ConvertActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift b/Tests/CommandLineTests/DirectoryMonitorTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift rename to Tests/CommandLineTests/DirectoryMonitorTests.swift index 555d258222..e7b5813765 100644 --- a/Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift +++ b/Tests/CommandLineTests/DirectoryMonitorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine #if !os(Linux) && !os(Android) && !os(Windows) && !os(FreeBSD) fileprivate extension NSNotification.Name { diff --git a/Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift b/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift rename to Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift index 4a07a85ae4..60fc7d3339 100644 --- a/Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift +++ b/Tests/CommandLineTests/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 CommandLine +import TestUtilities class EmitGeneratedCurationsActionTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/FolderStructure.swift b/Tests/CommandLineTests/FolderStructure.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/FolderStructure.swift rename to Tests/CommandLineTests/FolderStructure.swift index 95a36997ae..4d8f649b5b 100644 --- a/Tests/SwiftDocCUtilitiesTests/FolderStructure.swift +++ b/Tests/CommandLineTests/FolderStructure.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 @@ -9,9 +9,9 @@ */ @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import XCTest -public import SwiftDocCTestUtilities +public import TestUtilities /* This file contains a test helper API for working with folder hierarchies, with the ability to: diff --git a/Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift b/Tests/CommandLineTests/FolderStructureTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift rename to Tests/CommandLineTests/FolderStructureTests.swift index 148da86252..e809a9cd71 100644 --- a/Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift +++ b/Tests/CommandLineTests/FolderStructureTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities class FolderStructureTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift b/Tests/CommandLineTests/HTMLTemplateDirectory.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift rename to Tests/CommandLineTests/HTMLTemplateDirectory.swift index e3f25527c0..f378ac0fa2 100644 --- a/Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift +++ b/Tests/CommandLineTests/HTMLTemplateDirectory.swift @@ -9,7 +9,7 @@ */ import Foundation -import SwiftDocCTestUtilities +import TestUtilities /// A folder that represents a fake html-build directory for testing. extension Folder { diff --git a/Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift b/Tests/CommandLineTests/IndexActionTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift rename to Tests/CommandLineTests/IndexActionTests.swift index d118aa6593..76414e35d4 100644 --- a/Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift +++ b/Tests/CommandLineTests/IndexActionTests.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 @@ -11,9 +11,9 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import Markdown -import SwiftDocCTestUtilities +import TestUtilities class IndexActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift b/Tests/CommandLineTests/Init/InitActionTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift rename to Tests/CommandLineTests/Init/InitActionTests.swift index b0cb85e9cc..acb5a22333 100644 --- a/Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift +++ b/Tests/CommandLineTests/Init/InitActionTests.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 -import SwiftDocCTestUtilities -@testable import SwiftDocCUtilities +import TestUtilities +@testable import CommandLine final class InitActionTests: XCTestCase { private let documentationTitle = "MyTestDocumentation" diff --git a/Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift b/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift similarity index 95% rename from Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift rename to Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift index 4f31b23adf..156c1ae626 100644 --- a/Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift +++ b/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.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 @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine class JSONEncodingRenderNodeWriterTests: XCTestCase { /// Verifies that if we fail during writing a JSON file the execution diff --git a/Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift b/Tests/CommandLineTests/MergeActionTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift rename to Tests/CommandLineTests/MergeActionTests.swift index 88acc2a5c2..6dd906bd3f 100644 --- a/Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift +++ b/Tests/CommandLineTests/MergeActionTests.swift @@ -10,8 +10,8 @@ import XCTest @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class MergeActionTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift b/Tests/CommandLineTests/PlatformArgumentParserTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift rename to Tests/CommandLineTests/PlatformArgumentParserTests.swift index 5a2386ef89..f3b54898a9 100644 --- a/Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift +++ b/Tests/CommandLineTests/PlatformArgumentParserTests.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 @@ -12,7 +12,7 @@ import Foundation import SwiftDocC import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class PlatformArgumentParserTests: XCTestCase { let correctInputs: [[String]] = [ diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift b/Tests/CommandLineTests/PreviewActionIntegrationTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift rename to Tests/CommandLineTests/PreviewActionIntegrationTests.swift index bc23ac7575..1493a3cb29 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift +++ b/Tests/CommandLineTests/PreviewActionIntegrationTests.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 @@ #if canImport(NIOHTTP1) import XCTest @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class PreviewActionIntegrationTests: XCTestCase { private func createMinimalDocsBundle() -> Folder { diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift index 95878b0e7f..ac2267f053 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift index 634ba02b9e..3bbbbd973f 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift index 552b51e715..7a601f26d1 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift @@ -11,7 +11,7 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift index 9d4fefa8e2..c08e0d2887 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift b/Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift rename to Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift index 14f60ed6a4..9f48813df5 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift +++ b/Tests/CommandLineTests/PreviewServer/ServerTestUtils.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 @@ -13,7 +13,7 @@ import Foundation import NIO import NIOHTTP1 import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine /// Makes a request head part with the given URI and headers. func makeRequestHead(uri: String, headers: [(String, String)]? = nil) -> HTTPRequestHead { diff --git a/Tests/SwiftDocCUtilitiesTests/ProblemTests.swift b/Tests/CommandLineTests/ProblemTests.swift similarity index 89% rename from Tests/SwiftDocCUtilitiesTests/ProblemTests.swift rename to Tests/CommandLineTests/ProblemTests.swift index f5f18a41be..196fe92d20 100644 --- a/Tests/SwiftDocCUtilitiesTests/ProblemTests.swift +++ b/Tests/CommandLineTests/ProblemTests.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 @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCUtilities +import CommandLine @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift b/Tests/CommandLineTests/SemanticAnalyzerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift rename to Tests/CommandLineTests/SemanticAnalyzerTests.swift index 034b935152..bdff305818 100644 --- a/Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift +++ b/Tests/CommandLineTests/SemanticAnalyzerTests.swift @@ -11,8 +11,8 @@ import XCTest import Markdown @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class SemanticAnalyzerTests: XCTestCase { private let catalogHierarchy = Folder(name: "SemanticAnalyzerTests.docc", content: [ diff --git a/Tests/SwiftDocCUtilitiesTests/ShadowFileManagerTemporaryDirectory.swift b/Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/ShadowFileManagerTemporaryDirectory.swift rename to Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift diff --git a/Tests/SwiftDocCUtilitiesTests/SignalTests.swift b/Tests/CommandLineTests/SignalTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/SignalTests.swift rename to Tests/CommandLineTests/SignalTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift b/Tests/CommandLineTests/StaticHostableTransformerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift rename to Tests/CommandLineTests/StaticHostableTransformerTests.swift index 0fa8c102e6..a1d17aec07 100644 --- a/Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift +++ b/Tests/CommandLineTests/StaticHostableTransformerTests.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 CommandLine +import TestUtilities class StaticHostableTransformerTests: StaticHostingBaseTests { diff --git a/Tests/SwiftDocCUtilitiesTests/StaticHostingBaseTest.swift b/Tests/CommandLineTests/StaticHostingBaseTest.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/StaticHostingBaseTest.swift rename to Tests/CommandLineTests/StaticHostingBaseTest.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json b/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json rename to Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/article.md b/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/article.md rename to Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/DeckKit-Objective-C.symbols.json b/Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/DeckKit-Objective-C.symbols.json rename to Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/Overview.tutorial b/Tests/CommandLineTests/Test Resources/Overview.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/Overview.tutorial rename to Tests/CommandLineTests/Test Resources/Overview.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/Test Template/index.html b/Tests/CommandLineTests/Test Resources/Test Template/index.html similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/Test Template/index.html rename to Tests/CommandLineTests/Test Resources/Test Template/index.html diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/TopLevelCuration.symbols.json b/Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/TopLevelCuration.symbols.json rename to Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/UncuratedArticle.md b/Tests/CommandLineTests/Test Resources/UncuratedArticle.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/UncuratedArticle.md rename to Tests/CommandLineTests/Test Resources/UncuratedArticle.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/image.png b/Tests/CommandLineTests/Test Resources/image.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/image.png rename to Tests/CommandLineTests/Test Resources/image.png diff --git a/Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift b/Tests/CommandLineTests/ThrottleTests.swift similarity index 92% rename from Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift rename to Tests/CommandLineTests/ThrottleTests.swift index 699822810d..5a1fb7cdfa 100644 --- a/Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift +++ b/Tests/CommandLineTests/ThrottleTests.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 @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class ThrottleTests: XCTestCase { func testThrottlingSingleCall() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift b/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift rename to Tests/CommandLineTests/TransformForStaticHostingActionTests.swift index 912e5824a7..7b1e3b59eb 100644 --- a/Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift +++ b/Tests/CommandLineTests/TransformForStaticHostingActionTests.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 @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class TransformForStaticHostingActionTests: StaticHostingBaseTests { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/DirectedGraphTests.swift b/Tests/CommandLineTests/Utility/DirectedGraphTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Utility/DirectedGraphTests.swift rename to Tests/CommandLineTests/Utility/DirectedGraphTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift b/Tests/CommandLineTests/Utility/FileTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift rename to Tests/CommandLineTests/Utility/FileTests.swift index cfabe527a4..0165dcf716 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift +++ b/Tests/CommandLineTests/Utility/FileTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities class FileTests: XCTestCase { func testAbsoluteURL() { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift b/Tests/CommandLineTests/Utility/LogHandleTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift rename to Tests/CommandLineTests/Utility/LogHandleTests.swift index c7bdb5afb9..489f0f91b5 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift +++ b/Tests/CommandLineTests/Utility/LogHandleTests.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 @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC class LogHandleTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift b/Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift similarity index 94% rename from Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift rename to Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift index 865ffca714..4de534089d 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift +++ b/Tests/CommandLineTests/Utility/Sequence+UniqueTests.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 -@testable import SwiftDocCUtilities +@testable import CommandLine class Sequence_UniqueTests: XCTestCase { func testEmpty() { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift b/Tests/CommandLineTests/Utility/TestFileSystemTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift rename to Tests/CommandLineTests/Utility/TestFileSystemTests.swift index fd3eb71489..85eec4dc38 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift +++ b/Tests/CommandLineTests/Utility/TestFileSystemTests.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 @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import SwiftDocCTestUtilities +@testable import TestUtilities class TestFileSystemTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift b/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift similarity index 90% rename from Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift rename to Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift index d693826f6b..75c20a70ae 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift +++ b/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift @@ -1,14 +1,14 @@ /* 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 */ -@testable import SwiftDocCUtilities +@testable import CommandLine import XCTest class URL_IsAbsoluteWebURLTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift b/Tests/CommandLineTests/Utility/URL+RelativeTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift rename to Tests/CommandLineTests/Utility/URL+RelativeTests.swift index 9aea0848a8..d832546cbd 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift +++ b/Tests/CommandLineTests/Utility/URL+RelativeTests.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 @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class URL_RelativeTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/XCTestCase+enableFeatureFlag.swift b/Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Utility/XCTestCase+enableFeatureFlag.swift rename to Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift diff --git a/Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift b/Tests/CommandLineTests/XCTestCase+LoadingData.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift rename to Tests/CommandLineTests/XCTestCase+LoadingData.swift index cc50e4ca1f..2a6c26b7a1 100644 --- a/Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift +++ b/Tests/CommandLineTests/XCTestCase+LoadingData.swift @@ -11,7 +11,7 @@ import Foundation import XCTest import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities extension XCTestCase { /// Loads a documentation catalog from an in-memory test file system. diff --git a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift index 1073bc693e..20f219b6f2 100644 --- a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift +++ b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class NonInclusiveLanguageCheckerTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift index 8cfbad65db..b92fdff6c4 100644 --- a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift +++ b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift @@ -10,7 +10,7 @@ import Foundation import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import XCTest // THIS SHOULD BE REMOVED, RIGHT?! diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift index 6943f58bc6..e5042b0536 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.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 @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DiagnosticConsoleWriterDefaultFormattingTest: XCTestCase { diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift index f22e888977..fd94e38c82 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SwiftDocC import Markdown @testable import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class DiagnosticTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift index a46afb677e..9df8b1e100 100644 --- a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift +++ b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class ConvertServiceTests: XCTestCase { private let testBundleInfo = DocumentationBundle.Info( diff --git a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift index 1d5ed2b1cc..9335fe2bd4 100644 --- a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ExternalRenderNodeTests: XCTestCase { private func generateExternalResolver() -> TestMultiResultExternalReferenceResolver { diff --git a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift index 16c63bede5..6f62a77450 100644 --- a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities typealias Node = NavigatorTree.Node typealias PageType = NavigatorIndex.PageType diff --git a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift index d2682c360d..8f748d2cdf 100644 --- a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC diff --git a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift index f45a2d7119..e60f677da9 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutoCapitalizationTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift index d214b77338..2f8df44a62 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutomaticCurationTests: XCTestCase { private let (availableExtensionSymbolKinds, availableNonExtensionSymbolKinds) = Set(AutomaticCuration.groupKindOrder).union(SymbolGraph.Symbol.KindIdentifier.allCases) diff --git a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift index 323fe5a2c5..b0493e744c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class BundleDiscoveryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift index 9523dc0966..b068787d18 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DocumentationContext_RootPageTests: XCTestCase { func testArticleOnlyCatalogWithExplicitTechnologyRoot() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift index e788f1b192..c037afb9a4 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities func diffDescription(lhs: String, rhs: String) -> String { let leftLines = lhs.components(separatedBy: .newlines) diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift index cab832ec10..ce1ab9ce2b 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift @@ -13,7 +13,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown class DocumentationCuratorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift index 0d0bab01b5..adc94f2251 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift @@ -12,7 +12,7 @@ import XCTest import Markdown import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ExternalPathHierarchyResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift index 803868d2ad..3101ec444c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift @@ -12,7 +12,7 @@ import XCTest @_spi(ExternalLinks) @testable import SwiftDocC import Markdown import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class ExternalReferenceResolverTests: XCTestCase { class TestExternalReferenceResolver: ExternalDocumentationSource { diff --git a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift index 2d6edd7e57..2bd1f21ceb 100644 --- a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC class DocumentationInputsProviderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift index 4a34e693ca..28bc0caa6f 100644 --- a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class NodeTagsTests: XCTestCase { func testSPIMetadata() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift index c7c54f5495..305bc6dc9a 100644 --- a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown class PathHierarchyTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift index 84e39551d5..5ee3c9ff1d 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class SnippetResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift index 39ad7e8482..6d235652bf 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolGraphLoaderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift index 49d4985b93..6384fda46e 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolReferenceTests: XCTestCase { func testUsesIdentifierForUnresolvedSymbols() { diff --git a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift index 5ac4655d92..029fe68c33 100644 --- a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift +++ b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class LinkDestinationSummaryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift index c63d951a60..93f560e259 100644 --- a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift +++ b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class LineHighlighterTests: XCTestCase { static let bundleID: DocumentationBundle.Identifier = "org.swift.docc.LineHighlighterTests" diff --git a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift index 912ac6fdb3..eb9b2d5fd4 100644 --- a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift +++ b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift @@ -13,7 +13,7 @@ import XCTest import Markdown @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ParametersAndReturnValidatorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift index 2a5ddab8bf..2e9869da7a 100644 --- a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift +++ b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit import Foundation @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class PropertyListPossibleValuesSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift index d3a3fc2446..225e5cccc0 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift @@ -11,7 +11,7 @@ import Foundation @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities import XCTest class SemaToRenderNodeMixedLanguageTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift index 73b4a508ed..f6a309beed 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift @@ -12,7 +12,7 @@ import Markdown import XCTest import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class SemaToRenderNodeTests: XCTestCase { func testCompileTutorial() async throws { diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift index a4640f8b2f..4140da55ed 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities // This tests the deprecated V1 implementation of `OutOfProcessReferenceResolver`. // Deprecating the test silences the deprecation warning when running the tests. It doesn't skip the test. diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift index e4e42b500a..d6ce70ddb7 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities #if os(macOS) class OutOfProcessReferenceResolverV2Tests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift index 4c264ec3e7..dd44559f63 100644 --- a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift +++ b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutomaticSeeAlsoTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift index 19bd1673ac..0350f4cad2 100644 --- a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit fileprivate let jsonDecoder = JSONDecoder() diff --git a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift index 24e21475fa..847872ed85 100644 --- a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit class DeclarationsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift index 200fd3073b..37a9ab94f9 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DefaultAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift index 002f93d25a..176f776c4e 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DefaultCodeBlockSyntaxTests: XCTestCase { func testCodeBlockWithoutAnyLanguageOrDefault() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift index 778e190577..35f3515ac4 100644 --- a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class HeadingAnchorTests: XCTestCase { func testEncodeHeadingAnchor() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift index 15b8c44978..1c13a18678 100644 --- a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.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,7 +11,7 @@ import Foundation import XCTest @testable public import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class PlistSymbolTests: XCTestCase { private let plistSymbolURL = Bundle.module.url( diff --git a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift index a4790d4d28..90137262f7 100644 --- a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class PropertyListDetailsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift index 9de46ea5c3..ca982b3f6b 100644 --- a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit fileprivate extension [RenderBlockContent] { diff --git a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift index 29b3728990..0349b25ec7 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift @@ -11,7 +11,7 @@ import Foundation import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import XCTest typealias Position = RenderBlockContent.CodeBlockOptions.Position diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift index 1cb095f54a..0aa591d6fa 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift @@ -13,7 +13,7 @@ import XCTest import SymbolKit import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class RenderNodeTranslatorSymbolVariantsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift index be2a95ea56..e9b1bdaff1 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown import SymbolKit diff --git a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift index c3ea5e5ab5..d70241cba9 100644 --- a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/TermListTests.swift b/Tests/SwiftDocCTests/Rendering/TermListTests.swift index d5e496456c..c2c1696b82 100644 --- a/Tests/SwiftDocCTests/Rendering/TermListTests.swift +++ b/Tests/SwiftDocCTests/Rendering/TermListTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class TermListTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift index 856a3908be..4a489dc12a 100644 --- a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift @@ -11,7 +11,7 @@ import XCTest @testable @preconcurrency import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit class ArticleSymbolMentionsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift index 7be45b6176..1587ad1c54 100644 --- a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class ChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift index 9832537c9e..9aa4cca0ad 100644 --- a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift +++ b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities @testable import SymbolKit class DoxygenTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift index 97f3b48ab2..16cfa20232 100644 --- a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class MarkupReferenceResolverTests: XCTestCase { func testArbitraryReferenceInComment() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift index 042cad6bd8..4664829965 100644 --- a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class MultipleChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StackTests.swift b/Tests/SwiftDocCTests/Semantics/StackTests.swift index 721db9aa3f..6f7275889a 100644 --- a/Tests/SwiftDocCTests/Semantics/StackTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StackTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class StackTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StepTests.swift b/Tests/SwiftDocCTests/Semantics/StepTests.swift index d8a1b576df..3f66fbbfcb 100644 --- a/Tests/SwiftDocCTests/Semantics/StepTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StepTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class StepTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift index 063c8c997d..4798c6e78d 100644 --- a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift +++ b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class SymbolTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift index 086f0a7488..de064d8895 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class TutorialArticleTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift index 33683991a4..767ed5f706 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class TutorialTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift index 3fb78b1444..99708fd1c1 100644 --- a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class VideoMediaTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift index 827ab38f7d..2b5c258899 100644 --- a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class VolumeTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Utility/LMDBTests.swift b/Tests/SwiftDocCTests/Utility/LMDBTests.swift index dd50b29604..06a6c514b5 100644 --- a/Tests/SwiftDocCTests/Utility/LMDBTests.swift +++ b/Tests/SwiftDocCTests/Utility/LMDBTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities final class SwiftLMDBTests: XCTestCase { var environment: LMDB.Environment! diff --git a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift index 8639fd62a8..ceb47c7213 100644 --- a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift +++ b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift index a7306396b9..939e79c82a 100644 --- a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift +++ b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift @@ -10,7 +10,7 @@ @testable import SwiftDocC import XCTest -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit extension XCTestCase { diff --git a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift index 4103f4f92b..203311214a 100644 --- a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift +++ b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities extension XCTestCase { diff --git a/Tests/signal-test-app/main.swift b/Tests/signal-test-app/main.swift index 2973ef3d69..4a96e6eb9f 100644 --- a/Tests/signal-test-app/main.swift +++ b/Tests/signal-test-app/main.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,13 +10,13 @@ // // Trap signals and exit with a predefined error code. -// Check Tests/SwiftDocCUtilitiesTests/SignalTests.swift for more details. +// Check Tests/CommandLineTests/SignalTests.swift for more details. // #if os(macOS) || os(Linux) || os(Android) import Foundation -import SwiftDocCUtilities +import CommandLine Signal.on(Signal.all) { _ in print("Signal test app exiting.") diff --git a/bin/check-source b/bin/check-source index 7ab7fa1de5..b72b7a4c41 100755 --- a/bin/check-source +++ b/bin/check-source @@ -48,7 +48,7 @@ for language in swift-or-c bash md-or-tutorial html docker; do reader=head case "$language" in swift-or-c) - exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/SwiftDocCUtilitiesTests/Test Bundles/*") + exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/CommandLineTests/Test Bundles/*") matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' ) cat > "$tmp" <<"EOF" /* diff --git a/bin/preview-docs b/bin/preview-docs index f988b5548f..1faa752bdf 100755 --- a/bin/preview-docs +++ b/bin/preview-docs @@ -2,7 +2,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 @@ -28,7 +28,7 @@ while test $# -gt 0; do case "$1" in --help) echo - echo "Usage: $(basename $0) [SwiftDocC|SwiftDocCUtilities|DocC] [-h] [--convert-only]" + echo "Usage: $(basename $0) [SwiftDocC|CommandLine|DocC] [-h] [--convert-only]" echo "Builds the given framework and converts or previews the documentation" echo "Note: To preview you must set the \`DOCC_HTML_DIR\` with a path to a documentation template. @@ -80,27 +80,27 @@ case $FRAMEWORK in --output-path "$DOCS_BUILD_DIR" ;; - "SwiftDocCUtilities") + "CommandLine") - # Generate symbol graph files for SwiftDocCUtilities + # Generate symbol graph files for CommandLine swift build --package-path "$DOCC_ROOT" \ - --target SwiftDocCUtilities \ + --target CommandLine \ -Xswiftc -emit-symbol-graph \ -Xswiftc -emit-symbol-graph-dir -Xswiftc "$SGFS_DIR" echo # Delete the symbol graph files from dependences by looking for - # those without a 'SwiftDocCUtilities' prefix. - find "$SGFS_DIR" -type f ! -name 'SwiftDocCUtilities*' -delete + # those without a 'CommandLine' prefix. + find "$SGFS_DIR" -type f ! -name 'CommandLine*' -delete echo # Compile the documentation and the symbol graph data. - swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc" \ + swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/CommandLine/CommandLine.docc" \ --experimental-enable-custom-templates \ - --fallback-display-name SwiftDocCUtilities \ - --fallback-bundle-identifier org.swift.SwiftDocCUtilities \ + --fallback-display-name CommandLine \ + --fallback-bundle-identifier org.swift.CommandLine \ --fallback-bundle-version 1.0.0 \ --additional-symbol-graph-dir "$SGFS_DIR" \ --output-path $DOCS_BUILD_DIR @@ -116,7 +116,7 @@ case $FRAMEWORK in *) echo - echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, SwiftDocCUtilities, or DocC." + echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, CommandLine, or DocC." exit 0 ;; esac diff --git a/bin/update-gh-pages-documentation-site b/bin/update-gh-pages-documentation-site index c1469ed8ae..41b8e41341 100755 --- a/bin/update-gh-pages-documentation-site +++ b/bin/update-gh-pages-documentation-site @@ -2,7 +2,7 @@ # # This source file is part of the Swift.org open source project # -# Copyright (c) 2022-2024 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 @@ -27,9 +27,9 @@ SWIFT_DOCC_ROOT="$(dirname $(dirname $(filepath $0)))" DOCC_BUILD_DIR="$SWIFT_DOCC_ROOT"/.build/docc-gh-pages-build DOCC_OUTPUT_DIR="$DOCC_BUILD_DIR"/SwiftDocC.doccarchive -DOCC_UTILITIES_OUTPUT_DIR="$DOCC_BUILD_DIR"/SwiftDocCUtilities.doccarchive +COMMAND_LINE_OUTPUT_DIR="$DOCC_BUILD_DIR"/CommandLine.doccarchive -mkdir -p "$DOCC_UTILITIES_OUTPUT_DIR" +mkdir -p "$COMMAND_LINE_OUTPUT_DIR" # Set current directory to the repository root cd "$SWIFT_DOCC_ROOT" @@ -58,31 +58,31 @@ swift package \ --hosting-base-path swift-docc \ --output-path "$DOCC_OUTPUT_DIR" -echo -e "\033[34;1m Building SwiftDocC Utilities docs at $DOCC_UTILITIES_OUTPUT_DIR \033[0m" +echo -e "\033[34;1m Building SwiftDocC Utilities docs at $COMMAND_LINE_OUTPUT_DIR \033[0m" -# Generate documentation for the 'SwiftDocCUtilities' target and output it +# Generate documentation for the 'CommandLine' target and output it # to a temporary output directory in the .build directory. swift package \ --allow-writing-to-directory "$DOCC_BUILD_DIR" \ generate-documentation \ - --target SwiftDocCUtilities \ + --target CommandLine \ --disable-indexing \ --source-service github \ --source-service-base-url https://github.com/swiftlang/swift-docc/blob/main \ --checkout-path "$SWIFT_DOCC_ROOT" \ --transform-for-static-hosting \ --hosting-base-path swift-docc \ - --output-path "$DOCC_UTILITIES_OUTPUT_DIR" + --output-path "$COMMAND_LINE_OUTPUT_DIR" echo -e "\033[34;1m Merging docs \033q[0m" # Remove the output directory so that the merge command can output there rm -rf "$SWIFT_DOCC_ROOT/gh-pages/docs" -# Merge the SwiftDocCUtilities docs into the primary SwiftDocC docs +# Merge the CommandLine docs into the primary SwiftDocC docs swift run docc merge \ "$DOCC_OUTPUT_DIR" \ - "$DOCC_UTILITIES_OUTPUT_DIR" \ + "$COMMAND_LINE_OUTPUT_DIR" \ --output-path "$SWIFT_DOCC_ROOT/gh-pages/docs" # Save the current commit we've just built documentation from in a variable