Merge pull request #33 from roanutil/bugfix/unable-to-build-v2-with-s…

…wift-6 Bugfix/unable to build v2 with swift 6
roanutil · Dec 9, 2024 · f0c5f84 · f0c5f84
2 parents d4dc88e + a022c86
commit f0c5f84
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,7 @@ jobs:
         run: swift test --enable-code-coverage
       - name: Swift Coverage Report
         run: xcrun llvm-cov export -format="lcov" .build/debug/CoreDataRepositoryPackageTests.xctest/Contents/MacOS/CoreDataRepositoryPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage_report.lcov
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true # optional (default = false)
diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump.git",
         "state": {
           "branch": null,
-          "revision": "84b30e1af72e0ffe6dfbfe39d53b8173caacf224",
-          "version": "0.10.2"
+          "revision": "0a5bff05fe01dcd513932ed338a4efad8268b803",
+          "version": "0.11.2"
         }
       },
       {
         "package": "xctest-dynamic-overlay",
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "4af50b38daf0037cfbab15514a241224c3f62f98",
-          "version": "0.8.5"
+          "revision": "50843cbb8551db836adec2290bb4bc6bac5c1865",
+          "version": "0.9.0"
         }
       }
     ]

diff --git a/Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift b/Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/CoreDataRepository+Batch.swift b/Sources/CoreDataRepository/CoreDataRepository+Batch.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/CoreDataRepository+CRUD.swift b/Sources/CoreDataRepository/CoreDataRepository+CRUD.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/CoreDataRepository+Fetch.swift b/Sources/CoreDataRepository/CoreDataRepository+Fetch.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CombineExt

diff --git a/Sources/CoreDataRepository/CoreDataRepository.swift b/Sources/CoreDataRepository/CoreDataRepository.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/CoreDataRepositoryError.swift b/Sources/CoreDataRepository/CoreDataRepositoryError.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Foundation
 

diff --git a/Sources/CoreDataRepository/FetchSubscription.swift b/Sources/CoreDataRepository/FetchSubscription.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/NSManagedObject+CRUDHelpers.swift b/Sources/CoreDataRepository/NSManagedObject+CRUDHelpers.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import Foundation

diff --git a/Sources/CoreDataRepository/NSManagedObjectContext+CRUDHelpers.swift b/Sources/CoreDataRepository/NSManagedObjectContext+CRUDHelpers.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import Foundation

diff --git a/Sources/CoreDataRepository/NSManagedObjectContext+Child.swift b/Sources/CoreDataRepository/NSManagedObjectContext+Child.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import Foundation

diff --git a/Sources/CoreDataRepository/NSManagedObjectContext+Scratchpad.swift b/Sources/CoreDataRepository/NSManagedObjectContext+Scratchpad.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/ReadSubscription.swift b/Sources/CoreDataRepository/ReadSubscription.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Sources/CoreDataRepository/RepositoryManagedModel.swift b/Sources/CoreDataRepository/RepositoryManagedModel.swift
@@ -4,13 +4,13 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 
 /// A protocol for a CoreData NSManagedObject sub class that has a corresponding value type
 public protocol RepositoryManagedModel: NSManagedObject {
-    associatedtype Unmanaged: UnmanagedModel where Unmanaged.RepoManaged == Self
+    associatedtype Unmanaged: UnmanagedModel
     /// Returns a value type instance of `self`
     var asUnmanaged: Unmanaged { get }
     /// Create `self` from a corresponding instance of `UnmanagedModel`. Should not save the context.

diff --git a/Sources/CoreDataRepository/Result+CRUDHelpers.swift b/Sources/CoreDataRepository/Result+CRUDHelpers.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import Foundation

diff --git a/Sources/CoreDataRepository/SubscriptionProvider.swift b/Sources/CoreDataRepository/SubscriptionProvider.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 public protocol SubscriptionProvider {
     var id: AnyHashable { get }

diff --git a/Sources/CoreDataRepository/UnmanagedModel.swift b/Sources/CoreDataRepository/UnmanagedModel.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import Foundation

diff --git a/Sources/CoreDataRepository/_Result.swift b/Sources/CoreDataRepository/_Result.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Foundation
 

diff --git a/Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift b/Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Tests/CoreDataRepositoryTests/BatchRepositoryTests.swift b/Tests/CoreDataRepositoryTests/BatchRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Tests/CoreDataRepositoryTests/CRUDRepositoryTests.swift b/Tests/CoreDataRepositoryTests/CRUDRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Tests/CoreDataRepositoryTests/CoreDataStack.swift b/Tests/CoreDataRepositoryTests/CoreDataStack.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 

diff --git a/Tests/CoreDataRepositoryTests/CoreDataXCTestCase.swift b/Tests/CoreDataRepositoryTests/CoreDataXCTestCase.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData
@@ -93,7 +93,7 @@ class CoreDataXCTestCase: XCTestCase {
             let historyResult = try XCTUnwrap(repositoryContext().execute(historyRequest) as? NSPersistentHistoryResult)
             let history = try XCTUnwrap(historyResult.result as? [NSPersistentHistoryTransaction])
             XCTAssertGreaterThan(history.count, 0)
-            history.forEach { historyTransaction in
+            for historyTransaction in history {
                 XCTAssertEqual(historyTransaction.author, transactionAuthor)
             }
         }

diff --git a/Tests/CoreDataRepositoryTests/FetchRepositoryTests.swift b/Tests/CoreDataRepositoryTests/FetchRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import Combine
 import CoreData

diff --git a/Tests/CoreDataRepositoryTests/Movie.swift b/Tests/CoreDataRepositoryTests/Movie.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2023 Andrew Roan
+// Copyright © 2024 Andrew Roan
 
 import CoreData
 import CoreDataRepository