From 8fc990109687996d7df5fd02795d1ff199c3d600 Mon Sep 17 00:00:00 2001 From: Julian Date: Fri, 13 Mar 2026 11:16:44 -0700 Subject: [PATCH 1/3] Make PrivateObjectActor package-visible --- Sources/XCDocsBridge/PrivateObject.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/XCDocsBridge/PrivateObject.swift b/Sources/XCDocsBridge/PrivateObject.swift index 7bfa514..9be53d5 100644 --- a/Sources/XCDocsBridge/PrivateObject.swift +++ b/Sources/XCDocsBridge/PrivateObject.swift @@ -3,7 +3,7 @@ import Foundation enum DefaultKey: String { case key } @globalActor -actor PrivateObjectActor { static let shared = PrivateObjectActor() } +package actor PrivateObjectActor { package static let shared = PrivateObjectActor() } @PrivateObjectActor protocol PrivateObject { From 2bbdbfa94bb96ebc7f5dbf24123a9ef4c8ce0e90 Mon Sep 17 00:00:00 2001 From: Julian Date: Mon, 25 May 2026 19:59:55 -0700 Subject: [PATCH 2/3] Fix swift-subprocess traits --- Package.resolved | 20 +------------- Package.swift | 8 ------ Tests/TestSupport/ProcessRunner.swift | 39 ++++++++++++--------------- 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/Package.resolved b/Package.resolved index 39890c2..bba2786 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "75e3a859d62c73b3a3b25dc45facabaf1ed76a511027beff353ee934b49c9ccc", + "originHash" : "b2ad06c7e50cf7f32bab862a21fe74510f886098c910c496f137de0e8c1cb4da", "pins" : [ { "identity" : "swift-argument-parser", @@ -9,24 +9,6 @@ "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615", "version" : "1.7.0" } - }, - { - "identity" : "swift-subprocess", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swiftlang/swift-subprocess.git", - "state" : { - "revision" : "ba5888ad7758cbcbe7abebac37860b1652af2d9c", - "version" : "0.3.0" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system", - "state" : { - "revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df", - "version" : "1.6.4" - } } ], "version" : 3 diff --git a/Package.swift b/Package.swift index 7ac4444..e5f84b6 100644 --- a/Package.swift +++ b/Package.swift @@ -23,10 +23,6 @@ let package = Package( url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.0" ), - .package( - url: "https://github.com/swiftlang/swift-subprocess.git", - from: "0.3.0" - ), ], targets: [ .target( @@ -90,10 +86,6 @@ let package = Package( dependencies: [ "XCDocsBridge", "XCDocsSupport", - .product( - name: "Subprocess", - package: "swift-subprocess" - ), ], path: "Tests/TestSupport", swiftSettings: [ diff --git a/Tests/TestSupport/ProcessRunner.swift b/Tests/TestSupport/ProcessRunner.swift index 1706fcf..27be75d 100644 --- a/Tests/TestSupport/ProcessRunner.swift +++ b/Tests/TestSupport/ProcessRunner.swift @@ -1,22 +1,12 @@ import Foundation -import Subprocess - -#if canImport(System) -import System -#else -import SystemPackage -#endif package struct ProcessResult: Sendable { - package let terminationStatus: TerminationStatus + package let terminationStatus: Int32 package let stdout: String package let stderr: String package var exitStatus: Int32 { - switch terminationStatus { - case .exited(let code): return code - case .unhandledException(let code): return code - } + terminationStatus } package var combinedOutput: String { stdout + stderr } @@ -25,18 +15,23 @@ package struct ProcessResult: Sendable { package enum ProcessRunner { package static func runXCDocs(_ arguments: [String]) async throws -> ProcessResult { let executableURL = try xcdocsExecutableURL() - let result = try await run( - .path(FilePath(executableURL.path)), - arguments: Arguments(arguments), - workingDirectory: FilePath(packageRootURL.path), - output: .string(limit: 1 << 20), - error: .string(limit: 1 << 20) - ) + let process = Process() + process.executableURL = executableURL + process.arguments = arguments + process.currentDirectoryURL = packageRootURL + + let stdout = Pipe() + let stderr = Pipe() + process.standardOutput = stdout + process.standardError = stderr + + try process.run() + process.waitUntilExit() return ProcessResult( - terminationStatus: result.terminationStatus, - stdout: result.standardOutput ?? "", - stderr: result.standardError ?? "" + terminationStatus: process.terminationStatus, + stdout: String(data: stdout.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "", + stderr: String(data: stderr.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "" ) } From c988e42ef45a46db2dff6b8072671c070082e197 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 14 Oct 2026 17:13:51 -0700 Subject: [PATCH 3/3] format --- Tests/TestSupport/ProcessRunner.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Tests/TestSupport/ProcessRunner.swift b/Tests/TestSupport/ProcessRunner.swift index 27be75d..86ca1a3 100644 --- a/Tests/TestSupport/ProcessRunner.swift +++ b/Tests/TestSupport/ProcessRunner.swift @@ -5,9 +5,7 @@ package struct ProcessResult: Sendable { package let stdout: String package let stderr: String - package var exitStatus: Int32 { - terminationStatus - } + package var exitStatus: Int32 { terminationStatus } package var combinedOutput: String { stdout + stderr } }