Skip to content

Commit 70bc2e2

Browse files
replace reference to Swift 5.3 and 5.3.1 with Swift Next
Some places, such as test cases and comments, must have hard-coded version numbers. For them, some of the version numbers are changed from assuming 5.3.1 to assuming 5.4 as the Swift version where pull request #2937 lands. Many version numbers in the tests are prepended with "999" to make them work. 2 FIXME comments are added to the beginning of `ToolsVersionLoader.swift` and `ToolsVersionLoaderTests.swift` explaining what to look out for, and what has to be done, when replacing Swift Next with a concurrent version.
1 parent 6bee047 commit 70bc2e2

File tree

3 files changed

+184
-163
lines changed

3 files changed

+184
-163
lines changed

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
Note: This is in reverse chronological order, so newer entries are added to the top.
22

3-
4-
Swift 5.3.1
3+
Swift Next
54
-----------
65
* [#2937]
76

87
* Improvements
98

109
`Package` manifests can now have any combination of leading whitespace characters. This allows more flexibility in formatting the manifests.
1110

12-
[SR-13566] The Swift tools version specification in each manifest file now accepts any combination of _horizontal_ whitespace characters surrounding `swift-tools-version`, if and only if the specified version > 5.3. For example, `//swift-tools-version: 5.3.1` and `// swift-tools-version: 5.4` are valid.
11+
[SR-13566] The Swift tools version specification in each manifest file now accepts any combination of _horizontal_ whitespace characters surrounding `swift-tools-version`, if and only if the specified version `Next`. For example, `//swift-tools-version: Next` and `// swift-tools-version: Next` are valid.
1312

1413
All [Unicode line terminators](https://www.unicode.org/reports/tr14/) are now recognised in `Package` manifests. This ensures correctness in parsing manifests that are edited and/or built on many non-Unix-like platforms that use ASCII or Unicode encodings.
1514

0 commit comments

Comments
 (0)