Revert "Revert "Start using package for some APIs""

CMakeLists.txt

@@ -51,5 +51,8 @@ find_package(dispatch QUIET)
 find_package(Foundation QUIET)
 find_package(SQLite3 REQUIRED)
 
+# Enable `package` modifier for the whole package.
+add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
+
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)

Sources/Basics/CMakeLists.txt

@@ -70,6 +70,7 @@ target_link_libraries(Basics PUBLIC
 target_link_libraries(Basics PRIVATE
   SPMSQLite3
   TSCclibc)
+
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
 set_target_properties(Basics PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

Sources/Basics/OSSignpost.swift

@@ -22,7 +22,7 @@ extension os.OSLog {
 #endif
 
 /// Emits a signpost.
-@inlinable public func os_signpost(
+@inlinable package func os_signpost(
     _ type: SignpostType,
     name: StaticString,
     signpostID: SignpostID = .exclusive
@@ -39,8 +39,8 @@ extension os.OSLog {
     #endif
 }
 
-
-public enum SignpostType {
+@usableFromInline
+package enum SignpostType {
     case begin
     case end
     case event
@@ -61,7 +61,8 @@ public enum SignpostType {
     #endif
 }
 
-public enum SignpostID {
+@usableFromInline
+package enum SignpostID {
     case exclusive
 
     #if canImport(os)
@@ -77,7 +78,7 @@ public enum SignpostID {
 }
 
 
-public enum SignpostName {
+package enum SignpostName {
     public static let updatingDependencies: StaticString = "updating"
     public static let resolvingDependencies: StaticString = "resolving"
     public static let pubgrub: StaticString = "pubgrub"

Sources/SPMTestSupport/GitRepositoryExtensions.swift

@@ -18,7 +18,7 @@ import enum TSCUtility.Git
 
 /// Extensions useful for unit testing purposes.
 /// Note: These are not thread safe.
-public extension GitRepository {
+package extension GitRepository {
     /// Create the repository using git init.
     func create() throws {
         try systemQuietly([Git.tool, "-C", self.path.pathString, "init"])

Sources/SPMTestSupport/MockArchiver.swift

@@ -12,22 +12,22 @@
 
 import Basics
 
-public class MockArchiver: Archiver {
-    public typealias ExtractionHandler = (
+package class MockArchiver: Archiver {
+    package typealias ExtractionHandler = (
         MockArchiver,
         AbsolutePath,
         AbsolutePath,
         (Result<Void, Error>) -> Void
     ) throws -> Void
-    public typealias CompressionHandler = (
+    package typealias CompressionHandler = (
         MockArchiver,
         AbsolutePath,
         AbsolutePath,
         (Result<Void, Error>) -> Void
     ) throws -> Void
-    public typealias ValidationHandler = (MockArchiver, AbsolutePath, (Result<Bool, Error>) -> Void) throws -> Void
+    package typealias ValidationHandler = (MockArchiver, AbsolutePath, (Result<Bool, Error>) -> Void) throws -> Void
 
-    public struct Extraction: Equatable {
+    package struct Extraction: Equatable {
         public let archivePath: AbsolutePath
         public let destinationPath: AbsolutePath
 
@@ -37,7 +37,7 @@ public class MockArchiver: Archiver {
         }
     }
 
-    public struct Compression: Equatable {
+    package struct Compression: Equatable {
         public let directory: AbsolutePath
         public let destinationPath: AbsolutePath
 
@@ -47,18 +47,18 @@ public class MockArchiver: Archiver {
         }
     }
 
-    public let supportedExtensions: Set<String> = ["zip"]
-    public let extractions = ThreadSafeArrayStore<Extraction>()
-    public let compressions = ThreadSafeArrayStore<Compression>()
-    public let extractionHandler: ExtractionHandler?
-    public let compressionHandler: CompressionHandler?
-    public let validationHandler: ValidationHandler?
+    package let supportedExtensions: Set<String> = ["zip"]
+    package let extractions = ThreadSafeArrayStore<Extraction>()
+    package let compressions = ThreadSafeArrayStore<Compression>()
+    package let extractionHandler: ExtractionHandler?
+    package let compressionHandler: CompressionHandler?
+    package let validationHandler: ValidationHandler?
 
-    public convenience init(handler: ExtractionHandler? = .none) {
+    package convenience init(handler: ExtractionHandler? = .none) {
         self.init(extractionHandler: handler, compressionHandler: .none, validationHandler: .none)
     }
 
-    public init(
+    package init(
         extractionHandler: ExtractionHandler? = .none,
         compressionHandler: CompressionHandler? = .none,
         validationHandler: ValidationHandler? = .none
@@ -68,7 +68,7 @@ public class MockArchiver: Archiver {
         self.validationHandler = validationHandler
     }
 
-    public func extract(
+    package func extract(
         from archivePath: AbsolutePath,
         to destinationPath: AbsolutePath,
         completion: @escaping (Result<Void, Error>) -> Void
@@ -85,7 +85,7 @@ public class MockArchiver: Archiver {
         }
     }
 
-    public func compress(
+    package func compress(
         directory: AbsolutePath,
         to destinationPath: AbsolutePath,
         completion: @escaping (Result<Void, Error>) -> Void
@@ -102,7 +102,7 @@ public class MockArchiver: Archiver {
         }
     }
 
-    public func validate(path: AbsolutePath, completion: @escaping (Result<Bool, Error>) -> Void) {
+    package func validate(path: AbsolutePath, completion: @escaping (Result<Bool, Error>) -> Void) {
         do {
             if let handler = self.validationHandler {
                 try handler(self, path, completion)