Skip to content

Commit 9fc4710

Browse files
segaborktoso
andauthored
Adapt codebase for Swift 5.6 release version (#876)
* Fix SwiftSyntax dep in Package descriptor * Fix SwiftSyntax import * Fix tests by making Actorable class final * Workaround SwiftSyntax parser dependency * Update Package.swift Co-authored-by: Konrad `ktoso` Malawski <konrad.malawski@project13.pl>
1 parent b2c7df1 commit 9fc4710

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

Package.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ var globalConcurrencyFlags: [String] = []
1818
// ])
1919
// #endif
2020

21+
#if swift(>=5.6)
22+
let swiftSyntaxDependencyName = "SwiftSyntaxParser"
23+
#else
24+
let swiftSyntaxDependencyName = "SwiftSyntax"
25+
#endif
26+
2127
if ProcessInfo.processInfo.environment["SACT_WARNINGS_AS_ERRORS"] != nil {
2228
print("SACT_WARNINGS_AS_ERRORS enabled, passing `-warnings-as-errors`")
2329
var allUnsafeFlags = globalConcurrencyFlags
@@ -68,7 +74,7 @@ var targets: [PackageDescription.Target] = [
6874
name: "GenActorsLib",
6975
dependencies: [
7076
"DistributedActors",
71-
.product(name: "SwiftSyntax", package: "SwiftSyntax"),
77+
.product(name: swiftSyntaxDependencyName, package: "SwiftSyntax"),
7278
.product(name: "Logging", package: "swift-log"),
7379
.product(name: "ArgumentParser", package: "swift-argument-parser"),
7480

@@ -307,7 +313,7 @@ dependencies.append(
307313
)
308314
#elseif swift(>=5.6)
309315
dependencies.append(
310-
.package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50600.0"))
316+
.package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50600.1"))
311317
)
312318
#elseif swift(>=5.5)
313319
dependencies.append(

Sources/GenActorsLib/GenerateActors.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ import DistributedActors
1717
import Files
1818
import Foundation
1919
import Logging
20+
#if swift(>=5.6)
21+
import SwiftSyntaxParser
22+
#else
2023
import SwiftSyntax
24+
#endif
2125

2226
final class GenerateActors {
2327
var log: Logger

Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import DistributedActors
1616

17-
class ClassActorable: Actorable {
17+
final class ClassActorable: Actorable {
1818
// @actor
1919
func hello() -> String {
2020
"Hello."

0 commit comments

Comments
 (0)