Skip to content

Adapt codebase for Swift 5.6 release version #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 6, 2022
Merged

Adapt codebase for Swift 5.6 release version #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
166e4bb
Fix SwiftSyntax dep in Package descriptor
segabor Apr 3, 2022
1280be4
Fix SwiftSyntax import
segabor Apr 3, 2022
e3ba16b
Fix tests by making Actorable class final
segabor Apr 3, 2022
789cfc2
Workaround SwiftSyntax parser dependency
segabor Apr 4, 2022
d8cbfae
Update Package.swift
ktoso Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"),

Expand Down Expand Up @@ -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(
Expand Down
4 changes: 4 additions & 0 deletions Sources/GenActorsLib/GenerateActors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Tests/GenActorsTests/ClassStructEtcActorable/ClassStructEtc+Actorable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import DistributedActors

class ClassActorable: Actorable {
final class ClassActorable: Actorable {
// @actor
func hello() -> String {
"Hello."
Expand Down