Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -90,10 +86,6 @@ let package = Package(
dependencies: [
"XCDocsBridge",
"XCDocsSupport",
.product(
name: "Subprocess",
package: "swift-subprocess"
),
],
path: "Tests/TestSupport",
swiftSettings: [
Expand Down
2 changes: 1 addition & 1 deletion Sources/XCDocsBridge/PrivateObject.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
41 changes: 17 additions & 24 deletions Tests/TestSupport/ProcessRunner.swift
Original file line number Diff line number Diff line change
@@ -1,42 +1,35 @@
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
}
}
package var exitStatus: Int32 { terminationStatus }

package var combinedOutput: String { stdout + stderr }
}

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) ?? ""
)
}

Expand Down
Loading