Skip to content

Swift 5.8 and update dependencies #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roanutil merged 2 commits into from
Mar 23, 2023
Merged

Swift 5.8 and update dependencies #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f51938
Update dependencies
roanutil Mar 23, 2023
80f33d9
Run swiftformat
roanutil Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepository+Batch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepository+CRUD.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepository+Fetch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CombineExt
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/CoreDataRepositoryError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Foundation

Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/FetchSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/NSManagedObject+CRUDHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/NSManagedObjectContext+CRUDHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/NSManagedObjectContext+Child.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/NSManagedObjectContext+Scratchpad.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/ReadSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/RepositoryManagedModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData

Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/Result+CRUDHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/SubscriptionProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

public protocol SubscriptionProvider {
var id: AnyHashable { get }
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/UnmanagedModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import CoreData
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/CoreDataRepository/_Result.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Foundation

Expand Down
12 changes: 6 additions & 6 deletions Tests/CoreDataRepositoryTests/AggregateRepositoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand All @@ -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()
}
}
Expand All @@ -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" })
)
Expand All @@ -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" })
)
Expand All @@ -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" })
)
Expand All @@ -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" })
)
Expand Down
14 changes: 7 additions & 7 deletions Tests/CoreDataRepositoryTests/BatchRepositoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// MIT License
//
// Copyright © 2022 Andrew Roan
// Copyright © 2023 Andrew Roan

import Combine
import CoreData
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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)
Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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
)))
Expand Down
Loading