Drop support for Swift 5.3 & 5.4. (#494)

Author: ileitch

.github/workflows/test.yml

@@ -15,18 +15,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["13.3.1", "13.2.1", "13.1", "12.5.1", "12.4"]
+        xcode: ["13.3.1", "13.2.1"]
         include:
           - xcode: "13.3.1"
             macos: macOS-12
           - xcode: "13.2.1"
             macos: macOS-11
-          - xcode: "13.1"
-            macos: macOS-11
-          - xcode: "12.5.1"
-            macos: macOS-11
-          - xcode: "12.4"
-            macos: macOS-11
     runs-on: ${{ matrix.macos }}
     name: macOS
     steps:
@@ -61,20 +55,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.6", "5.5", "5.4", "5.3"]
+        swift: ["5.6", "5.5"]
         include:
           - swift: "5.6"
             container: "swift:5.6"
             cache-version: 2
           - swift: "5.5"
             container: "swift:5.5"
             cache-version: 2
-          - swift: "5.4"
-            container: "swift:5.4"
-            cache-version: 2
-          - swift: "5.3"
-            container: "swift:5.3"
-            cache-version: 2
     runs-on: ubuntu-20.04
     container: ${{ matrix.container }}
     name: Linux

CHANGELOG.md

@@ -2,15 +2,16 @@
 
 ##### Breaking
 
-- None.
+- Swift 5.5 or later is now required.
 
 ##### Enhancements
 
+- Add support for Swift 5.6.
 - Output is now line buffered when writing to a fifo/pipe.
 
 ##### Bug Fixes
 
-- None.
+- IBSegueAction annotated functions are now retained.
 
 ## 2.8.6 (2022-01-06)
 

Package.resolved

@@ -5,17 +5,13 @@ import PackageDescription
 let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50600.1-static")
 #elseif compiler(>=5.5)
 let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50500.0-static")
-#elseif compiler(>=5.4)
-let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50400.0")
-#elseif compiler(>=5.3)
-let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50300.0")
 #else
-fatalError("This version of Periphery does not support Swift <= 5.2.")
+fatalError("This version of Periphery requires Swift >= 5.5.")
 #endif
 
 var dependencies: [Package.Dependency] = [
     .package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
-    .package(url: "https://github.com/jpsim/Yams", from: "4.0.0"),
+    .package(url: "https://github.com/jpsim/Yams", from: "5.0.0"),
     .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.swift

@@ -30,10 +30,7 @@ final class Project {
         let logger: Logger = inject()
 
         logger.debug(SwiftVersion.current.fullVersion)
-
-        if SwiftVersion.current.version.isVersion(lessThanOrEqualTo: "5.2") {
-            throw PeripheryError.swiftVersionUnsupportedError(version: SwiftVersion.current.fullVersion)
-        }
+        try SwiftVersion.current.validateVersion()
 
         switch kind {
         case .xcode:

Sources/Frontend/Project.swift

@@ -45,7 +45,6 @@ public final class Analyzer {
         EncodablePropertyRetainer.self,
         StringInterpolationAppendInterpolationRetainer.self,
         PropertyWrapperRetainer.self,
-        OptionalProtocolMemberRetainer.self,
         ResultBuilderRetainer.self,
 
         PlainExtensionEliminator.self,

Sources/PeripheryKit/Analyzer/Analyzer.swift

@@ -47,12 +47,7 @@ public struct SPM {
 
         func build(additionalArguments: [String]) throws {
             let shell: Shell = inject()
-            var args: [String] = ["swift", "build", "--target", name] + additionalArguments
-
-            if SwiftVersion.current.version.isVersion(lessThan: "5.4") {
-                args.append("--enable-test-discovery")
-            }
-
+            let args: [String] = ["swift", "build", "--target", name] + additionalArguments
             try shell.exec(args)
         }
     }

Sources/PeripheryKit/Analyzer/Visitors/OptionalProtocolMemberRetainer.swift

@@ -83,10 +83,6 @@ extension SPMProjectDriver: ProjectDriver {
     // MARK: - Private
 
     private func absolutePath(for target: SPM.Target) -> FilePath {
-        if SwiftVersion.current.version.isVersion(greaterThanOrEqualTo: "5.4") {
-            return FilePath(package.path).appending(target.path)
-        } else {
-            return FilePath(target.path)
-        }
+        FilePath(package.path).appending(target.path)
     }
 }

Sources/PeripheryKit/SPM/SPM.swift

@@ -4,6 +4,8 @@ import Shared
 public struct SwiftVersion {
     public static let current = Self()
 
+    static let minimumVersion = "5.5"
+
     public let version: VersionString
     public let fullVersion: String
 
@@ -12,4 +14,12 @@ public struct SwiftVersion {
         self.fullVersion = try! shell.exec(["swift", "-version"]).trimmed
         self.version = try! SwiftVersionParser.parse(fullVersion)
     }
+
+    public func validateVersion() throws {
+        if Self.current.version.isVersion(lessThan: Self.minimumVersion) {
+            throw PeripheryError.swiftVersionUnsupportedError(
+                version: SwiftVersion.current.fullVersion,
+                minimumVersion: Self.minimumVersion)
+        }
+    }
 }