Updated for Swift 5.7

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -15,16 +15,10 @@ let package = Package(
             targets: [
                 "CoreDataModel"
             ]
-        ),
-        .library(
-            name: "SQLiteModel",
-            targets: [
-                "SQLiteModel"
-            ]
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/PureSwift/Predicate.git", .branch("master"))
+        .package(url: "https://github.com/PureSwift/Predicate.git", branch: "master")
     ],
     targets: [
         .target(
@@ -39,18 +33,11 @@ let package = Package(
                 "CoreModel"
             ]
         ),
-        .target(
-            name: "SQLiteModel",
-            dependencies: [
-                "CoreModel"
-            ]
-        ),
         .testTarget(
             name: "CoreModelTests",
             dependencies: [
                 "CoreModel"
             ]
         )
-    ],
-    swiftLanguageVersions: [4]
+    ]
 )

README.md

@@ -1,11 +1,10 @@
 # CoreModel
 
-[![Swift](https://img.shields.io/badge/swift-4.1-orange.svg?style=flat)](https://developer.apple.com/swift/)
+[![Swift](https://img.shields.io/badge/swift-5.7-orange.svg?style=flat)](https://developer.apple.com/swift/)
 [![License MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat)](https://tldrlegal.com/license/mit-license)
 [![Release](https://img.shields.io/github/release/pureswift/CoreModel.svg)](https://github.com/PureSwift/CoreModel/releases)
 [![Build Status](https://travis-ci.org/PureSwift/CoreModel.svg?branch=master)](https://travis-ci.org/PureSwift/CoreModel)
 
 [![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://github.com/apple/swift-package-manager)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 Swift Object Graph

Sources/CoreModel/Entity.swift

@@ -15,10 +15,11 @@ public struct Entity: Codable, Equatable {
 
     public var relationships: [Relationship]
 
-    public init(name: String,
-                attributes: [Attribute],
-                relationships: [Relationship]) {
-
+    public init(
+        name: String,
+        attributes: [Attribute],
+        relationships: [Relationship]
+    ) {
         self.name = name
         self.attributes = attributes
         self.relationships = relationships
@@ -28,12 +29,10 @@ public struct Entity: Codable, Equatable {
 public extension Entity {
 
     subscript (attribute propertyName: String) -> Attribute? {
-
         return attributes.first { $0.name == propertyName }
     }
 
     subscript (relationship propertyName: String) -> Relationship? {
-
         return relationships.first { $0.name == propertyName }
     }
 }

Sources/CoreModel/InMemoryStore.swift

@@ -16,7 +16,6 @@ public final class InMemoryStore: StoreProtocol {
     private var data = [Identifier: Cache]()
 
     public init(model: Model) {
-
         self.model = model
     }
 
@@ -26,12 +25,10 @@ public final class InMemoryStore: StoreProtocol {
         var identifiers = data.keys.filter { $0.entity == fetchRequest.entity }
 
         if fetchRequest.fetchOffset > 0 {
-
             identifiers = Array(identifiers.suffix(fetchRequest.fetchOffset))
         }
 
         if fetchRequest.fetchLimit > 0 {
-
             identifiers = Array(identifiers.prefix(fetchRequest.fetchLimit))
         }
 
@@ -94,14 +91,14 @@ public final class InMemoryStore: StoreProtocol {
 
 public extension InMemoryStore {
 
-    public struct Identifier: Equatable, Hashable {
+    struct Identifier: Equatable, Hashable {
 
         public let entity: String
 
         public let uuid: UUID
     }
 
-    public final class ManagedObject: CoreModel.ManagedObject {
+    final class ManagedObject: CoreModel.ManagedObject {
 
         public private(set) weak var store: InMemoryStore?
 
@@ -277,9 +274,8 @@ public extension InMemoryStore {
 
         }
 
-        public var hashValue: Int {
-
-            return identifier.hashValue
+        public func hash(into hasher: inout Hasher) {
+            identifier.hash(into: &hasher)
         }
 
         public static func == (lhs: ManagedObject, rhs: ManagedObject) -> Bool {
@@ -308,7 +304,6 @@ private extension InMemoryStore {
 extension InMemoryStore.ManagedObject: PredicateEvaluatable {
 
     public func evaluate(with predicate: Predicate) throws -> Bool {
-
-
+        false
     }
 }

Sources/CoreModel/ManagedObject.swift

@@ -8,8 +8,8 @@
 import Foundation
 
 /// CoreModel Managed Object
-public protocol ManagedObject: class, Hashable {
-        
+public protocol ManagedObject: AnyObject, Hashable {
+
     /// Whether the object has been deleted.
     var isDeleted: Bool { get }
 

Sources/CoreModel/Store.swift

@@ -7,7 +7,7 @@
 //
 
 /// CoreModel Store Protocol
-public protocol StoreProtocol: class {
+public protocol StoreProtocol: AnyObject {
 
     associatedtype ManagedObject: CoreModel.ManagedObject