Skip to content
6 changes: 2 additions & 4 deletions Sources/SWBBuildService/Messages.swift
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@ private struct MacCatalystUnavailableFrameworkNamesHandler: MessageHandler {
}
}

// TODO: Delete once all clients are no longer calling the public APIs which invoke this message
private struct AppleSystemFrameworkNamesHandler: MessageHandler {
func handle(request: Request, message: AppleSystemFrameworkNamesRequest) async throws -> StringListResponse {
guard let buildService = request.service as? BuildService else {
throw StubError.error("service object is not of type BuildService")
}
return try await StringListResponse([])
return StringListResponse([])
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBCore/LibSwiftDriver/PlannedBuild.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private extension Path {
init(_ virtualPath: TypedVirtualPath) throws {
switch virtualPath.file {
case let .absolute(absPath): self = Path(absPath.pathString)
case .standardInput, .standardOutput, .fileList, .relative, .temporary, .temporaryWithKnownContents:
case .standardInput, .standardOutput, .fileList, .relative, .temporary, .temporaryWithKnownContents, .buildArtifactWithKnownContents:
fallthrough
@unknown default:
throw StubError.error("Cannot build Path from \(virtualPath); unimplemented path type.")
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBCore/LinkageDependencyResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ actor LinkageDependencyResolver {
return nil
}
let buildParameters = resolver.buildParametersByTarget[target] ?? configuredTarget.parameters
if await !resolver.isTargetSuitableForPlatformForIndex(target, parameters: buildParameters, imposedParameters: imposedParameters) {
if !resolver.isTargetSuitableForPlatformForIndex(target, parameters: buildParameters, imposedParameters: imposedParameters) {
return nil
}
let effectiveImposedParameters = imposedParameters?.effectiveParameters(target: configuredTarget, dependency: ConfiguredTarget(parameters: buildParameters, target: target), dependencyResolver: resolver)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ public class ClangCompilerSpec : CompilerSpec, SpecIdentifierType, GCCCompatible

// Start with the executable.
let compilerExecPath = resolveExecutablePath(cbc, forLanguageOfFileType: resolvedInputFileType)
let launcher = await resolveCompilerLauncher(cbc, compilerPath: compilerExecPath, delegate: delegate)
let launcher = resolveCompilerLauncher(cbc, compilerPath: compilerExecPath, delegate: delegate)
if let launcher {
commandLine += [launcher.str]
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SWBTestSupport/Timeout.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package struct TimeoutError: Error {
package var description: String?
}

package func withTimeout<T: Sendable>(
@discardableResult package func withTimeout<T: Sendable>(
timeout: Duration,
description: String? = nil,
block: sending () async throws -> T
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ fileprivate struct CustomTaskBuildOperationTests: CoreBasedTests {
try await withTemporaryDirectory { tmpDir in
let destination: RunDestinationInfo = .host
let core = try await getCore()
let toolchain = try #require(core.toolchainRegistry.defaultToolchain)
let environment = destination.hostRuntimeEnvironment(core)

let testProject = TestProject(
Expand Down
1 change: 0 additions & 1 deletion Tests/SWBCoreTests/DependencyScopingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ import Foundation
// Configure the targets and create a BuildRequest.
let buildParameters = BuildParameters(configuration: "Debug")
let t1 = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: try #require(workspace.target(named: "T1")))
let t2 = BuildRequest.BuildTargetInfo(parameters: buildParameters, target: try #require(workspace.target(named: "T2")))
do {
let buildRequest = BuildRequest(parameters: buildParameters, buildTargets: [t1], dependencyScope: .workspace, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: true, useDryRun: false)
let buildRequestContext = BuildRequestContext(workspaceContext: workspaceContext)
Expand Down
10 changes: 5 additions & 5 deletions Tests/SWBUtilPerfTests/MsgPackSerializationPerfTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
await measure {
for _ in 1...iterations
{
#expect(self.serializeScalarData() != nil)
#expect(!self.serializeScalarData().byteString.isEmpty)
}
}
}
Expand Down Expand Up @@ -91,7 +91,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {

await measure {
for _ in 1...iterations {
#expect(self.serializeStringData() != nil)
#expect(!self.serializeStringData().byteString.isEmpty)
}
}
}
Expand Down Expand Up @@ -133,7 +133,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
await measure {
for _ in 1...iterations
{
#expect(self.serializeArrayData() != nil)
#expect(!self.serializeArrayData().byteString.isEmpty)
}
}
}
Expand Down Expand Up @@ -171,7 +171,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {

await measure {
for _ in 1...iterations {
#expect(self.serializeDictionaryData() != nil)
#expect(!self.serializeDictionaryData().byteString.isEmpty)
}
}
}
Expand Down Expand Up @@ -220,7 +220,7 @@ fileprivate struct MsgPackSerializationPerfTests: PerfTests {
{
for _ in 1...iterations
{
#expect(self.serializeCustomElementData(elements) != nil)
#expect(!self.serializeCustomElementData(elements).byteString.isEmpty)
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions Tests/SWBUtilTests/FSProxyTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,6 @@ import SWBTestSupport
let fileAtts = try FileManager.default.attributesOfItem(atPath: filePath.str)
let fileMgrModDate = try #require(fileAtts[FileAttributeKey.modificationDate] as? Date)

// not working on Windows for some reason
let hostOS = try ProcessInfo.processInfo.hostOperatingSystem()
#expect(fsModDate == fileMgrModDate)
}
}
Expand Down