Add support for Swift 5.7 (#527)

Author: ileitch

.github/workflows/test.yml

@@ -15,13 +15,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["13.4.1", "13.3.1", "13.2.1"]
+        xcode: ["14.0.1"]
         include:
-          - xcode: "13.4.1"
-            macos: macOS-12
-          - xcode: "13.3.1"
-            macos: macOS-12
-          - xcode: "13.2.1"
+          - xcode: "14.0.1"
             macos: macOS-12
     runs-on: ${{ matrix.macos }}
     name: macOS
@@ -57,14 +53,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.6", "5.5"]
+        swift: ["5.7"]
         include:
-          - swift: "5.6"
-            container: "swift:5.6"
-            cache-version: 2
-          - swift: "5.5"
-            container: "swift:5.5"
-            cache-version: 2
+          - swift: "5.7"
+            container: "swift:5.7"
+            cache-version: 1
     runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
     name: Linux

Package.resolved

@@ -1,12 +1,18 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 import PackageDescription
 
-#if compiler(>=5.6)
-let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50600.1-static")
-#elseif compiler(>=5.5)
-let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50500.0-static")
+#if os(macOS)
+private let staticSwiftSyntax = true
+#else
+private let staticSwiftSyntax = false
+#endif
+
+#if compiler(>=5.7)
+let swiftSyntaxVersion: Version = "0.50700.0"
+let staticInternalSwiftSyntaxParserVersion = "5.7"
+let staticInternalSwiftSyntaxParserChecksum = "99803975d10b2664fc37cc223a39b4e37fe3c79d3d6a2c44432007206d49db15"
 #else
-fatalError("This version of Periphery requires Swift >= 5.5.")
+fatalError("This version of Periphery requires Swift >= 5.7 to build from source.")
 #endif
 
 var dependencies: [Package.Dependency] = [
@@ -15,7 +21,7 @@ var dependencies: [Package.Dependency] = [
     .package(url: "https://github.com/tadija/AEXML", from: "4.0.0"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
     .package(name: "SwiftIndexStore", url: "https://github.com/kateinoigakukun/swift-indexstore", from: "0.0.0"),
-    .package(name: "SwiftSyntax", url: "https://github.com/peripheryapp/swift-syntax", swiftSyntaxVersion)
+    .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .exact(swiftSyntaxVersion))
 ]
 
 #if os(macOS)
@@ -43,21 +49,23 @@ var peripheryKitDependencies: [PackageDescription.Target.Dependency] = [
     .product(name: "SystemPackage", package: "swift-system"),
     .product(name: "AEXML", package: "AEXML"),
     .product(name: "SwiftSyntax", package: "SwiftSyntax"),
+    .product(name: "SwiftSyntaxParser", package: "SwiftSyntax"),
     .product(name: "SwiftIndexStore", package: "SwiftIndexStore")
 ]
-
-#if compiler(>=5.6)
-peripheryKitDependencies.append(.product(name: "SwiftSyntaxParser", package: "SwiftSyntax"))
-#endif
++ (staticSwiftSyntax ? ["lib_InternalSwiftSyntaxParser"] : [])
 
 var targets: [PackageDescription.Target] = [
-    .target(
+    .executableTarget(
         name: "Frontend",
         dependencies: frontendDependencies
     ),
     .target(
         name: "PeripheryKit",
-        dependencies: peripheryKitDependencies
+        dependencies: peripheryKitDependencies,
+        // Pass `-dead_strip_dylibs` to ignore the dynamic version of `lib_InternalSwiftSyntaxParser`
+        // that ships with SwiftSyntax because we want the static version from
+        // `StaticInternalSwiftSyntaxParser`.
+        linkerSettings: staticSwiftSyntax ? [.unsafeFlags(["-Xlinker", "-dead_strip_dylibs"])] : []
     ),
     .target(
         name: "Shared",
@@ -143,6 +151,11 @@ targets.append(contentsOf: [
             .target(name: "XcodeSupport")
         ],
         exclude: ["UIKitProject", "SwiftUIProject"]
+    ),
+    .binaryTarget(
+        name: "lib_InternalSwiftSyntaxParser",
+        url: "https://github.com/keith/StaticInternalSwiftSyntaxParser/releases/download/\(staticInternalSwiftSyntaxParserVersion)/lib_InternalSwiftSyntaxParser.xcframework.zip",
+        checksum: staticInternalSwiftSyntaxParserChecksum
     )
 ])
 #endif

Package.swift

@@ -4,7 +4,7 @@ import Shared
 public struct SwiftVersion {
     public static let current = Self()
 
-    static let minimumVersion = "5.5"
+    static let minimumVersion = "5.6"
 
     public let version: VersionString
     public let fullVersion: String

Sources/PeripheryKit/SwiftVersion.swift

@@ -308,7 +308,7 @@ final class DeclarationVisitor: PeripherySyntaxVisitor {
     private func typeLocations(for clause: ReturnClauseSyntax?) -> Set<SourceLocation> {
         guard let returnTypeSyntax = clause?.returnType else { return [] }
 
-        if let someReturnType = returnTypeSyntax.as(SomeTypeSyntax.self) {
+        if let someReturnType = returnTypeSyntax.as(ConstrainedSugarTypeSyntax.self) {
             return typeSyntaxInspector.typeLocations(for: someReturnType.baseType)
         }
 

Sources/PeripheryKit/Syntax/DeclarationVisitor.swift

@@ -35,7 +35,7 @@ struct TypeSyntaxInspector {
         } else if let dictType = typeSyntax.as(DictionaryTypeSyntax.self) {
             // Dictionary type.
             return typeLocations(for: dictType.keyType).union(typeLocations(for: dictType.valueType))
-        } else if let someType = typeSyntax.as(SomeTypeSyntax.self) {
+        } else if let someType = typeSyntax.as(ConstrainedSugarTypeSyntax.self) {
             // Some type.
             return typeLocations(for: someType.baseType)
         } else if let implicitUnwrappedOptionalType = typeSyntax.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) {

Sources/PeripheryKit/Syntax/TypeSyntaxInspector.swift

@@ -15,5 +15,8 @@ class SwiftVersionParserTest: XCTestCase {
 
         let v4 = try SwiftVersionParser.parse("swift-driver version: 1.26.5 Apple Swift version 5.5 (swiftlang-1300.0.24.13 clang-1300.0.25.10)\nTarget: x86_64-apple-macosx11.0")
         XCTAssertEqual(v4, "5.5")
+
+        let v5 = try SwiftVersionParser.parse("swift-driver version: 1.62.8 Apple Swift version 5.7 (swiftlang-5.7.0.127.4 clang-1400.0.29.50)\nTarget: arm64-apple-macosx12.0")
+        XCTAssertEqual(v5, "5.7")
     }
 }

Tests/PeripheryTests/SwiftVersionParserTest.swift

@@ -154,7 +154,7 @@ private class TypeSyntaxInspectorTestVisitor: SyntaxVisitor {
 
     override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
         if let returnTypeSyntax = node.signature.output?.returnType {
-            if let someTypeSyntax = returnTypeSyntax.as(SomeTypeSyntax.self) {
+            if let someTypeSyntax = returnTypeSyntax.as(ConstrainedSugarTypeSyntax.self) {
                 addResult(for: someTypeSyntax.baseType)
             } else {
                 addResult(for: returnTypeSyntax)