Skip to content

adopt the swift-io package, evacuate sources #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2025
Merged

adopt the swift-io package, evacuate sources #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6cf177
adopt the swift-io package, evacuate sources
tayloraswift Feb 2, 2025
a7271db
Package.resolved
tayloraswift Feb 2, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 10 additions & 32 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ let package:Package = .init(
.library(name: "SymbolGraphs", targets: ["SymbolGraphs"]),
.library(name: "Symbols", targets: ["Symbols"]),

.library(name: "System_", targets: ["System_"]),
.library(name: "System_ArgumentParser", targets: ["System_ArgumentParser"]),

.library(name: "UnidocAPI", targets: ["UnidocAPI"]),
.library(name: "UnidocAssets", targets: ["UnidocAssets"]),
.library(name: "UnidocAssets_System", targets: ["UnidocAssets_System"]),
Expand All @@ -86,6 +83,8 @@ let package:Package = .init(
from: "0.7.1")),
.package(url: "https://github.com/tayloraswift/swift-ip", .upToNextMinor(
from: "0.3.3")),
.package(url: "https://github.com/tayloraswift/swift-io", .upToNextMinor(
from: "0.1.0")),
.package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
from: "1.1.2")),
.package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
Expand Down Expand Up @@ -375,8 +374,8 @@ let package:Package = .init(
.target(name: "PackageMetadata"),
.target(name: "SymbolGraphCompiler"),
.target(name: "SymbolGraphLinker"),
.target(name: "System_ArgumentParser"),
.target(name: "System_"),
.product(name: "SystemIO", package: "swift-io"),
.product(name: "System_ArgumentParser", package: "swift-io"),
]),

.target(name: "SymbolGraphCompiler",
Expand Down Expand Up @@ -437,7 +436,7 @@ let package:Package = .init(
.target(name: "SymbolGraphTesting",
dependencies: [
.target(name: "SymbolGraphs"),
.target(name: "System_"),
.product(name: "SystemIO", package: "swift-io"),
]),

.target(name: "TopologicalSorting"),
Expand Down Expand Up @@ -467,16 +466,15 @@ let package:Package = .init(
.target(name: "UnidocAssets_System",
dependencies: [
.target(name: "Media"),
.target(name: "System_"),
.target(name: "UnidocAssets"),
.product(name: "SystemIO", package: "swift-io"),
]),

.target(name: "UnidocCLI",
dependencies: [
.target(name: "_GitVersion"),
.target(name: "System_ArgumentParser"),
.target(name: "UnidocServer"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "System_ArgumentParser", package: "swift-io"),
]),

.target(name: "UnidocClient",
Expand Down Expand Up @@ -590,18 +588,6 @@ let package:Package = .init(
.product(name: "UnixTime", package: "swift-unixtime"),
]),

.target(name: "System_",
dependencies: [
.product(name: "SystemPackage", package: "swift-system"),
.product(name: "TraceableErrors", package: "swift-grammar"),
]),

.target(name: "System_ArgumentParser",
dependencies: [
.target(name: "System_"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
]),


.testTarget(name: "FingerprintingTests",
dependencies: [
Expand All @@ -628,7 +614,7 @@ let package:Package = .init(
.testTarget(name: "PackageMetadataTests",
dependencies: [
.target(name: "PackageMetadata"),
.target(name: "System_"),
.product(name: "SystemIO", package: "swift-io"),
]),

.testTarget(name: "S3Tests",
Expand All @@ -644,7 +630,7 @@ let package:Package = .init(
.testTarget(name: "SymbolGraphValidationTests",
dependencies: [
.target(name: "SymbolGraphTesting"),
.target(name: "System_"),
.product(name: "SystemIO", package: "swift-io"),
]),

.executableTarget(name: "SymbolGraphBuilderTests",
Expand All @@ -668,8 +654,8 @@ let package:Package = .init(
.executableTarget(name: "SymbolGraphPartTests",
dependencies: [
.target(name: "SymbolGraphParts"),
.target(name: "System_"),
.target(name: "Testing_"),
.product(name: "SystemIO", package: "swift-io"),
]),

.testTarget(name: "SymbolGraphTests",
Expand All @@ -682,14 +668,6 @@ let package:Package = .init(
.target(name: "Symbols"),
]),

.testTarget(name: "SystemTests",
dependencies: [
.target(name: "System_"),
],
exclude: [
"directories",
]),

.testTarget(name: "TopologicalSortingTests",
dependencies: [
.target(name: "TopologicalSorting"),
Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageMetadataTests/PackageResolved.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import JSON
import PackageMetadata
import System_
import SystemIO
import Testing

@Suite
Expand Down
2 changes: 1 addition & 1 deletion Sources/PackageMetadataTests/PackageSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import JSON
import PackageGraphs
import PackageMetadata
import System_
import SystemIO
import Testing

@Suite
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolCache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import SymbolGraphLinker
import SymbolGraphParts
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDump (ext).swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SymbolGraphCompiler
import SymbolGraphParts
import Symbols
import System_
import SystemIO

extension SSGC.SymbolDump
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDumpLoadingError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO
import TraceableErrors

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDumps.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SymbolGraphParts
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolFiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SymbolGraphParts
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.Checkout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SHA1
import Symbols
import System_
import SystemIO
import UnixTime

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.DocumentationBuild.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SymbolGraphs
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.PackageBuild.Flags.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension SSGC.PackageBuild
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.PackageBuild.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import SemanticVersions
import SHA1
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.PackageBuildDirectory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.PackagePathError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Builds/SSGC.Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import MarkdownABI
import SymbolGraphParts
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/FilePath (ext).swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension FilePath
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/FilePath.Directory (ext).swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension FilePath.Directory
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/PackageNode (ext).swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PackageMetadata
import SHA1
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension PackageNode
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/SSGC.CompileCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ArgumentParser
import BSON
import SymbolGraphs
import Symbols
import System_
import SystemIO
import System_ArgumentParser

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/SSGC.Logger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SourceDiagnostics
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/SSGC.StatusStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO
import struct SystemPackage.Errno

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.BookSources.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import MarkdownABI
import MarkdownPluginSwift
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.DocumentationSources.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import SymbolGraphLinker
import SymbolGraphParts
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.LazyFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SymbolGraphLinker
import Symbols
import System_
import SystemIO
import URI

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.ModuleLayout.DefaultDirectory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SymbolGraphs
import System_
import SystemIO

extension SSGC.ModuleLayout
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.ModuleLayout.Origin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension SSGC.ModuleLayout
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.ModuleLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import MarkdownABI
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.PackageLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PackageGraphs
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.PackageRoot.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Sources/SSGC.PackageSources.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import PackageGraphs
import SymbolGraphLinker
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Standard library/SSGC.StandardLibraryBuild.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SymbolGraphs
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Standard library/SSGC.StandardLibrarySources.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import MarkdownABI
import SymbolGraphs
import Symbols
import System_
import SystemIO

extension SSGC
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Toolchains/SSGC.ManifestDumpError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO
import TraceableErrors

extension SSGC
Expand Down
2 changes: 1 addition & 1 deletion Sources/SymbolGraphBuilder/Toolchains/SSGC.Toolchain.Paths.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import System_
import SystemIO

extension SSGC.Toolchain
{
Expand Down
Loading