Skip to content

Commit 97b2c14

Browse files
tayloraswifttayloraswift
authored
Merge pull request #407 from tayloraswift/adopt-swift-io
adopt the swift-io package, evacuate sources
2 parents 9f39c31 + a7271db commit 97b2c14

File tree

91 files changed

+77
-1524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+77
-1524
lines changed

‎Package.resolved

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ let package:Package = .init(
5959
.library(name: "SymbolGraphs", targets: ["SymbolGraphs"]),
6060
.library(name: "Symbols", targets: ["Symbols"]),
6161

62-
.library(name: "System_", targets: ["System_"]),
63-
.library(name: "System_ArgumentParser", targets: ["System_ArgumentParser"]),
64-
6562
.library(name: "UnidocAPI", targets: ["UnidocAPI"]),
6663
.library(name: "UnidocAssets", targets: ["UnidocAssets"]),
6764
.library(name: "UnidocAssets_System", targets: ["UnidocAssets_System"]),
@@ -86,6 +83,8 @@ let package:Package = .init(
8683
from: "0.7.1")),
8784
.package(url: "https://github.com/tayloraswift/swift-ip", .upToNextMinor(
8885
from: "0.3.3")),
86+
.package(url: "https://github.com/tayloraswift/swift-io", .upToNextMinor(
87+
from: "0.1.0")),
8988
.package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
9089
from: "1.1.2")),
9190
.package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
@@ -375,8 +374,8 @@ let package:Package = .init(
375374
.target(name: "PackageMetadata"),
376375
.target(name: "SymbolGraphCompiler"),
377376
.target(name: "SymbolGraphLinker"),
378-
.target(name: "System_ArgumentParser"),
379-
.target(name: "System_"),
377+
.product(name: "SystemIO", package: "swift-io"),
378+
.product(name: "System_ArgumentParser", package: "swift-io"),
380379
]),
381380

382381
.target(name: "SymbolGraphCompiler",
@@ -437,7 +436,7 @@ let package:Package = .init(
437436
.target(name: "SymbolGraphTesting",
438437
dependencies: [
439438
.target(name: "SymbolGraphs"),
440-
.target(name: "System_"),
439+
.product(name: "SystemIO", package: "swift-io"),
441440
]),
442441

443442
.target(name: "TopologicalSorting"),
@@ -467,16 +466,15 @@ let package:Package = .init(
467466
.target(name: "UnidocAssets_System",
468467
dependencies: [
469468
.target(name: "Media"),
470-
.target(name: "System_"),
471469
.target(name: "UnidocAssets"),
470+
.product(name: "SystemIO", package: "swift-io"),
472471
]),
473472

474473
.target(name: "UnidocCLI",
475474
dependencies: [
476475
.target(name: "_GitVersion"),
477-
.target(name: "System_ArgumentParser"),
478476
.target(name: "UnidocServer"),
479-
.product(name: "ArgumentParser", package: "swift-argument-parser"),
477+
.product(name: "System_ArgumentParser", package: "swift-io"),
480478
]),
481479

482480
.target(name: "UnidocClient",
@@ -590,18 +588,6 @@ let package:Package = .init(
590588
.product(name: "UnixTime", package: "swift-unixtime"),
591589
]),
592590

593-
.target(name: "System_",
594-
dependencies: [
595-
.product(name: "SystemPackage", package: "swift-system"),
596-
.product(name: "TraceableErrors", package: "swift-grammar"),
597-
]),
598-
599-
.target(name: "System_ArgumentParser",
600-
dependencies: [
601-
.target(name: "System_"),
602-
.product(name: "ArgumentParser", package: "swift-argument-parser"),
603-
]),
604-
605591

606592
.testTarget(name: "FingerprintingTests",
607593
dependencies: [
@@ -628,7 +614,7 @@ let package:Package = .init(
628614
.testTarget(name: "PackageMetadataTests",
629615
dependencies: [
630616
.target(name: "PackageMetadata"),
631-
.target(name: "System_"),
617+
.product(name: "SystemIO", package: "swift-io"),
632618
]),
633619

634620
.testTarget(name: "S3Tests",
@@ -644,7 +630,7 @@ let package:Package = .init(
644630
.testTarget(name: "SymbolGraphValidationTests",
645631
dependencies: [
646632
.target(name: "SymbolGraphTesting"),
647-
.target(name: "System_"),
633+
.product(name: "SystemIO", package: "swift-io"),
648634
]),
649635

650636
.executableTarget(name: "SymbolGraphBuilderTests",
@@ -668,8 +654,8 @@ let package:Package = .init(
668654
.executableTarget(name: "SymbolGraphPartTests",
669655
dependencies: [
670656
.target(name: "SymbolGraphParts"),
671-
.target(name: "System_"),
672657
.target(name: "Testing_"),
658+
.product(name: "SystemIO", package: "swift-io"),
673659
]),
674660

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

685-
.testTarget(name: "SystemTests",
686-
dependencies: [
687-
.target(name: "System_"),
688-
],
689-
exclude: [
690-
"directories",
691-
]),
692-
693671
.testTarget(name: "TopologicalSortingTests",
694672
dependencies: [
695673
.target(name: "TopologicalSorting"),

‎Sources/PackageMetadataTests/PackageResolved.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import JSON
22
import PackageMetadata
3-
import System_
3+
import SystemIO
44
import Testing
55

66
@Suite

‎Sources/PackageMetadataTests/PackageSwift.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import JSON
22
import PackageGraphs
33
import PackageMetadata
4-
import System_
4+
import SystemIO
55
import Testing
66

77
@Suite

‎Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolCache.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import SymbolGraphLinker
22
import SymbolGraphParts
33
import SymbolGraphs
44
import Symbols
5-
import System_
5+
import SystemIO
66

77
extension SSGC
88
{

‎Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDump (ext).swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SymbolGraphCompiler
22
import SymbolGraphParts
33
import Symbols
4-
import System_
4+
import SystemIO
55

66
extension SSGC.SymbolDump
77
{

‎Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDumpLoadingError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import System_
1+
import SystemIO
22
import TraceableErrors
33

44
extension SSGC

‎Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolDumps.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SymbolGraphParts
22
import Symbols
3-
import System_
3+
import SystemIO
44

55
extension SSGC
66
{

‎Sources/SymbolGraphBuilder/Artifacts/SSGC.SymbolFiles.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import SymbolGraphParts
2-
import System_
2+
import SystemIO
33

44
extension SSGC
55
{

‎Sources/SymbolGraphBuilder/Builds/SSGC.Checkout.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SHA1
22
import Symbols
3-
import System_
3+
import SystemIO
44
import UnixTime
55

66
extension SSGC

0 commit comments

Comments
 (0)