Move to Swift 5.9 as the minimum version

.github/workflows/ci.yml

@@ -26,17 +26,3 @@ jobs:
       with:
         fail_ci_if_error: true
         verbose: true
-
-  build-5_4_2:
-    runs-on: macos-11
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Check Swift version
-      run: |
-        sudo xcode-select -s /Applications/Xcode_12.5.1.app/
-        export TOOLCHAINS=swift
-        swift --version
-    - name: Run tests
-      run: swift test

.swift-version

@@ -0,0 +1 @@
+5.9

.swiftformat

@@ -1,4 +1,3 @@
---swiftversion 5.7
 --exclude .build
 
 # rules

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.4
+// swift-tools-version: 5.9
 
 import PackageDescription
 
@@ -31,13 +31,8 @@ let package = Package(
                 .process("data/uritemplate-test/extended-tests.json"),
                 .process("data/uritemplate-test/negative-tests.json"),
             ]),
-    ],
-    swiftLanguageVersions: [.v5])
-
-#if swift(>=5.6) || os(macOS) || os(Linux)
-    package.targets.append(
         .executableTarget(
             name: "ScreamURITemplateExample",
-            dependencies: ["ScreamURITemplate"])
-    )
-#endif
+            dependencies: ["ScreamURITemplate"]),
+    ],
+    swiftLanguageVersions: [.v5])

Sources/ScreamURITemplate/Internal/Components.swift

@@ -14,11 +14,7 @@
 
 import Foundation
 
-#if swift(>=5.5)
-    typealias ComponentBase = Sendable
-#else
-    protocol ComponentBase {}
-#endif
+typealias ComponentBase = Sendable
 
 protocol Component: ComponentBase {
     func expand(variables: [String: VariableValue]) throws -> String

Sources/ScreamURITemplate/Internal/ValueFormatting.swift

@@ -47,11 +47,10 @@ func percentEncode(string: String, withAllowedCharacters allowedCharacterSet: Ch
 
 extension StringProtocol {
     func formatForTemplateExpansion(variableSpec: VariableSpec, expansionConfiguration: ExpansionConfiguration) throws -> String {
-        let modifiedValue: String
-        if let prefixLength = variableSpec.prefixLength() {
-            modifiedValue = String(prefix(prefixLength))
+        let modifiedValue = if let prefixLength = variableSpec.prefixLength() {
+            String(prefix(prefixLength))
         } else {
-            modifiedValue = String(self)
+            String(self)
         }
         let encodedExpansion = try percentEncode(string: modifiedValue, withAllowedCharacters: expansionConfiguration.percentEncodingAllowedCharacterSet, allowPercentEncodedTriplets: expansionConfiguration.allowPercentEncodedTriplets)
         if expansionConfiguration.named {

Sources/ScreamURITemplate/URITemplate.swift

@@ -53,9 +53,7 @@ public struct URITemplate {
     }
 }
 
-#if swift(>=5.5)
-    extension URITemplate: Sendable {}
-#endif
+extension URITemplate: Sendable {}
 
 extension URITemplate: CustomStringConvertible {
     public var description: String {

Tests/ScreamURITemplateTests/Tests.swift

@@ -16,13 +16,11 @@ import ScreamURITemplate
 import XCTest
 
 class Tests: XCTestCase {
-    #if swift(>=5.5)
-        func testSendable() {
-            let template: URITemplate = "https://api.github.com/repos/{owner}/{repo}/collaborators/{username}"
-            let sendable = template as Sendable
-            XCTAssertNotNil(sendable)
-        }
-    #endif
+    func testSendable() {
+        let template: URITemplate = "https://api.github.com/repos/{owner}/{repo}/collaborators/{username}"
+        let sendable = template as Sendable
+        XCTAssertNotNil(sendable)
+    }
 
     func testCustomStringConvertible() {
         let template: URITemplate = "https://api.github.com/repos/{owner}/{repo}/collaborators/{username}"