Skip to content

Commit c9a3945

Browse files
xedinxedin
committed
Revert "Hide CLI commands API with package access control (#7381)"
This reverts commit 9337c5e.
1 parent 62473f0 commit c9a3945

File tree

85 files changed

+425
-280
lines changed

Some content is hidden

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

85 files changed

+425
-280
lines changed

‎Sources/Basics/ProgressAnimation/NinjaProgressAnimation.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import protocol TSCBasic.WritableByteStream
1515

1616
extension ProgressAnimation {
1717
/// A ninja-like progress animation that adapts to the provided output stream.
18-
package static func ninja(
18+
@_spi(SwiftPMInternal)
19+
public static func ninja(
1920
stream: WritableByteStream,
2021
verbose: Bool
2122
) -> any ProgressAnimationProtocol {

‎Sources/Basics/ProgressAnimation/PercentProgressAnimation.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import protocol TSCBasic.WritableByteStream
1515

1616
extension ProgressAnimation {
1717
/// A percent-based progress animation that adapts to the provided output stream.
18-
package static func percent(
18+
@_spi(SwiftPMInternal)
19+
public static func percent(
1920
stream: WritableByteStream,
2021
verbose: Bool,
2122
header: String

‎Sources/Basics/ProgressAnimation/ProgressAnimationProtocol.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ import class TSCBasic.LocalFileOutputByteStream
1515
import protocol TSCBasic.WritableByteStream
1616
import protocol TSCUtility.ProgressAnimationProtocol
1717

18-
package typealias ProgressAnimationProtocol = TSCUtility.ProgressAnimationProtocol
18+
@_spi(SwiftPMInternal)
19+
public typealias ProgressAnimationProtocol = TSCUtility.ProgressAnimationProtocol
1920

2021
/// Namespace to nest public progress animations under.
21-
package enum ProgressAnimation {
22+
@_spi(SwiftPMInternal)
23+
public enum ProgressAnimation {
2224
/// Dynamically create a progress animation based on the current stream
2325
/// capabilities and desired verbosity.
2426
///

‎Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,27 @@ final class ThrottledProgressAnimation: ProgressAnimationProtocol {
5656
}
5757
}
5858

59+
@_spi(SwiftPMInternal)
5960
extension ProgressAnimationProtocol {
60-
package func throttled<C: Clock>(
61+
@_spi(SwiftPMInternal)
62+
public func throttled<C: Clock>(
6163
now: @escaping () -> C.Instant,
6264
interval: C.Duration,
6365
clock: C.Type = C.self
6466
) -> some ProgressAnimationProtocol {
6567
ThrottledProgressAnimation(self, now: now, interval: interval, clock: clock)
6668
}
6769

68-
package func throttled<C: Clock>(
70+
@_spi(SwiftPMInternal)
71+
public func throttled<C: Clock>(
6972
clock: C,
7073
interval: C.Duration
7174
) -> some ProgressAnimationProtocol {
7275
self.throttled(now: { clock.now }, interval: interval, clock: C.self)
7376
}
7477

75-
package func throttled(
78+
@_spi(SwiftPMInternal)
79+
public func throttled(
7680
interval: ContinuousClock.Duration
7781
) -> some ProgressAnimationProtocol {
7882
self.throttled(clock: ContinuousClock(), interval: interval)

‎Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import PackageGraph
1717
import PackageLoading
1818
import PackageModel
1919

20+
@_spi(SwiftPMInternal)
2021
import SPMBuildCore
2122

2223
#if USE_IMPL_ONLY_IMPORTS

‎Sources/Build/BuildOperation.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
@_spi(SwiftPMInternal)
1314
import Basics
15+
16+
@_spi(SwiftPMInternal)
17+
import Build
18+
1419
import LLBuildManifest
1520
import PackageGraph
1621
import PackageLoading
1722
import PackageModel
23+
24+
@_spi(SwiftPMInternal)
1825
import SPMBuildCore
1926
import SPMLLBuild
2027
import Foundation
@@ -35,7 +42,8 @@ import DriverSupport
3542
import SwiftDriver
3643
#endif
3744

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

‎Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13+
@_spi(SwiftPMInternal)
1314
import Basics
1415
import Dispatch
1516
import Foundation
1617
import LLBuildManifest
1718
import PackageModel
1819

20+
@_spi(SwiftPMInternal)
1921
import SPMBuildCore
2022

2123
import SPMLLBuild

‎Sources/Build/BuildPlan/BuildPlan+Product.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import struct PackageGraph.ResolvedModule
1818
import class PackageModel.BinaryTarget
1919
import class PackageModel.ClangTarget
2020

21+
@_spi(SwiftPMInternal)
2122
import class PackageModel.Target
2223

2324
import class PackageModel.SwiftTarget

‎Sources/Build/BuildPlan/BuildPlan.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ public class BuildPlan: SPMBuildCore.BuildPlan {
216216
/// source files as well as directories to which any changes should cause us to reevaluate the build plan.
217217
public let prebuildCommandResults: [ResolvedModule.ID: [PrebuildCommandResult]]
218218

219-
package private(set) var derivedTestTargetsMap: [ResolvedProduct.ID: [ResolvedModule]] = [:]
219+
@_spi(SwiftPMInternal)
220+
public private(set) var derivedTestTargetsMap: [ResolvedProduct.ID: [ResolvedModule]] = [:]
220221

221222
/// Cache for pkgConfig flags.
222223
private var pkgConfigCache = [SystemLibraryTarget: (cFlags: [String], libs: [String])]()

‎Sources/Commands/CommandWorkspaceDelegate.swift

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

1313
import Basics
1414

15+
@_spi(SwiftPMInternal)
1516
import CoreCommands
1617

1718
import Dispatch
@@ -214,22 +215,22 @@ final class CommandWorkspaceDelegate: WorkspaceDelegate {
214215
}
215216
}
216217

217-
package func willUpdateDependencies() {
218+
public func willUpdateDependencies() {
218219
self.observabilityScope.emit(debug: "Updating dependencies")
219220
os_signpost(.begin, name: SignpostName.updatingDependencies)
220221
}
221222

222-
package func didUpdateDependencies(duration: DispatchTimeInterval) {
223+
public func didUpdateDependencies(duration: DispatchTimeInterval) {
223224
self.observabilityScope.emit(debug: "Dependencies updated in (\(duration.descriptionInSeconds))")
224225
os_signpost(.end, name: SignpostName.updatingDependencies)
225226
}
226227

227-
package func willResolveDependencies() {
228+
public func willResolveDependencies() {
228229
self.observabilityScope.emit(debug: "Resolving dependencies")
229230
os_signpost(.begin, name: SignpostName.resolvingDependencies)
230231
}
231232

232-
package func didResolveDependencies(duration: DispatchTimeInterval) {
233+
public func didResolveDependencies(duration: DispatchTimeInterval) {
233234
self.observabilityScope.emit(debug: "Dependencies resolved in (\(duration.descriptionInSeconds))")
234235
os_signpost(.end, name: SignpostName.resolvingDependencies)
235236
}
@@ -266,7 +267,7 @@ final class CommandWorkspaceDelegate: WorkspaceDelegate {
266267
func willLoadManifest(packageIdentity: PackageIdentity, packagePath: AbsolutePath, url: String, version: Version?, packageKind: PackageReference.Kind) {}
267268
}
268269

269-
package extension _SwiftCommand {
270+
public extension _SwiftCommand {
270271
var workspaceDelegateProvider: WorkspaceDelegateProvider {
271272
return {
272273
CommandWorkspaceDelegate(

‎Sources/Commands/PackageCommands/APIDiff.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Dispatch
1920
import PackageGraph
2021
import PackageModel
2122
import SourceControl
2223

24+
@_spi(SwiftPMInternal)
2325
import SPMBuildCore
2426

2527
struct DeprecatedAPIDiff: ParsableCommand {

‎Sources/Commands/PackageCommands/ArchiveSource.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import SourceControl
@@ -61,7 +62,7 @@ extension SwiftPackageCommand {
6162
}
6263
}
6364

64-
package static func archiveSource(
65+
public static func archiveSource(
6566
at packageDirectory: AbsolutePath,
6667
to archivePath: AbsolutePath,
6768
fileSystem: FileSystem,

‎Sources/Commands/PackageCommands/CompletionCommand.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import ArgumentParser
1414

15+
@_spi(SwiftPMInternal)
1516
import CoreCommands
1617

1718
import var TSCBasic.stdoutStream

‎Sources/Commands/PackageCommands/ComputeChecksum.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Workspace

‎Sources/Commands/PackageCommands/Config.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Workspace

‎Sources/Commands/PackageCommands/Describe.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Foundation

‎Sources/Commands/PackageCommands/DumpCommands.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Foundation
1920
import PackageModel
2021

22+
@_spi(SwiftPMInternal)
2123
import SPMBuildCore
2224

2325
import XCBuildSupport

‎Sources/Commands/PackageCommands/EditCommands.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import SourceControl

‎Sources/Commands/PackageCommands/Format.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import PackageModel

‎Sources/Commands/PackageCommands/Init.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Workspace
1920
import SPMBuildCore
2021

2122
extension SwiftPackageCommand {
2223
struct Init: SwiftCommand {
23-
package static let configuration = CommandConfiguration(
24+
public static let configuration = CommandConfiguration(
2425
abstract: "Initialize a new package")
2526

2627
@OptionGroup(visibility: .hidden)

‎Sources/Commands/PackageCommands/InstalledPackages.swift

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

1313
import ArgumentParser
1414

15+
@_spi(SwiftPMInternal)
1516
import CoreCommands
1617

1718
import Foundation
1819
import PackageModel
1920

21+
@_spi(SwiftPMInternal)
2022
import SPMBuildCore
2123

2224
import TSCBasic

‎Sources/Commands/PackageCommands/Learn.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import PackageGraph

‎Sources/Commands/PackageCommands/PluginCommand.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

19+
@_spi(SwiftPMInternal)
1820
import SPMBuildCore
1921

2022
import Dispatch

‎Sources/Commands/PackageCommands/ResetCommands.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import ArgumentParser
1414

15+
@_spi(SwiftPMInternal)
1516
import CoreCommands
1617

1718
extension SwiftPackageCommand {

‎Sources/Commands/PackageCommands/Resolve.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import ArgumentParser
1414

15+
@_spi(SwiftPMInternal)
1516
import CoreCommands
1617

1718
import TSCUtility

‎Sources/Commands/PackageCommands/ShowDependencies.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import ArgumentParser
1515
import Basics
1616

17+
@_spi(SwiftPMInternal)
1718
import CoreCommands
1819

1920
import PackageGraph
@@ -74,7 +75,7 @@ extension SwiftPackageCommand {
7475
enum ShowDependenciesMode: String, RawRepresentable, CustomStringConvertible, ExpressibleByArgument {
7576
case text, dot, json, flatlist
7677

77-
package init?(rawValue: String) {
78+
public init?(rawValue: String) {
7879
switch rawValue.lowercased() {
7980
case "text":
8081
self = .text
@@ -89,7 +90,7 @@ extension SwiftPackageCommand {
8990
}
9091
}
9192

92-
package var description: String {
93+
public var description: String {
9394
switch self {
9495
case .text: return "text"
9596
case .dot: return "dot"

‎Sources/Commands/PackageCommands/SwiftPackageCommand.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import ArgumentParser
1414
import Basics
1515

16+
@_spi(SwiftPMInternal)
1617
import CoreCommands
1718

1819
import Foundation
@@ -27,8 +28,8 @@ import XCBuildSupport
2728
import enum TSCUtility.Diagnostics
2829

2930
/// swift-package tool namespace
30-
package struct SwiftPackageCommand: AsyncParsableCommand {
31-
package static var configuration = CommandConfiguration(
31+
public struct SwiftPackageCommand: AsyncParsableCommand {
32+
public static var configuration = CommandConfiguration(
3233
commandName: "package",
3334
_superCommandName: "swift",
3435
abstract: "Perform operations on Swift packages",
@@ -79,9 +80,9 @@ package struct SwiftPackageCommand: AsyncParsableCommand {
7980
@OptionGroup()
8081
var globalOptions: GlobalOptions
8182

82-
package static var _errorLabel: String { "error" }
83+
public static var _errorLabel: String { "error" }
8384

84-
package init() {}
85+
public init() {}
8586
}
8687

8788
extension SwiftPackageCommand {

0 commit comments

Comments
 (0)