diff --git a/Sources/Basics/Archiver/TarArchiver.swift b/Sources/Basics/Archiver/TarArchiver.swift index 2d1c7fce5b2..17ed3576ef2 100644 --- a/Sources/Basics/Archiver/TarArchiver.swift +++ b/Sources/Basics/Archiver/TarArchiver.swift @@ -25,7 +25,7 @@ public struct TarArchiver: Archiver { private let cancellator: Cancellator /// The underlying command - internal let tarCommand: String + package let tarCommand: String /// Creates a `TarArchiver`. /// diff --git a/Sources/Basics/Archiver/ZipArchiver.swift b/Sources/Basics/Archiver/ZipArchiver.swift index d4f4f1bb7d2..7d79020e9f0 100644 --- a/Sources/Basics/Archiver/ZipArchiver.swift +++ b/Sources/Basics/Archiver/ZipArchiver.swift @@ -29,10 +29,10 @@ public struct ZipArchiver: Archiver, Cancellable { /// Absolute path to the Windows tar in the system folder #if os(Windows) - internal let windowsTar: String + package let windowsTar: String #else - internal let unzip = "unzip" - internal let zip = "zip" + package let unzip = "unzip" + package let zip = "zip" #endif #if os(FreeBSD) diff --git a/Sources/Basics/AuthorizationProvider.swift b/Sources/Basics/AuthorizationProvider.swift index 85e7b1a7c51..fd93951b3b0 100644 --- a/Sources/Basics/AuthorizationProvider.swift +++ b/Sources/Basics/AuthorizationProvider.swift @@ -55,7 +55,7 @@ extension AuthorizationProvider { public final class NetrcAuthorizationProvider: AuthorizationProvider, AuthorizationWriter { // marked internal for testing - internal let path: AbsolutePath + package let path: AbsolutePath private let fileSystem: FileSystem private let cache = ThreadSafeKeyValueStore() @@ -140,7 +140,7 @@ public final class NetrcAuthorizationProvider: AuthorizationProvider, Authorizat } // marked internal for testing - internal var machines: [Basics.Netrc.Machine] { + package var machines: [Basics.Netrc.Machine] { // this ignores any errors reading the file // initial validation is done at the time of initializing the provider // and if the file becomes corrupt at runtime it will handle it gracefully @@ -408,16 +408,16 @@ public final class KeychainAuthorizationProvider: AuthorizationProvider, Authori return item } - struct ProtocolHostPort: Hashable, CustomStringConvertible { - let `protocol`: String? - let host: String - let port: Int? + package struct ProtocolHostPort: Hashable, CustomStringConvertible { + package let `protocol`: String? + package let host: String + package let port: Int? var server: String { self.host } - var protocolCFString: CFString { + package var protocolCFString: CFString { // See // https://developer.apple.com/documentation/security/keychain_services/keychain_items/item_attribute_keys_and_values?language=swift // for a list of possible values for the `kSecAttrProtocol` attribute. @@ -431,7 +431,7 @@ public final class KeychainAuthorizationProvider: AuthorizationProvider, Authori } } - init?(from url: URL) { + package init?(from url: URL) { guard let host = url.host?.lowercased(), !host.isEmpty else { return nil } @@ -441,7 +441,7 @@ public final class KeychainAuthorizationProvider: AuthorizationProvider, Authori self.port = url.port } - var description: String { + package var description: String { "\(self.protocol.map { "\($0)://" } ?? "")\(self.host)\(self.port.map { ":\($0)" } ?? "")" } } @@ -452,7 +452,7 @@ public final class KeychainAuthorizationProvider: AuthorizationProvider, Authori public struct CompositeAuthorizationProvider: AuthorizationProvider { // marked internal for testing - internal let providers: [AuthorizationProvider] + package let providers: [AuthorizationProvider] private let observabilityScope: ObservabilityScope public init(_ providers: AuthorizationProvider..., observabilityScope: ObservabilityScope) { diff --git a/Sources/Basics/Cancellator.swift b/Sources/Basics/Cancellator.swift index 9cb30617d57..344a123e8b6 100644 --- a/Sources/Basics/Cancellator.swift +++ b/Sources/Basics/Cancellator.swift @@ -144,7 +144,7 @@ public final class Cancellator: Cancellable, Sendable { // marked internal for testing @discardableResult - internal func _cancel(deadline: DispatchTime? = .none) -> Int { + package func _cancel(deadline: DispatchTime? = .none) -> Int { self.cancelling.put(true) self.observabilityScope? diff --git a/Sources/Basics/Concurrency/SendableBox.swift b/Sources/Basics/Concurrency/SendableBox.swift index a5ec3673be0..be81f9fc59b 100644 --- a/Sources/Basics/Concurrency/SendableBox.swift +++ b/Sources/Basics/Concurrency/SendableBox.swift @@ -28,17 +28,17 @@ public actor SendableBox { } extension SendableBox where Value == Int { - func increment() { + package func increment() { self.value = value + 1 } - func decrement() { + package func decrement() { self.value = value - 1 } } extension SendableBox where Value == Date { - func resetDate() { + package func resetDate() { value = Date() } } diff --git a/Sources/Basics/Graph/AdjacencyMatrix.swift b/Sources/Basics/Graph/AdjacencyMatrix.swift index 9326d499a7c..6e58ba26230 100644 --- a/Sources/Basics/Graph/AdjacencyMatrix.swift +++ b/Sources/Basics/Graph/AdjacencyMatrix.swift @@ -18,7 +18,7 @@ /// edge exists. /// /// See https://en.wikipedia.org/wiki/Adjacency_matrix for more details. -struct AdjacencyMatrix { +package struct AdjacencyMatrix { let columns: Int let rows: Int private var bytes: [UInt8] @@ -27,7 +27,7 @@ struct AdjacencyMatrix { /// - Parameters: /// - rows: Number of rows in the matrix. /// - columns: Number of columns in the matrix. - init(rows: Int, columns: Int) { + package init(rows: Int, columns: Int) { self.columns = columns self.rows = rows @@ -35,7 +35,7 @@ struct AdjacencyMatrix { self.bytes = .init(repeating: 0, count: quotient + (remainder > 0 ? 1 : 0)) } - var bitCount: Int { + package var bitCount: Int { bytes.count * 8 } @@ -44,7 +44,7 @@ struct AdjacencyMatrix { return (byteOffset: totalBitOffset / 8, bitOffsetInByte: totalBitOffset % 8) } - subscript(row: Int, column: Int) -> Bool { + package subscript(row: Int, column: Int) -> Bool { get { let (byteOffset, bitOffsetInByte) = calculateOffsets(row: row, column: column) diff --git a/Sources/Basics/HTTPClient/HTTPClientHeaders.swift b/Sources/Basics/HTTPClient/HTTPClientHeaders.swift index 1d090f18da3..e1e5ed70ae5 100644 --- a/Sources/Basics/HTTPClient/HTTPClientHeaders.swift +++ b/Sources/Basics/HTTPClient/HTTPClientHeaders.swift @@ -64,8 +64,8 @@ public struct HTTPClientHeaders: Sendable { } public struct Item: Equatable, Sendable { - let name: String - let value: String + package let name: String + package let value: String public init(name: String, value: String) { self.name = name diff --git a/Sources/Basics/HTTPClient/HTTPMethod.swift b/Sources/Basics/HTTPClient/HTTPMethod.swift index ea0b80e8c49..1fcac247845 100644 --- a/Sources/Basics/HTTPClient/HTTPMethod.swift +++ b/Sources/Basics/HTTPClient/HTTPMethod.swift @@ -17,7 +17,7 @@ public enum HTTPMethod: Sendable { case put case delete - var string: String { + package var string: String { switch self { case .head: return "HEAD" diff --git a/Sources/Basics/HTTPClient/URLSessionHTTPClient.swift b/Sources/Basics/HTTPClient/URLSessionHTTPClient.swift index 7c27608749d..33f60163101 100644 --- a/Sources/Basics/HTTPClient/URLSessionHTTPClient.swift +++ b/Sources/Basics/HTTPClient/URLSessionHTTPClient.swift @@ -18,13 +18,13 @@ import struct TSCUtility.Versioning import FoundationNetworking #endif -final class URLSessionHTTPClient: Sendable { +package final class URLSessionHTTPClient: Sendable { private let dataSession: URLSession private let downloadSession: URLSession private let dataTaskManager: DataTaskManager private let downloadTaskManager: DownloadTaskManager - init(configuration: URLSessionConfiguration = .default) { + package init(configuration: URLSessionConfiguration = .default) { let dataDelegateQueue = OperationQueue() dataDelegateQueue.name = "org.swift.swiftpm.urlsession-http-client-data-delegate" dataDelegateQueue.maxConcurrentOperationCount = 1 @@ -52,7 +52,7 @@ final class URLSessionHTTPClient: Sendable { } @Sendable - func execute( + package func execute( _ request: HTTPClient.Request, progress: HTTPClient.ProgressHandler? = nil ) async throws -> LegacyHTTPClient.Response { @@ -364,7 +364,7 @@ private final class DownloadTaskManager: NSObject, URLSessionDownloadDelegate { } extension URLRequest { - init(_ request: LegacyHTTPClient.Request) { + package init(_ request: LegacyHTTPClient.Request) { self.init(url: request.url) self.httpMethod = request.method.string request.headers.forEach { header in diff --git a/Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift b/Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift index b5b3597f15c..bdc45deaadf 100644 --- a/Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift +++ b/Sources/Basics/ProgressAnimation/ThrottledProgressAnimation.swift @@ -14,12 +14,12 @@ import _Concurrency import TSCUtility /// A progress animation wrapper that throttles updates to a given interval. -final class ThrottledProgressAnimation: ProgressAnimationProtocol { +package final class ThrottledProgressAnimation: ProgressAnimationProtocol { private let animation: ProgressAnimationProtocol private let shouldUpdate: () -> Bool private var pendingUpdate: (Int, Int, String)? - init( + package init( _ animation: ProgressAnimationProtocol, now: @escaping () -> C.Instant, interval: C.Duration, clock: C.Type = C.self ) { @@ -36,7 +36,7 @@ final class ThrottledProgressAnimation: ProgressAnimationProtocol { } } - func update(step: Int, total: Int, text: String) { + package func update(step: Int, total: Int, text: String) { guard shouldUpdate() else { pendingUpdate = (step, total, text) return @@ -45,14 +45,14 @@ final class ThrottledProgressAnimation: ProgressAnimationProtocol { animation.update(step: step, total: total, text: text) } - func complete(success: Bool) { + package func complete(success: Bool) { if let (step, total, text) = pendingUpdate { animation.update(step: step, total: total, text: text) } animation.complete(success: success) } - func clear() { + package func clear() { animation.clear() } } diff --git a/Sources/Basics/Serialization/SerializedJSON.swift b/Sources/Basics/Serialization/SerializedJSON.swift index a3e09ab16f1..f0b5f29ac43 100644 --- a/Sources/Basics/Serialization/SerializedJSON.swift +++ b/Sources/Basics/Serialization/SerializedJSON.swift @@ -13,7 +13,7 @@ /// Wrapper type representing serialized escaped JSON strings providing helpers /// for escaped string interpolations for common types such as `AbsolutePath`. public struct SerializedJSON { - let underlying: String + package let underlying: String } extension SerializedJSON: ExpressibleByStringLiteral { diff --git a/Tests/BasicsTests/Archiver/TarArchiverTests.swift b/Tests/BasicsTests/Archiver/TarArchiverTests.swift index ba80f19d43a..2aa74e45d69 100644 --- a/Tests/BasicsTests/Archiver/TarArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/TarArchiverTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Basics -@testable import struct Basics.TarArchiver +import struct Basics.TarArchiver import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift index 11b6bdab7dc..1217f30b0cb 100644 --- a/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/UniversalArchiverTests.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import Basics -@testable import struct Basics.TarArchiver -@testable import struct Basics.ZipArchiver +import struct Basics.TarArchiver +import struct Basics.ZipArchiver import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift index 83d4df368b5..56d233ec336 100644 --- a/Tests/BasicsTests/Archiver/ZipArchiverTests.swift +++ b/Tests/BasicsTests/Archiver/ZipArchiverTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Basics -@testable import struct Basics.ZipArchiver +import struct Basics.ZipArchiver import _InternalTestSupport import XCTest import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported diff --git a/Tests/BasicsTests/AuthorizationProviderTests.swift b/Tests/BasicsTests/AuthorizationProviderTests.swift index e99ad835a14..6edad76ccb8 100644 --- a/Tests/BasicsTests/AuthorizationProviderTests.swift +++ b/Tests/BasicsTests/AuthorizationProviderTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/CancellatorTests.swift b/Tests/BasicsTests/CancellatorTests.swift index e67030b0561..5b1b1b47bd3 100644 --- a/Tests/BasicsTests/CancellatorTests.swift +++ b/Tests/BasicsTests/CancellatorTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/ConcurrencyHelpersTests.swift b/Tests/BasicsTests/ConcurrencyHelpersTests.swift index ef7ecda22dd..54e051b8252 100644 --- a/Tests/BasicsTests/ConcurrencyHelpersTests.swift +++ b/Tests/BasicsTests/ConcurrencyHelpersTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import TSCTestSupport import Testing diff --git a/Tests/BasicsTests/DictionaryTest.swift b/Tests/BasicsTests/DictionaryTest.swift index 70f00db7d18..9e08f39a24f 100644 --- a/Tests/BasicsTests/DictionaryTest.swift +++ b/Tests/BasicsTests/DictionaryTest.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import Testing struct DictionaryTests { diff --git a/Tests/BasicsTests/Environment/EnvironmentKeyTests.swift b/Tests/BasicsTests/Environment/EnvironmentKeyTests.swift index 7c616de30bb..d82517800ec 100644 --- a/Tests/BasicsTests/Environment/EnvironmentKeyTests.swift +++ b/Tests/BasicsTests/Environment/EnvironmentKeyTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import Testing struct EnvironmentKeyTests { diff --git a/Tests/BasicsTests/Environment/EnvironmentTests.swift b/Tests/BasicsTests/Environment/EnvironmentTests.swift index b7011b2dd14..d6d7c73aec5 100644 --- a/Tests/BasicsTests/Environment/EnvironmentTests.swift +++ b/Tests/BasicsTests/Environment/EnvironmentTests.swift @@ -12,7 +12,6 @@ import Foundation @_spi(SwiftPMInternal) -@testable import Basics import Testing diff --git a/Tests/BasicsTests/FileSystem/FileSystemTests.swift b/Tests/BasicsTests/FileSystem/FileSystemTests.swift index 270fcc968f8..17b4df2bc21 100644 --- a/Tests/BasicsTests/FileSystem/FileSystemTests.swift +++ b/Tests/BasicsTests/FileSystem/FileSystemTests.swift @@ -13,7 +13,7 @@ import Foundation import TSCTestSupport import Testing -@testable import Basics +import Basics struct FileSystemTests { @Test diff --git a/Tests/BasicsTests/Graph/AdjacencyMatrixTests.swift b/Tests/BasicsTests/Graph/AdjacencyMatrixTests.swift index 25a440120dc..d32e4d720e7 100644 --- a/Tests/BasicsTests/Graph/AdjacencyMatrixTests.swift +++ b/Tests/BasicsTests/Graph/AdjacencyMatrixTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import Testing struct AdjacencyMatrixTests { diff --git a/Tests/BasicsTests/HTTPClientTests.swift b/Tests/BasicsTests/HTTPClientTests.swift index 6ea4442b3db..32513ea46e9 100644 --- a/Tests/BasicsTests/HTTPClientTests.swift +++ b/Tests/BasicsTests/HTTPClientTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import _Concurrency import _InternalTestSupport import Testing diff --git a/Tests/BasicsTests/LegacyHTTPClientTests.swift b/Tests/BasicsTests/LegacyHTTPClientTests.swift index b074c6ec9c8..243e9cebee8 100644 --- a/Tests/BasicsTests/LegacyHTTPClientTests.swift +++ b/Tests/BasicsTests/LegacyHTTPClientTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/ObservabilitySystemTests.swift b/Tests/BasicsTests/ObservabilitySystemTests.swift index c7ae9a1b582..d4156de1bce 100644 --- a/Tests/BasicsTests/ObservabilitySystemTests.swift +++ b/Tests/BasicsTests/ObservabilitySystemTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import _InternalTestSupport import Testing diff --git a/Tests/BasicsTests/ProgressAnimationTests.swift b/Tests/BasicsTests/ProgressAnimationTests.swift index f3da82245ce..44458a3e05b 100644 --- a/Tests/BasicsTests/ProgressAnimationTests.swift +++ b/Tests/BasicsTests/ProgressAnimationTests.swift @@ -14,7 +14,6 @@ import _Concurrency import Testing @_spi(SwiftPMInternal) -@testable import Basics import TSCBasic diff --git a/Tests/BasicsTests/SQLiteBackedCacheTests.swift b/Tests/BasicsTests/SQLiteBackedCacheTests.swift index 40e279ba110..b84cc659b93 100644 --- a/Tests/BasicsTests/SQLiteBackedCacheTests.swift +++ b/Tests/BasicsTests/SQLiteBackedCacheTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import _InternalTestSupport import tsan_utils import Testing diff --git a/Tests/BasicsTests/SandboxTests.swift b/Tests/BasicsTests/SandboxTests.swift index 6bc6529114e..f7c23514659 100644 --- a/Tests/BasicsTests/SandboxTests.swift +++ b/Tests/BasicsTests/SandboxTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import _InternalTestSupport import XCTest diff --git a/Tests/BasicsTests/Serialization/SerializedJSONTests.swift b/Tests/BasicsTests/Serialization/SerializedJSONTests.swift index 858abce2cad..b6cd3f5e292 100644 --- a/Tests/BasicsTests/Serialization/SerializedJSONTests.swift +++ b/Tests/BasicsTests/Serialization/SerializedJSONTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import XCTest import _InternalTestSupport // for XCTSkipOnWindows diff --git a/Tests/BasicsTests/URLSessionHTTPClientTests.swift b/Tests/BasicsTests/URLSessionHTTPClientTests.swift index 6115952a569..43df0e6f10d 100644 --- a/Tests/BasicsTests/URLSessionHTTPClientTests.swift +++ b/Tests/BasicsTests/URLSessionHTTPClientTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import Foundation #if canImport(FoundationNetworking) // TODO: this brings OpenSSL dependency` on Linux diff --git a/Tests/BuildTests/BuildPlanTests.swift b/Tests/BuildTests/BuildPlanTests.swift index 0d8a2281dd4..3717bf9b3b0 100644 --- a/Tests/BuildTests/BuildPlanTests.swift +++ b/Tests/BuildTests/BuildPlanTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics @testable import Build @testable diff --git a/Tests/CommandsTests/SwiftCommandStateTests.swift b/Tests/CommandsTests/SwiftCommandStateTests.swift index 5ee582d18bf..ca48ae0b3ec 100644 --- a/Tests/CommandsTests/SwiftCommandStateTests.swift +++ b/Tests/CommandsTests/SwiftCommandStateTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics @testable import Build @testable import Commands @testable import CoreCommands diff --git a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift index b6f46beab36..fe319931677 100644 --- a/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift +++ b/Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics @testable import PackageLoading import PackageModel import _InternalTestSupport diff --git a/Tests/PackageModelTests/SwiftSDKTests.swift b/Tests/PackageModelTests/SwiftSDKTests.swift index 7f7a5dd9650..0f7a88b1357 100644 --- a/Tests/PackageModelTests/SwiftSDKTests.swift +++ b/Tests/PackageModelTests/SwiftSDKTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics @_spi(SwiftPMInternal) @testable import PackageModel diff --git a/Tests/PackageModelTests/ToolsetTests.swift b/Tests/PackageModelTests/ToolsetTests.swift index d0568e4127a..ab166047ea0 100644 --- a/Tests/PackageModelTests/ToolsetTests.swift +++ b/Tests/PackageModelTests/ToolsetTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics @testable import PackageModel import _InternalTestSupport import XCTest diff --git a/Tests/SourceControlTests/RepositoryManagerTests.swift b/Tests/SourceControlTests/RepositoryManagerTests.swift index 49efc60904b..dbdf756c995 100644 --- a/Tests/SourceControlTests/RepositoryManagerTests.swift +++ b/Tests/SourceControlTests/RepositoryManagerTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -@testable import Basics +import Basics import _Concurrency import PackageModel import _InternalTestSupport diff --git a/Tests/WorkspaceTests/AuthorizationProviderTests.swift b/Tests/WorkspaceTests/AuthorizationProviderTests.swift index a49d0e44705..3953654cda3 100644 --- a/Tests/WorkspaceTests/AuthorizationProviderTests.swift +++ b/Tests/WorkspaceTests/AuthorizationProviderTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -@testable import Basics +import Basics import _InternalTestSupport import Workspace import Testing