Merge pull request #23 from deeje/feature/4.0.1

4.0.1 - bug fixes
deeje · Jan 13, 2022 · ed2c2a5 · ed2c2a5
2 parents 3deea7d + adebd43
commit ed2c2a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CloudCore.podspec b/CloudCore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "CloudCore"
   s.summary          = "Framework that enables synchronization between CloudKit and Core Data."
-  s.version          = "4.0"
+  s.version          = "4.0.1"
   s.homepage         = "https://github.com/deeje/CloudCore"
   s.license          = 'MIT'
   s.author           = { "deeje" => "[email protected]", "Vasily Ulianov" => "[email protected]" }
@@ -11,14 +11,16 @@ Pod::Spec.new do |s|
   }
 
   s.ios.deployment_target = '13.0'
-  s.osx.deployment_target = '10.15'
-  s.tvos.deployment_target = '10.0'
+  s.osx.deployment_target = '11.0'
+  s.tvos.deployment_target = '12.0'
   s.watchos.deployment_target = '6.0'
 
   s.source_files = 'Source/**/*.swift'
 
   s.ios.frameworks = 'Foundation', 'CloudKit', 'CoreData'
   s.osx.frameworks = 'Foundation', 'CloudKit', 'CoreData'
+  s.tvos.frameworks = 'Foundation', 'CloudKit', 'CoreData'
+  s.watchos.frameworks = 'Foundation', 'CloudKit', 'CoreData'
 
   s.swift_versions = [5.1]
   s.documentation_url = 'http://cocoadocs.org/docsets/CloudCore/'

diff --git a/CloudCore.xcodeproj/project.pbxproj b/CloudCore.xcodeproj/project.pbxproj
@@ -864,7 +864,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 6.0;
@@ -919,7 +919,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

diff --git a/Source/Classes/Pull/PullOperation.swift b/Source/Classes/Pull/PullOperation.swift
@@ -35,7 +35,9 @@ public class PullOperation: Operation {
         let convertOperation = RecordToCoreDataOperation(parentContext: context, record: record)
         convertOperation.errorBlock = { self.errorBlock?($0) }
         convertOperation.completionBlock = {
-            self.objectsWithMissingReferences.append(convertOperation.missingObjectsPerEntities)
+            context.performAndWait {
+                self.objectsWithMissingReferences.append(convertOperation.missingObjectsPerEntities)
+            }
         }
         self.queue.addOperation(convertOperation)
     }

diff --git a/Source/Classes/Pull/SubOperations/RecordToCoreDataOperation.swift b/Source/Classes/Pull/SubOperations/RecordToCoreDataOperation.swift
@@ -53,8 +53,8 @@ public class RecordToCoreDataOperation: AsynchronousOperation {
                 self.errorBlock?(error)
             }
 
-            self.state = .finished
         }
+        self.state = .finished
 	}
 
 	/// Create or update existing NSManagedObject from CKRecord