Skip to content

SwiftSDKBundle.swift: update strings to use "Swift SDK" naming #6579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2023
Merged

SwiftSDKBundle.swift: update strings to use "Swift SDK" naming #6579

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b218b1
SwiftSDKBundle.swift: update strings to use "Swift SDK" naming
MaxDesiatov May 18, 2023
bb46ed6
Update SwiftSDKBundle.swift
MaxDesiatov May 18, 2023
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
18 changes: 9 additions & 9 deletions Sources/PackageModel/SwiftSDKBundle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ public struct SwiftSDKBundle {
guard let destinationsDirectory else {
throw StringError(
"""
No cross-compilation destinations directory found, specify one
with `experimental-destinations-path` option.
No directory found for installed Swift SDKs, specify one
with `--experimental-swift-sdks-path` option.
"""
)
}
Expand All @@ -99,7 +99,7 @@ public struct SwiftSDKBundle {

guard !validBundles.isEmpty else {
throw StringError(
"No valid cross-compilation destination bundles found at \(destinationsDirectory)."
"No valid Swift SDK bundles found at \(destinationsDirectory)."
)
}

Expand All @@ -110,8 +110,8 @@ public struct SwiftSDKBundle {
) else {
throw StringError(
"""
No cross-compilation destination found matching query `\(selector)` and host triple
`\(hostTriple.tripleString)`. Use `swift package experimental-destination list` command to see
No Swift SDK found matching query `\(selector)` and host triple
`\(hostTriple.tripleString)`. Use `swift experimental-sdk list` command to see
available destinations.
"""
)
Expand Down Expand Up @@ -167,7 +167,7 @@ public struct SwiftSDKBundle {

bundlePath = downloadedBundlePath

print("Destination artifact bundle successfully downloaded from `\(bundleURL)`.")
print("Swift SDK bundle successfully downloaded from `\(bundleURL)`.")
} else if
let cwd: AbsolutePath = fileSystem.currentWorkingDirectory,
let originalBundlePath = try? AbsolutePath(validating: bundlePathOrURL, relativeTo: cwd)
Expand All @@ -187,7 +187,7 @@ public struct SwiftSDKBundle {
)
}

print("Destination artifact bundle at `\(bundlePathOrURL)` successfully installed.")
print("Swift SDK bundle at `\(bundlePathOrURL)` successfully installed.")
}

/// Unpacks a destination bundle if it has an archive extension in its filename.
Expand Down Expand Up @@ -458,7 +458,7 @@ extension [SwiftSDKBundle] {
observabilityScope.emit(
warning:
"""
multiple destinations match target triple `\(selector)` and host triple \(
multiple Swift SDKs match target triple `\(selector)` and host triple \(
hostTriple.tripleString
), selected one at \(
matchedByTriple.path.appending(matchedByTriple.variant.metadata.path)
Expand All @@ -478,7 +478,7 @@ extension [SwiftSDKBundle] {
observabilityScope.emit(
warning:
"""
multiple destinations match the query `\(selector)` and host triple \(
multiple Swift SDKs match the query `\(selector)` and host triple \(
hostTriple.tripleString
), selected one at \(matchedByID.path.appending(matchedByID.variant.metadata.path))
"""
Expand Down