Merge remote-tracking branch 'refs/remotes/origin/main'

Author: MykolaVasyk

.github/workflows/lint.yml

@@ -9,9 +9,10 @@ concurrency:
 
 jobs:
   SwiftLint:
-    runs-on: macos-latest
+    runs-on: macOS-13
     steps:
-      - uses: actions/checkout@v1
-      
-      - name: Lint code using SwiftLint
-        run: swiftlint lint --reporter github-actions-logging
+      - uses: actions/checkout@v4
+      - name: Switch Xcode 🔄
+        run: sudo xcode-select --switch /Applications/Xcode_15.0.app
+      - name: Swift Lint
+        run: swiftlint --strict

.github/workflows/test.yml

@@ -21,13 +21,13 @@ jobs:
     - name: Swift Lint
       run: swiftlint --strict
     - name: Test iOS
-      run: xcodebuild test -scheme fs-contact-store -destination "platform=iOS Simulator,name=iPhone 15" -enableCodeCoverage YES
+      run: xcodebuild test -scheme fs-contact-store -destination "platform=iOS Simulator,name=iPhone 15" -enableCodeCoverage YES -skipPackagePluginValidation
     - name: Fetch Coverage
       uses: sersoft-gmbh/swift-coverage-action@v4
       id: coverage-files
     - name: Publish Coverage to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4.0.1
       with:
-        files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}
+        token: ${{ secrets.CODECOV_TOKEN }}
     - name: Test macOS
       run: xcodebuild test -scheme fs-contact-store -destination "platform=macOS" -enableCodeCoverage YES

Tests/ContactStoreTests/TestHelpers/MockContactStore.swift

@@ -87,10 +87,10 @@ final class MockContactStore: CNContactStore {
         if let contact = request.addedContact {
             contacts.append(contact)
         } else if let contact = request.updatedContact {
-            contacts.removeAll(where: { $0.identifier == contact.identifier })
+            contacts.removeAll { $0.identifier == contact.identifier }
             contacts.append(contact)
         } else if let contact = request.deletedContact {
-            contacts.removeAll(where: { $0.identifier == contact.identifier })
+            contacts.removeAll { $0.identifier == contact.identifier }
         }
     }