diff --git a/Package.swift b/Package.swift index 958cc70a7..3df9615a6 100644 --- a/Package.swift +++ b/Package.swift @@ -18,6 +18,12 @@ var globalConcurrencyFlags: [String] = [] // ]) // #endif +#if swift(>=5.6) +let swiftSyntaxDependencyName = "SwiftSyntaxParser" +#else +let swiftSyntaxDependencyName = "SwiftSyntax" +#endif + if ProcessInfo.processInfo.environment["SACT_WARNINGS_AS_ERRORS"] != nil { print("SACT_WARNINGS_AS_ERRORS enabled, passing `-warnings-as-errors`") var allUnsafeFlags = globalConcurrencyFlags @@ -68,7 +74,7 @@ var targets: [PackageDescription.Target] = [ name: "GenActorsLib", dependencies: [ "DistributedActors", - .product(name: "SwiftSyntax", package: "SwiftSyntax"), + .product(name: swiftSyntaxDependencyName, package: "SwiftSyntax"), .product(name: "Logging", package: "swift-log"), .product(name: "ArgumentParser", package: "swift-argument-parser"), @@ -307,7 +313,7 @@ dependencies.append( ) #elseif swift(>=5.6) dependencies.append( - .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50600.0")) + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact("0.50600.1")) ) #elseif swift(>=5.5) dependencies.append( diff --git a/Sources/GenActorsLib/GenerateActors.swift b/Sources/GenActorsLib/GenerateActors.swift index 723f749d3..f50c9a779 100644 --- a/Sources/GenActorsLib/GenerateActors.swift +++ b/Sources/GenActorsLib/GenerateActors.swift @@ -17,7 +17,11 @@ import DistributedActors import Files import Foundation import Logging +#if swift(>=5.6) +import SwiftSyntaxParser +#else import SwiftSyntax +#endif final class GenerateActors { var log: Logger diff --git a/Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift b/Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift index c636329f3..941935a4c 100644 --- a/Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift +++ b/Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift @@ -14,7 +14,7 @@ import DistributedActors -class ClassActorable: Actorable { +final class ClassActorable: Actorable { // @actor func hello() -> String { "Hello."