Skip to content

Commit 336cad2

Browse files
add missing parameter in Error.backwardIncompatiblePre5_3_1(.unidentified, specifiedVersion: version) and change the error message to suggest the specified version instead of the current version
1 parent 98dcd5f commit 336cad2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Sources/PackageLoading/ToolsVersionLoader.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public class ToolsVersionLoader: ToolsVersionLoaderProtocol {
218218
case .spacingAfterLabel(let spacing):
219219
return "horizontal whitespace sequence \(unicodeCodePointsPrefixedByUPlus(of: spacing)) immediately preceding the version specifier is supported by only Swift > 5.3; consider removing the sequence for Swift \(specifiedVersion)"
220220
case .unidentified:
221-
return "the manifest is backward-incompatible with Swift ≤ 5.3, but the package manager is unable to pinpoint the exact incompatibility; consider replacing the current Swift tools version specification with '// swift-tools-version:\(ToolsVersion.currentToolsVersion)' to specify the current Swift toolchain version as the lowest Swift version supported by the project, then move the new specification to the very beginning of this manifest file; additionally, please consider filing a bug report on https://bugs.swift.org with this file attached"
221+
return "the manifest is backward-incompatible with Swift ≤ 5.3, but the package manager is unable to pinpoint the exact incompatibility; consider replacing the current Swift tools version specification with '// swift-tools-version:\(specifiedVersion)' to specify Swift \(specifiedVersion) as the lowest Swift version supported by the project, then move the new specification to the very beginning of this manifest file; additionally, please consider filing a bug report on https://bugs.swift.org with this file attached"
222222
}
223223
}
224224

@@ -420,7 +420,7 @@ public class ToolsVersionLoader: ToolsVersionLoaderProtocol {
420420

421421
// The above If-statements should have covered all possible backward incompatibilities with Swift ≤ 5.3.
422422
// If you changed the logic in this file, and this fatal error is triggered, then you need to re-check the logic, and make sure all possible error conditions are covered in the Else-block.
423-
throw Error.backwardIncompatiblePre5_3_1(.unidentified)
423+
throw Error.backwardIncompatiblePre5_3_1(.unidentified, specifiedVersion: version)
424424
}
425425

426426
return version

0 commit comments

Comments
 (0)