Merge pull request #11 from roanutil/update-workflow

Update workflow

Author: roanutil

.github/workflows/ci.yml

@@ -1,38 +1,35 @@
-name: CI
+name: ci
 
 on:
   push:
     branches:
       - main
   pull_request:
     branches:
-      - '*'
+      - "*"
   workflow_dispatch:
 
 jobs:
   lint:
-    runs-on: macos-13
+    runs-on: macos-latest
     environment: default
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - name: SwiftFormat version
+        run: swiftformat --version
       - name: Format lint
         run: swiftformat --lint .
+      - name: Install SwiftLint
+        run: brew install swiftlint
+      - name: SwiftLint version
+        run: swiftlint --version
       - name: Lint
-        run: swiftlint .
+        run: swiftlint lint --quiet
   macos-test:
+    runs-on: macos-14
     environment: default
-    strategy:
-      matrix:
-        include:
-          - os: macos-14
-            xcode: 15.2 # Swift 5.9
-          - os: macos-14
-            xcode: 15.3 # Swift 5.10
-    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+      - uses: actions/checkout@v3
       - name: Run Tests
         run: swift test --enable-code-coverage --parallel
       - name: Swift Coverage Report
@@ -44,8 +41,8 @@ jobs:
   linux-test:
     runs-on: ubuntu-latest
     environment: default
-    
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Run Tests
-        run: swift test --parallel
+        run: swift test --parallel

.swiftformat

@@ -1,6 +1,6 @@
 --extensionacl on-declarations
 --redundanttype explicit
---swiftversion 5.5
+--swiftversion 5.9
 --maxwidth 120
---header "{file}\nFilter\n\n\nMIT License\n\nCopyright © {year} Andrew Roan"
---allman false
+--header "{file}\nFilter\n\n\nMIT License\n\nCopyright Andrew Roan"
+--allman false

Sources/Filter/Collection/AnyCollectionPredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 
@@ -17,7 +17,7 @@ public protocol AnyCollectionPredicate {
     ///  - keyPath: KeyPath<Root, Value>
     /// - Returns
     ///  - Output
-    static func build<Root, Value>(from filter: CollectionFilter<Value>, on keyPath: KeyPath<Root, Value>) -> Output
+    static func build<Value>(from filter: CollectionFilter<Value>, on keyPath: KeyPath<some Any, Value>) -> Output
         where Value: Collection
 }
 
@@ -28,7 +28,7 @@ extension AnyCollectionPredicate {
     /// - Returns
     ///  - Output
     @inlinable
-    public static func build<Value>(from filter: CollectionFilter<Value>) -> Output where Value: Collection {
+    public static func build(from filter: CollectionFilter<some Collection>) -> Output {
         build(from: filter, on: \.self)
     }
 }

Sources/Filter/Collection/CollectionFilter.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 
@@ -28,11 +28,11 @@ public enum CollectionFilter<C>: Equatable where C: Collection, C: Equatable, C.
         public var unwrapped: CollectionFilter<C>? {
             switch self {
             case let .orNil(unwrapped):
-                return unwrapped
+                unwrapped
             case let .notNil(unwrapped):
-                return unwrapped
+                unwrapped
             case .isNil:
-                return nil
+                nil
             }
         }
     }

Sources/Filter/Collection/CollectionPredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 

Sources/Filter/Collection/OptionalAnyCollectionPredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 
@@ -16,7 +16,7 @@ public protocol OptionalAnyCollectionPredicate: AnyCollectionPredicate {
     ///  - keyPath: KeyPath<Root, Value?>
     /// - Returns
     ///  - Output
-    static func build<Model, Value>(from filter: CollectionFilter<Value>.Optional, on keyPath: KeyPath<Model, Value?>)
+    static func build<Value>(from filter: CollectionFilter<Value>.Optional, on keyPath: KeyPath<some Any, Value?>)
         -> Output where Value: Collection
 }
 
@@ -27,7 +27,7 @@ extension OptionalAnyCollectionPredicate {
     /// - Returns
     ///  - Output
     @inlinable
-    public static func build<Value>(from filter: CollectionFilter<Value>.Optional) -> Output where Value: Collection {
+    public static func build(from filter: CollectionFilter<some Collection>.Optional) -> Output {
         build(from: filter, on: \.self)
     }
 }

Sources/Filter/Collection/OptionalCollectionPredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 

Sources/Filter/Comparable/AnyComparablePredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 
@@ -16,7 +16,7 @@ public protocol AnyComparablePredicate: AnyEquatablePredicate {
     ///  - keyPath: KeyPath<Root, Value>
     /// - Returns
     ///  - Output
-    static func build<Root, Value>(from filter: ComparableFilter<Value>, on keyPath: KeyPath<Root, Value>) -> Output
+    static func build<Value>(from filter: ComparableFilter<Value>, on keyPath: KeyPath<some Any, Value>) -> Output
         where Value: Comparable
 }
 
@@ -27,7 +27,7 @@ extension AnyComparablePredicate {
     /// - Returns
     ///  - Output
     @inlinable
-    public static func build<Value>(from filter: ComparableFilter<Value>) -> Output where Value: Comparable {
+    public static func build(from filter: ComparableFilter<some Comparable>) -> Output {
         build(from: filter, on: \.self)
     }
 }

Sources/Filter/Comparable/ComparableFilter.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation
 
@@ -69,11 +69,11 @@ public enum ComparableFilter<T: Comparable>: Equatable {
         public var unwrapped: ComparableFilter<T>? {
             switch self {
             case let .orNil(unwrapped):
-                return unwrapped
+                unwrapped
             case let .notNil(unwrapped):
-                return unwrapped
+                unwrapped
             case .isNil:
-                return nil
+                nil
             }
         }
     }

Sources/Filter/Comparable/ComparablePredicate.swift

@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2024 Andrew Roan
+// Copyright Andrew Roan
 
 import Foundation