Skip to content

Commit 9c15831

Browse files
authored
Merge pull request #254 from allevato/swift-5.4-updates
Update to support Swift 5.4.
2 parents fc3fab6 + 9921a4a commit 9c15831

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ let package = Package(
139139
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
140140
// Building standalone.
141141
package.dependencies += [
142-
.package(url: "https://github.com/apple/swift-syntax", .branch("main")),
143-
.package(url: "https://github.com/apple/swift-argument-parser.git", .branch("main")),
142+
.package(url: "https://github.com/apple/swift-syntax", .upToNextMinor(from: "0.50400.0")),
143+
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "0.4.3")),
144144
]
145145
} else {
146146
package.dependencies += [

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ is also expressed in the `SwiftSyntax` dependency in
2626
| Xcode Release | Swift Version | `swift-format` Branch |
2727
|:-------------:|:---------------------------------------:|:----------------------|
2828
|| Swift at `main` | `main` |
29+
| Xcode 12.5 | Swift 5.4 | `swift-5.4-branch` |
2930
| Xcode 12.0 | Swift 5.3 | `swift-5.3-branch` |
3031
| Xcode 11.4 | Swift 5.2 | `swift-5.2-branch` |
3132
| Xcode 11.0 | Swift 5.1 | `swift-5.1-branch` |
3233

33-
For example, if you are using Xcode 12.0 (Swift 5.3), you can check out and
34+
For example, if you are using Xcode 12.5 (Swift 5.4), you can check out and
3435
build `swift-format` using the following commands:
3536

3637
```
37-
git clone -b swift-5.3-branch https://github.com/apple/swift-format.git
38+
git clone -b swift-5.4-branch https://github.com/apple/swift-format.git
3839
cd swift-format
3940
swift build
4041
```

Sources/swift-format/VersionOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct VersionOptions: ParsableArguments {
2020
func validate() throws {
2121
if version {
2222
// TODO: Automate updates to this somehow.
23-
print("0.50200.1")
23+
print("0.50400.0")
2424
throw ExitCode.success
2525
}
2626
}

0 commit comments

Comments
 (0)