version bump

CoreStore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "4.2.0"
+    s.version = "4.2.4"
     s.license = "MIT"
     s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"

Sources/CSListMonitor.swift

@@ -560,7 +560,6 @@ extension ListMonitor where ListMonitor.ObjectType: NSManagedObject {
     
     fileprivate func downcast() -> ListMonitor<NSManagedObject> {
         
-        @inline(__always)
         func noWarnUnsafeBitCast<T, U>(_ x: T, to type: U.Type) -> U {
             
             return unsafeBitCast(x, to: type)

Sources/CSListObserver.swift

@@ -42,7 +42,7 @@ import CoreData
  */
 @available(OSX 10.12, *)
 @objc
-public protocol CSListObserver: class, AnyObject {
+public protocol CSListObserver: class {
     
     /**
      Handles processing just before a change to the observed list occurs

Sources/CSObjectMonitor.swift

@@ -152,7 +152,6 @@ extension ObjectMonitor where ObjectMonitor.ObjectType: NSManagedObject {
     
     fileprivate func downcast() -> ObjectMonitor<NSManagedObject> {
         
-        @inline(__always)
         func noWarnUnsafeBitCast<T, U>(_ x: T, to type: U.Type) -> U {
             
             return unsafeBitCast(x, to: type)

Sources/CSObjectObserver.swift

@@ -40,7 +40,7 @@ import CoreData
  */
 @available(OSX 10.12, *)
 @objc
-public protocol CSObjectObserver: class, AnyObject {
+public protocol CSObjectObserver: class {
     
     /**
      Handles processing just before a change to the observed `object` occurs

Sources/CoreDataNativeType.swift

@@ -33,7 +33,7 @@ import CoreData
  Objective-C Foundation types that are natively supported by Core Data managed attributes all conform to `CoreDataNativeType`.
  */
 @objc
-public protocol CoreDataNativeType: class, NSObjectProtocol, AnyObject {}
+public protocol CoreDataNativeType: class, NSObjectProtocol {}
 
 
 // MARK: - NSNumber

Sources/CoreStoreBridge.m

@@ -235,9 +235,8 @@ CSWhere *_Nonnull CSWherePredicate(NSPredicate *_Nonnull predicate) CORESTORE_RE
 
 - (void)setAffectedStores:(NSArray<NSPersistentStore *> *_Nullable)affectedStores {
     
-    NSProcessInfo *processInfo = [NSProcessInfo processInfo];
-    if ([processInfo isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){ 11, 0, 0 }]
-        || ![processInfo isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){ 10, 0, 0 }]) {
+    if (NSFoundationVersionNumber < NSFoundationVersionNumber10_0
+        || [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){ 11, 0, 0 }]) {
         
         self.safeAffectedStores = affectedStores;
         [super setAffectedStores:affectedStores];

Sources/CoreStoreBridge.swift

@@ -31,7 +31,7 @@ import Foundation
 /**
  `CoreStoreObjectiveCType`s are Objective-C accessible classes that represent CoreStore's Swift types.
  */
-public protocol CoreStoreObjectiveCType: class, AnyObject {
+public protocol CoreStoreObjectiveCType: class {
     
     /**
      The corresponding Swift type

Sources/DataStack+Migration.swift

@@ -575,6 +575,7 @@ public extension DataStack {
                                 sourceModel: sourceModel,
                                 destinationModel: destinationModel,
                                 mappingModel: mappingModel,
+                                migrationType: migrationType,
                                 progress: childProgress
                             )
                         }
@@ -679,10 +680,66 @@ public extension DataStack {
         return nil
     }
     
-    private func startMigrationForStorage<T: LocalStorage>(_ storage: T, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, progress: Progress) throws {
+    private func startMigrationForStorage<T: LocalStorage>(_ storage: T, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType, progress: Progress) throws {
         
         let fileURL = storage.fileURL
-        
+        if case .lightweight = migrationType {
+
+            do {
+
+                let timerQueue = DispatchQueue(
+                    label: "DataStack.lightweightMigration.timerQueue",
+                    qos: .utility,
+                    attributes: []
+                )
+                let estimatedTime: TimeInterval = 60 * 3 // 3 mins
+                let interval: TimeInterval = 1
+                let fakeTotalUnitCount: Float = 0.9 * Float(progress.totalUnitCount)
+                var fakeProgress: Float = 0
+                
+                var recursiveCheck: () -> Void = {}
+                recursiveCheck = {
+                    
+                    guard fakeProgress < 1 else {
+                        
+                        return
+                    }
+                    progress.completedUnitCount = Int64(fakeTotalUnitCount * fakeProgress)
+                    fakeProgress += Float(interval / estimatedTime)
+                    
+                    timerQueue.asyncAfter(
+                        deadline: .now() + interval,
+                        execute: recursiveCheck
+                    )
+                }
+                timerQueue.async(execute: recursiveCheck)
+                
+                _ = try storage.cs_finalizeStorageAndWait(soureModelHint: sourceModel)
+                _ = try withExtendedLifetime(NSPersistentStoreCoordinator(managedObjectModel: destinationModel)) { (coordinator: NSPersistentStoreCoordinator) in
+                    
+                    try coordinator.addPersistentStoreSynchronously(
+                        type(of: storage).storeType,
+                        configuration: storage.configuration,
+                        URL: fileURL,
+                        options: storage.dictionary(
+                            forOptions: storage.localStorageOptions.union(.allowSynchronousLightweightMigration)
+                        )
+                    )
+                }
+                timerQueue.sync {
+                    
+                    fakeProgress = 1
+                }
+                _ = try? storage.cs_finalizeStorageAndWait(soureModelHint: destinationModel)
+                progress.completedUnitCount = progress.totalUnitCount
+                return
+            }
+            catch {
+
+                // try manual migration
+            }
+        }
+
         let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
             .appendingPathComponent(Bundle.main.bundleIdentifier ?? "com.CoreStore.DataStack")
             .appendingPathComponent(ProcessInfo().globallyUniqueString)

Sources/DynamicObject.swift

@@ -121,8 +121,7 @@ extension CoreStoreObject {
             
             return unsafeDowncast(coreStoreObject, to: self)
         }
-        @inline(__always)
-        func forceTypeCast<T: CoreStoreObject>(_ type: DynamicObject.Type, to: T.Type) -> T.Type {
+        func forceTypeCast<T: CoreStoreObject>(_ type: AnyClass, to: T.Type) -> T.Type {
             
             return type as! T.Type
         }

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.0</string>
+	<string>4.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/NSPersistentStoreCoordinator+Setup.swift

@@ -72,15 +72,13 @@ internal extension NSPersistentStoreCoordinator {
     }
     
     @nonobjc
-    internal func addPersistentStoreSynchronously(_ storeType: String, configuration: ModelConfiguration, URL storeURL: URL?, options: [NSObject : AnyObject]?) throws -> NSPersistentStore {
+    internal func addPersistentStoreSynchronously(_ storeType: String, configuration: ModelConfiguration, URL storeURL: URL?, options: [AnyHashable: Any]?) throws -> NSPersistentStore {
         
-        var store: NSPersistentStore?
-        var storeError: NSError?
-        self.performSynchronously {
+        return try self.performSynchronously {
             
             do {
                 
-                store = try self.addPersistentStore(
+                return try self.addPersistentStore(
                     ofType: storeType,
                     configurationName: configuration,
                     at: storeURL,
@@ -89,13 +87,8 @@ internal extension NSPersistentStoreCoordinator {
             }
             catch {
                 
-                storeError = error as NSError
+                throw CoreStoreError(error)
             }
         }
-        if let store = store {
-            
-            return store
-        }
-        throw CoreStoreError(storeError)
     }
 }

Sources/QueryableAttributeType.swift

@@ -350,7 +350,6 @@ extension NSData: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSData>(_ value: Any) -> T? {
             
             return value as? T
@@ -380,7 +379,6 @@ extension NSDate: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSDate>(_ value: Any) -> T? {
             
             return value as? T
@@ -421,7 +419,6 @@ extension NSManagedObjectID: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSManagedObjectID>(_ value: Any) -> T? {
             
             return value as? T
@@ -451,7 +448,6 @@ extension NSNull: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSNull>(_ value: Any) -> T? {
             
             return value as? T
@@ -481,7 +477,6 @@ extension NSNumber: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSNumber>(_ value: Any) -> T? {
             
             return value as? T
@@ -511,7 +506,6 @@ extension NSString: QueryableAttributeType {
     @nonobjc @inline(__always)
     public class func cs_fromQueryableNativeType(_ value: QueryableNativeType) -> Self? {
         
-        @inline(__always)
         func forceCast<T: NSString>(_ value: Any) -> T? {
             
             return value as? T