Skip to content

Commit d8bb9ad

Browse files
committed
Revert "Hide build system internals with @_spi (#7365)"
This reverts commit 92d65bf.
1 parent 701a053 commit d8bb9ad

Some content is hidden

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

56 files changed

+14
-229
lines changed

Sources/Build/BuildOperation.swift

-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,10 @@
1212

1313
@_spi(SwiftPMInternal)
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
17-
import Build
18-
1915
import LLBuildManifest
2016
import PackageGraph
2117
import PackageLoading
2218
import PackageModel
23-
24-
@_spi(SwiftPMInternal)
2519
import SPMBuildCore
2620
import SPMLLBuild
2721
import Foundation
@@ -42,7 +36,6 @@ import DriverSupport
4236
import SwiftDriver
4337
#endif
4438

45-
@_spi(SwiftPMInternal)
4639
public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider {
4740
/// The delegate used by the build system.
4841
public weak var delegate: SPMBuildCore.BuildSystemDelegate?

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import Dispatch
1616
import Foundation
1717
import LLBuildManifest
1818
import PackageModel
19-
20-
@_spi(SwiftPMInternal)
2119
import SPMBuildCore
22-
2320
import SPMLLBuild
2421

2522
import struct TSCBasic.ByteString

Sources/Commands/CommandWorkspaceDelegate.swift

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import Dispatch
1916
import class Foundation.NSLock
2017
import struct Foundation.URL

Sources/Commands/PackageCommands/APIDiff.swift

-6
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,12 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Dispatch
2017
import PackageGraph
2118
import PackageModel
2219
import SourceControl
2320

24-
@_spi(SwiftPMInternal)
25-
import SPMBuildCore
26-
2721
struct DeprecatedAPIDiff: ParsableCommand {
2822
static let configuration = CommandConfiguration(commandName: "experimental-api-diff",
2923
abstract: "Deprecated - use `swift package diagnose-api-breaking-changes` instead",

Sources/Commands/PackageCommands/ArchiveSource.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import SourceControl
2017

2118
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/CompletionCommand.swift

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
1715

1816
import var TSCBasic.stdoutStream

Sources/Commands/PackageCommands/ComputeChecksum.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Workspace
2017

2118
import struct TSCBasic.SHA256

Sources/Commands/PackageCommands/Config.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Workspace
2017

2118
import var TSCBasic.stderrStream

Sources/Commands/PackageCommands/Describe.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Foundation
2017
import PackageModel
2118

Sources/Commands/PackageCommands/DumpCommands.swift

-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Foundation
2017
import PackageModel
21-
22-
@_spi(SwiftPMInternal)
23-
import SPMBuildCore
24-
2518
import XCBuildSupport
2619

2720
struct DumpSymbolGraph: SwiftCommand {

Sources/Commands/PackageCommands/EditCommands.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import SourceControl
2017

2118
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/Format.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import PackageModel
2017

2118
import class TSCBasic.Process

Sources/Commands/PackageCommands/Init.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Workspace
2017
import SPMBuildCore
2118

Sources/Commands/PackageCommands/InstalledPackages.swift

-7
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,9 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import Foundation
1916
import PackageModel
20-
21-
@_spi(SwiftPMInternal)
22-
import SPMBuildCore
23-
2417
import TSCBasic
2518

2619
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/Learn.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import PackageGraph
2017
import PackageModel
2118

Sources/Commands/PackageCommands/PluginCommand.swift

-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
19-
@_spi(SwiftPMInternal)
20-
import SPMBuildCore
21-
2216
import Dispatch
2317

2418
import PackageGraph

Sources/Commands/PackageCommands/ResetCommands.swift

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
1715

1816
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/Resolve.swift

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import TSCUtility
1916

2017
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/ShowDependencies.swift

-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313

1414
import ArgumentParser
1515
import Basics
16-
17-
@_spi(SwiftPMInternal)
1816
import CoreCommands
19-
2017
import PackageGraph
2118

2219
import class TSCBasic.LocalFileOutputByteStream

Sources/Commands/PackageCommands/SwiftPackageCommand.swift

-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Foundation
2017
import PackageGraph
2118
import PackageLoading

Sources/Commands/PackageCommands/ToolsVersionCommand.swift

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import PackageLoading
1916
import PackageModel
2017
import Workspace

Sources/Commands/PackageCommands/Update.swift

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import Dispatch
1916
import PackageModel
2017
import PackageGraph

Sources/Commands/Snippets/CardStack.swift

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
1815
import PackageGraph
1916
import PackageModel
2017

Sources/Commands/Snippets/Cards/SnippetCard.swift

-7
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
15-
@_spi(SwiftPMInternal)
1614
import CoreCommands
17-
18-
19-
@_spi(SwiftPMInternal)
20-
import SPMBuildCore
21-
2215
import PackageModel
2316

2417
import enum TSCBasic.ProcessEnv

Sources/Commands/Snippets/Cards/SnippetGroupCard.swift

-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@_spi(SwiftPMInternal)
1413
import CoreCommands
15-
1614
import PackageModel
1715

1816
/// A card showing the snippets in a ``SnippetGroup``.

Sources/Commands/Snippets/Cards/TopCard.swift

-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
14-
@_spi(SwiftPMInternal)
1513
import CoreCommands
16-
1714
import Foundation
1815
import PackageModel
1916
import PackageGraph

Sources/Commands/SwiftBuildCommand.swift

-8
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import Build
18-
19-
@_spi(SwiftPMInternal)
2016
import CoreCommands
21-
2217
import PackageGraph
23-
24-
@_spi(SwiftPMInternal)
2518
import SPMBuildCore
2619
import XCBuildSupport
2720

@@ -120,7 +113,6 @@ struct BuildCommandOptions: ParsableArguments {
120113
}
121114

122115
/// swift-build command namespace
123-
@_spi(SwiftPMInternal)
124116
public struct SwiftBuildCommand: AsyncSwiftCommand {
125117
public static var configuration = CommandConfiguration(
126118
commandName: "build",

Sources/Commands/SwiftRunCommand.swift

-7
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@
1212

1313
import ArgumentParser
1414
import Basics
15-
16-
@_spi(SwiftPMInternal)
1715
import CoreCommands
18-
1916
import Foundation
2017
import PackageGraph
2118
import PackageModel
2219

23-
@_spi(SwiftPMInternal)
24-
import SPMBuildCore
25-
2620
import enum TSCBasic.ProcessEnv
2721
import func TSCBasic.exec
2822

@@ -96,7 +90,6 @@ struct RunCommandOptions: ParsableArguments {
9690
}
9791

9892
/// swift-run command namespace
99-
@_spi(SwiftPMInternal)
10093
public struct SwiftRunCommand: AsyncSwiftCommand {
10194
public static var configuration = CommandConfiguration(
10295
commandName: "run",

0 commit comments

Comments
 (0)