Merge pull request #12 from roanutil/swift-5.8-and-update-dependencies

roanutil · web-flow · commit 7b3d24955fae · 2023-03-22T23:23:00.000-05:00
Swift 5.8 and update dependencies
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift b/Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import Foundation
 
diff --git a/Sources/CoreDataRepository/FetchSubscription.swift b/Sources/CoreDataRepository/FetchSubscription.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import Combine
 import CoreData
diff --git a/Sources/CoreDataRepository/RepositoryManagedModel.swift b/Sources/CoreDataRepository/RepositoryManagedModel.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import CoreData
 
diff --git a/Sources/CoreDataRepository/Result+CRUDHelpers.swift b/Sources/CoreDataRepository/Result+CRUDHelpers.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 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 © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import Foundation
 
diff --git a/Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift b/Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import Combine
 import CoreData
@@ -30,7 +30,7 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         try repositoryContext().performAndWait {
-            objectIDs = try movies.map { $0.asRepoManaged(in: try self.repositoryContext()).objectID }
+            objectIDs = try movies.map { try $0.asRepoManaged(in: self.repositoryContext()).objectID }
             try repositoryContext().save()
         }
     }
@@ -56,7 +56,7 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
         let result: Result<[[String: Decimal]], CoreDataRepositoryError> = try await repository().sum(
             predicate: NSPredicate(value: true),
             entityDesc: RepoMovie.entity(),
-            attributeDesc: try XCTUnwrap(
+            attributeDesc: XCTUnwrap(
                 RepoMovie.entity().attributesByName.values
                     .first(where: { $0.name == "boxOffice" })
             )
@@ -74,7 +74,7 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
         let result: Result<[[String: Decimal]], CoreDataRepositoryError> = try await repository().average(
             predicate: NSPredicate(value: true),
             entityDesc: RepoMovie.entity(),
-            attributeDesc: try XCTUnwrap(
+            attributeDesc: XCTUnwrap(
                 RepoMovie.entity().attributesByName.values
                     .first(where: { $0.name == "boxOffice" })
             )
@@ -96,7 +96,7 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
         let result: Result<[[String: Decimal]], CoreDataRepositoryError> = try await repository().min(
             predicate: NSPredicate(value: true),
             entityDesc: RepoMovie.entity(),
-            attributeDesc: try XCTUnwrap(
+            attributeDesc: XCTUnwrap(
                 RepoMovie.entity().attributesByName.values
                     .first(where: { $0.name == "boxOffice" })
             )
@@ -118,7 +118,7 @@ final class AggregateRepositoryTests: CoreDataXCTestCase {
         let result: Result<[[String: Decimal]], CoreDataRepositoryError> = try await repository().max(
             predicate: NSPredicate(value: true),
             entityDesc: RepoMovie.entity(),
-            attributeDesc: try XCTUnwrap(
+            attributeDesc: XCTUnwrap(
                 RepoMovie.entity().attributesByName.values
                     .first(where: { $0.name == "boxOffice" })
             )
diff --git a/Tests/CoreDataRepositoryTests/BatchRepositoryTests.swift b/Tests/CoreDataRepositoryTests/BatchRepositoryTests.swift
@@ -4,7 +4,7 @@
 //
 // MIT License
 //
-// Copyright © 2022 Andrew Roan
+// Copyright © 2023 Andrew Roan
 
 import Combine
 import CoreData
@@ -40,7 +40,7 @@ final class BatchRepositoryTests: CoreDataXCTestCase {
 
     func mapDictToRepoMovie(_ dict: [String: Any]) throws -> RepoMovie {
         try mapDictToMovie(dict)
-            .asRepoManaged(in: try repositoryContext())
+            .asRepoManaged(in: repositoryContext())
     }
 
     func mapDictToMovie(_ dict: [String: Any]) throws -> Movie {
@@ -57,7 +57,7 @@ final class BatchRepositoryTests: CoreDataXCTestCase {
             XCTAssertEqual(count, 0, "Count of objects in CoreData should be zero at the start of each test.")
         }
 
-        let request = NSBatchInsertRequest(entityName: try XCTUnwrap(RepoMovie.entity().name), objects: movies)
+        let request = try NSBatchInsertRequest(entityName: XCTUnwrap(RepoMovie.entity().name), objects: movies)
         let result: Result<NSBatchInsertResult, CoreDataRepositoryError> = try await repository().insert(request)
 
         switch result {
@@ -84,8 +84,8 @@ final class BatchRepositoryTests: CoreDataXCTestCase {
             XCTAssertEqual(count, 0, "Count of objects in CoreData should be zero at the start of each test.")
         }
 
-        let request = NSBatchInsertRequest(
-            entityName: try XCTUnwrap(RepoMovie.entity().name),
+        let request = try NSBatchInsertRequest(
+            entityName: XCTUnwrap(RepoMovie.entity().name),
             objects: failureInsertMovies
         )
         let result: Result<NSBatchInsertResult, CoreDataRepositoryError> = try await repository().insert(request)
@@ -163,7 +163,7 @@ final class BatchRepositoryTests: CoreDataXCTestCase {
         }
 
         let predicate = NSPredicate(value: true)
-        let request = NSBatchUpdateRequest(entityName: try XCTUnwrap(RepoMovie.entity().name))
+        let request = try NSBatchUpdateRequest(entityName: XCTUnwrap(RepoMovie.entity().name))
         request.predicate = predicate
         request.propertiesToUpdate = ["title": "Updated!", "boxOffice": 1]
 
@@ -216,7 +216,7 @@ final class BatchRepositoryTests: CoreDataXCTestCase {
         }
 
         let request =
-            NSBatchDeleteRequest(fetchRequest: NSFetchRequest<NSFetchRequestResult>(entityName: try XCTUnwrap(
+            try NSBatchDeleteRequest(fetchRequest: NSFetchRequest<NSFetchRequestResult>(entityName: XCTUnwrap(
                 RepoMovie
                     .entity().name
             )))
diff --git a/Tests/CoreDataRepositoryTests/CRUDRepositoryTests.swift b/Tests/CoreDataRepositoryTests/CRUDRepositoryTests.swift
diff --git a/Tests/CoreDataRepositoryTests/CoreDataStack.swift b/Tests/CoreDataRepositoryTests/CoreDataStack.swift
diff --git a/Tests/CoreDataRepositoryTests/CoreDataXCTestCase.swift b/Tests/CoreDataRepositoryTests/CoreDataXCTestCase.swift
diff --git a/Tests/CoreDataRepositoryTests/FetchRepositoryTests.swift b/Tests/CoreDataRepositoryTests/FetchRepositoryTests.swift
diff --git a/Tests/CoreDataRepositoryTests/Movie.swift b/Tests/CoreDataRepositoryTests/Movie.swift
