Skip to content

Commit 92d65bf

Browse files
authored
Hide build system internals with @_spi (swiftlang#7365)
These details should not leak outside of the SwiftPM package. In the (hopefully temporary) absence of `package` access control, we can hide build system-related APIs with `@_spi` annotations.
1 parent 03fef47 commit 92d65bf

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

+232
-14
lines changed

Sources/Build/BuildOperation.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@
1212

1313
@_spi(SwiftPMInternal)
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
17+
import Build
18+
1519
import LLBuildManifest
1620
import PackageGraph
1721
import PackageLoading
1822
import PackageModel
23+
24+
@_spi(SwiftPMInternal)
1925
import SPMBuildCore
26+
2027
import SPMLLBuild
2128
import Foundation
2229

@@ -36,6 +43,7 @@ import DriverSupport
3643
import SwiftDriver
3744
#endif
3845

46+
@_spi(SwiftPMInternal)
3947
public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildSystem, BuildErrorAdviceProvider {
4048
/// The delegate used by the build system.
4149
public weak var delegate: SPMBuildCore.BuildSystemDelegate?

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ import Dispatch
1616
import Foundation
1717
import LLBuildManifest
1818
import PackageModel
19+
20+
@_spi(SwiftPMInternal)
1921
import SPMBuildCore
22+
2023
import SPMLLBuild
2124

2225
import struct TSCBasic.ByteString

Sources/Commands/CommandWorkspaceDelegate.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14+
15+
@_spi(SwiftPMInternal)
1416
import CoreCommands
17+
1518
import Dispatch
1619
import class Foundation.NSLock
1720
import struct Foundation.URL

Sources/Commands/PackageCommands/APIDiff.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import Dispatch
1720
import PackageGraph
1821
import PackageModel
1922
import SourceControl
2023

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

Sources/Commands/PackageCommands/ArchiveSource.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import SourceControl
1720

1821
extension SwiftPackageCommand {

Sources/Commands/PackageCommands/CompletionCommand.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import ArgumentParser
14+
15+
@_spi(SwiftPMInternal)
1416
import CoreCommands
1517

1618
import var TSCBasic.stdoutStream

Sources/Commands/PackageCommands/ComputeChecksum.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import Workspace
1720

1821
import struct TSCBasic.SHA256

Sources/Commands/PackageCommands/Config.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import Workspace
1720

1821
import var TSCBasic.stderrStream

Sources/Commands/PackageCommands/Describe.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import Foundation
1720
import PackageModel
1821

Sources/Commands/PackageCommands/DumpCommands.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212

1313
import ArgumentParser
1414
import Basics
15+
16+
@_spi(SwiftPMInternal)
1517
import CoreCommands
18+
1619
import Foundation
1720
import PackageModel
21+
22+
@_spi(SwiftPMInternal)
23+
import SPMBuildCore
24+
1825
import XCBuildSupport
1926

2027
struct DumpSymbolGraph: SwiftCommand {

0 commit comments

Comments
 (0)