Conditionalize use of .withoutEscapingSlashes
#2993
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was only cherry-picked into 5.3 recently: swiftlang/swift-corelibs-foundation#2889, so to get SwiftPM to build with the 5.3 released toolchain on non-Darwin platforms, we have to conditionalize it.
|
@swift-ci please smoke test |
| encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes] | ||
| #else // `.withoutEscapingSlashes` is not in 5.3 on non-Darwin platforms |
There was a problem hiding this comment.
Can we please move the comment // .withoutEscapingSlashes is not in 5.3 on non-Darwin platforms at the #if os(macOS) like for /PIFBuilder.swift ?
There was a problem hiding this comment.
There was a problem hiding this comment.
There doesn't seem to be a way to conditionalize on the patch component of the version, which means that this would still fail on older toolchains. Or should this PR not be taken once the Foundation fix is in the latest 5.3 toolchains?
federicobucchi
approved these changes
Oct 22, 2020
abertelrud
approved these changes
Nov 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was only cherry-picked into 5.3 recently: swiftlang/swift-corelibs-foundation#2889, so to get SwiftPM to build with the 5.3 released toolchain on non-Darwin platforms, we have to conditionalize it.