fix pod dependency

attempt sight improvement for the FRC bug workaround #20
watchOS support (fixes #19 )
2026-01-13 04:40:32 +01:00 · 2015-10-23 00:49:34 +09:00 · 2015-10-23 00:40:38 +09:00 · 2015-10-20 21:01:10 +09:00 · 2015-10-20 20:54:09 +09:00 · 2015-10-20 20:38:58 +09:00
19 changed files with 531 additions and 85 deletions
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "1.3.1"
+    s.version = "1.3.2"
    s.license = "MIT"
    s.summary = "Simple, elegant, and smart Core Data programming with Swift"
    s.homepage = "https://github.com/JohnEstropia/CoreStore"
@@ -8,9 +8,10 @@ Pod::Spec.new do |s|
    s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }

    s.ios.deployment_target = "8.0"
+    s.watchos.deployment_target = "2.0"

    s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
-    s.frameworks = "Foundation", "UIKit", "CoreData"
+    s.frameworks = "Foundation", "CoreData"
    s.requires_arc = true
-    s.dependency "GCDKit", "1.1.2"
+    s.dependency "GCDKit", "1.1.3"
 end
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -17,6 +17,66 @@
 		B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; };
 		B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; };
 		B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; };
+		B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321791BD650DE006C9394 /* CoreData.framework */; };
+		B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B563217B1BD650E3006C9394 /* Foundation.framework */; };
+		B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321691BD64F99006C9394 /* GCDKit.framework */; };
+		B563217E1BD65110006C9394 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B563217F1BD65216006C9394 /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321811BD65216006C9394 /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321841BD65216006C9394 /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321861BD65216006C9394 /* CoreStoreLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321871BD65216006C9394 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321881BD65216006C9394 /* BaseDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321891BD65216006C9394 /* AsynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218B1BD65216006C9394 /* UnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EED1AFF846E0064E85B /* UnsafeDataTransaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218C1BD65216006C9394 /* DataStack+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218D1BD65216006C9394 /* CoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218E1BD65216006C9394 /* SaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF21AFF846E0064E85B /* SaveResult.swift */; settings = {ASSET_TAGS = (); }; };
+		B563218F1BD65216006C9394 /* ImportableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321901BD65216006C9394 /* ImportableUniqueObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321931BD65216006C9394 /* DataStack+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321951BD65216006C9394 /* ClauseTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321961BD65216006C9394 /* From.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F011AFF847B0064E85B /* From.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321971BD65216006C9394 /* Select.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F031AFF847B0064E85B /* Select.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321981BD65216006C9394 /* Where.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F051AFF847B0064E85B /* Where.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321991BD65216006C9394 /* OrderBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F041AFF847B0064E85B /* OrderBy.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219A1BD65216006C9394 /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F021AFF847B0064E85B /* GroupBy.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219B1BD65216006C9394 /* Tweak.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F001AFF847B0064E85B /* Tweak.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219C1BD65216006C9394 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */; settings = {ASSET_TAGS = (); }; };
+		B563219F1BD65216006C9394 /* ObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A11BD65216006C9394 /* ListMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ListMonitor.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A21BD65216006C9394 /* ListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ListObserver.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A31BD65216006C9394 /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A51BD65216006C9394 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A61BD65216006C9394 /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321A91BD65219006C9394 /* NSProgress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AA1BD6521C006C9394 /* AssociatedObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AC1BD6521C006C9394 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AD1BD6521C006C9394 /* MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* MigrationManager.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AE1BD6521C006C9394 /* NotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B01BD6521C006C9394 /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B51BD6521C006C9394 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; settings = {ASSET_TAGS = (); }; };
+		B56321B61BD6521C006C9394 /* WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* WeakObject.swift */; settings = {ASSET_TAGS = (); }; };
 		B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; };
 		B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; };
 		B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; };
@@ -25,7 +85,6 @@
 		B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
 		B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; };
 		B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0119FD00C9000E91BB /* Foundation.framework */; };
-		B5D39A0419FD00DE000E91BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0319FD00DE000E91BB /* UIKit.framework */; };
 		B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */; };
 		B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; };
 		B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; };
@@ -75,6 +134,34 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		B56321641BD64F99006C9394 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B563212B1BD6359A006C9394;
+			remoteInfo = "GCDKit OSX";
+		};
+		B56321661BD64F99006C9394 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B56321401BD63D14006C9394;
+			remoteInfo = "GCDKitTests OSX";
+		};
+		B56321681BD64F99006C9394 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B56321501BD6408F006C9394;
+			remoteInfo = "GCDKit watchOS";
+		};
+		B56321771BD650A3006C9394 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = B563214F1BD6408F006C9394;
+			remoteInfo = "GCDKit watchOS";
+		};
 		B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */;
@@ -117,9 +204,14 @@
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
 		B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = "<group>"; };
 		B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = "<group>"; };
+		B5548CD51BD65AE00077652A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		B5548CD71BD65AE50077652A /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B56007101B3F6BD500A9A8F9 /* Into.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Into.swift; sourceTree = "<group>"; };
 		B56007131B3F6C2800A9A8F9 /* SectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionBy.swift; sourceTree = "<group>"; };
 		B56007151B4018AB00A9A8F9 /* MigrationChain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChain.swift; sourceTree = "<group>"; };
+		B563216F1BD65082006C9394 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B56321791BD650DE006C9394 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
+		B563217B1BD650E3006C9394 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Migration.swift"; sourceTree = "<group>"; };
 		B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = "<group>"; };
 		B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFileManager+Setup.swift"; sourceTree = "<group>"; };
@@ -128,7 +220,6 @@
 		B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		B5D372851A39CDDB00F583D9 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = "<group>"; };
 		B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		B5D39A0319FD00DE000E91BB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
 		B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = "<group>"; };
 		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
@@ -186,7 +277,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */,
-				B5D39A0419FD00DE000E91BB /* UIKit.framework in Frameworks */,
 				B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */,
 				2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */,
 			);
@@ -199,6 +289,16 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B563216B1BD65082006C9394 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */,
+				B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */,
+				B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
@@ -218,6 +318,7 @@
 			children = (
 				2F03A53019C5C6DA005002A5 /* CoreStore.framework */,
 				2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */,
+				B563216F1BD65082006C9394 /* CoreStore.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -276,9 +377,12 @@
 		2F291E3119C6D4D3007AF63F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B5548CD71BD65AE50077652A /* CoreData.framework */,
+				B56321791BD650DE006C9394 /* CoreData.framework */,
 				2F03A54C19C5C872005002A5 /* CoreData.framework */,
+				B5548CD51BD65AE00077652A /* Foundation.framework */,
+				B563217B1BD650E3006C9394 /* Foundation.framework */,
 				B5D39A0119FD00C9000E91BB /* Foundation.framework */,
-				B5D39A0319FD00DE000E91BB /* UIKit.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -315,7 +419,10 @@
 			isa = PBXGroup;
 			children = (
 				B5D808021A34715700A44484 /* GCDKit.framework */,
-				B5D808041A34715700A44484 /* GCDKitTests.xctest */,
+				B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */,
+				B56321651BD64F99006C9394 /* GCDKit.framework */,
+				B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */,
+				B56321691BD64F99006C9394 /* GCDKit.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -452,12 +559,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B563216C1BD65082006C9394 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B563217E1BD65110006C9394 /* CoreStore.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
-		2F03A52F19C5C6DA005002A5 /* CoreStore */ = {
+		2F03A52F19C5C6DA005002A5 /* CoreStore iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */;
+			buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore iOS" */;
 			buildPhases = (
 				2F03A52B19C5C6DA005002A5 /* Sources */,
 				2F03A52C19C5C6DA005002A5 /* Frameworks */,
@@ -469,14 +584,14 @@
 			dependencies = (
 				B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */,
 			);
-			name = CoreStore;
+			name = "CoreStore iOS";
 			productName = CoreStore;
 			productReference = 2F03A53019C5C6DA005002A5 /* CoreStore.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		2F03A53A19C5C6DA005002A5 /* CoreStoreTests */ = {
+		2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */;
+			buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests iOS" */;
 			buildPhases = (
 				2F03A53719C5C6DA005002A5 /* Sources */,
 				2F03A53819C5C6DA005002A5 /* Frameworks */,
@@ -487,11 +602,30 @@
 			dependencies = (
 				B5D372881A39CF4D00F583D9 /* PBXTargetDependency */,
 			);
-			name = CoreStoreTests;
+			name = "CoreStoreTests iOS";
 			productName = CoreStoreTests;
 			productReference = 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		B563216E1BD65082006C9394 /* CoreStore watchOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B56321741BD65082006C9394 /* Build configuration list for PBXNativeTarget "CoreStore watchOS" */;
+			buildPhases = (
+				B563216A1BD65082006C9394 /* Sources */,
+				B563216B1BD65082006C9394 /* Frameworks */,
+				B563216C1BD65082006C9394 /* Headers */,
+				B563216D1BD65082006C9394 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				B56321781BD650A3006C9394 /* PBXTargetDependency */,
+			);
+			name = "CoreStore watchOS";
+			productName = "CoreStore watchOS";
+			productReference = B563216F1BD65082006C9394 /* CoreStore.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 /* End PBXNativeTarget section */

 /* Begin PBXProject section */
@@ -508,6 +642,9 @@
 					2F03A53A19C5C6DA005002A5 = {
 						CreatedOnToolsVersion = 6.0;
 					};
+					B563216E1BD65082006C9394 = {
+						CreatedOnToolsVersion = 7.0.1;
+					};
 				};
 			};
 			buildConfigurationList = 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "CoreStore" */;
@@ -529,13 +666,35 @@
 			);
 			projectRoot = "";
 			targets = (
-				2F03A52F19C5C6DA005002A5 /* CoreStore */,
-				2F03A53A19C5C6DA005002A5 /* CoreStoreTests */,
+				2F03A52F19C5C6DA005002A5 /* CoreStore iOS */,
+				2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */,
+				B563216E1BD65082006C9394 /* CoreStore watchOS */,
 			);
 		};
 /* End PBXProject section */

 /* Begin PBXReferenceProxy section */
+		B56321651BD64F99006C9394 /* GCDKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = GCDKit.framework;
+			remoteRef = B56321641BD64F99006C9394 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "GCDKitTests OSX.xctest";
+			remoteRef = B56321661BD64F99006C9394 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B56321691BD64F99006C9394 /* GCDKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = GCDKit.framework;
+			remoteRef = B56321681BD64F99006C9394 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		B5D808021A34715700A44484 /* GCDKit.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -543,10 +702,10 @@
 			remoteRef = B5D808011A34715700A44484 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B5D808041A34715700A44484 /* GCDKitTests.xctest */ = {
+		B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = GCDKitTests.xctest;
+			path = "GCDKitTests iOS.xctest";
 			remoteRef = B5D808031A34715700A44484 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -567,6 +726,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B563216D1BD65082006C9394 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -644,12 +810,80 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B563216A1BD65082006C9394 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B56321A91BD65219006C9394 /* NSProgress+Convenience.swift in Sources */,
+				B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */,
+				B56321AD1BD6521C006C9394 /* MigrationManager.swift in Sources */,
+				B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */,
+				B56321961BD65216006C9394 /* From.swift in Sources */,
+				B56321AA1BD6521C006C9394 /* AssociatedObjects.swift in Sources */,
+				B563218C1BD65216006C9394 /* DataStack+Transaction.swift in Sources */,
+				B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */,
+				B56321891BD65216006C9394 /* AsynchronousDataTransaction.swift in Sources */,
+				B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */,
+				B563217F1BD65216006C9394 /* CoreStore.swift in Sources */,
+				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
+				B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */,
+				B56321811BD65216006C9394 /* DataStack.swift in Sources */,
+				B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */,
+				B56321981BD65216006C9394 /* Where.swift in Sources */,
+				B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */,
+				B56321971BD65216006C9394 /* Select.swift in Sources */,
+				B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */,
+				B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */,
+				B563219C1BD65216006C9394 /* SectionBy.swift in Sources */,
+				B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */,
+				B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */,
+				B56321AE1BD6521C006C9394 /* NotificationObserver.swift in Sources */,
+				B56321931BD65216006C9394 /* DataStack+Querying.swift in Sources */,
+				B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */,
+				B56321A11BD65216006C9394 /* ListMonitor.swift in Sources */,
+				B56321881BD65216006C9394 /* BaseDataTransaction.swift in Sources */,
+				B56321A31BD65216006C9394 /* DataStack+Migration.swift in Sources */,
+				B56321901BD65216006C9394 /* ImportableUniqueObject.swift in Sources */,
+				B56321871BD65216006C9394 /* Into.swift in Sources */,
+				B563219A1BD65216006C9394 /* GroupBy.swift in Sources */,
+				B563219B1BD65216006C9394 /* Tweak.swift in Sources */,
+				B56321B51BD6521C006C9394 /* NSManagedObjectModel+Setup.swift in Sources */,
+				B563218F1BD65216006C9394 /* ImportableObject.swift in Sources */,
+				B56321991BD65216006C9394 /* OrderBy.swift in Sources */,
+				B56321A51BD65216006C9394 /* MigrationChain.swift in Sources */,
+				B56321B01BD6521C006C9394 /* NSManagedObject+Transaction.swift in Sources */,
+				B563218E1BD65216006C9394 /* SaveResult.swift in Sources */,
+				B56321A21BD65216006C9394 /* ListObserver.swift in Sources */,
+				B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */,
+				B563219F1BD65216006C9394 /* ObjectMonitor.swift in Sources */,
+				B56321B61BD6521C006C9394 /* WeakObject.swift in Sources */,
+				B56321AC1BD6521C006C9394 /* Functions.swift in Sources */,
+				B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */,
+				B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */,
+				B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */,
+				B563218D1BD65216006C9394 /* CoreStore+Transaction.swift in Sources */,
+				B563218B1BD65216006C9394 /* UnsafeDataTransaction.swift in Sources */,
+				B56321A61BD65216006C9394 /* MigrationType.swift in Sources */,
+				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,
+				B56321861BD65216006C9394 /* CoreStoreLogger.swift in Sources */,
+				B56321841BD65216006C9394 /* DefaultLogger.swift in Sources */,
+				B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */,
+				B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */,
+				B56321951BD65216006C9394 /* ClauseTypes.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
+		B56321781BD650A3006C9394 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "GCDKit watchOS";
+			targetProxy = B56321771BD650A3006C9394 /* PBXContainerItemProxy */;
+		};
 		B5D372881A39CF4D00F583D9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 2F03A52F19C5C6DA005002A5 /* CoreStore */;
+			target = 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */;
 			targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */;
 		};
 		B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */ = {
@@ -762,9 +996,9 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = CoreStore;
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
 		};
@@ -782,7 +1016,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = CoreStore;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
@@ -792,10 +1026,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -803,7 +1033,7 @@
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = CoreStoreTests;
 			};
 			name = Debug;
 		};
@@ -811,14 +1041,55 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = CoreStoreTests;
+			};
+			name = Release;
+		};
+		B56321751BD65082006C9394 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStore/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
+				PRODUCT_NAME = CoreStore;
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+			};
+			name = Debug;
+		};
+		B56321761BD65082006C9394 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStore/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
+				PRODUCT_NAME = CoreStore;
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -834,7 +1105,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */ = {
+		2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				2F03A54419C5C6DA005002A5 /* Debug */,
@@ -843,7 +1114,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */ = {
+		2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				2F03A54719C5C6DA005002A5 /* Debug */,
@@ -852,6 +1123,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		B56321741BD65082006C9394 /* Build configuration list for PBXNativeTarget "CoreStore watchOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B56321751BD65082006C9394 /* Debug */,
+				B56321761BD65082006C9394 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */

 /* Begin XCVersionGroup section */
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore.xcscheme
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore.xcscheme
@@ -16,7 +16,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
               BuildableName = "CoreStore.framework"
-               BlueprintName = "CoreStore"
+               BlueprintName = "CoreStore iOS"
               ReferencedContainer = "container:CoreStore.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -30,7 +30,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests"
+               BlueprintName = "CoreStoreTests iOS"
               ReferencedContainer = "container:CoreStore.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -48,7 +48,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests"
+               BlueprintName = "CoreStoreTests iOS"
               ReferencedContainer = "container:CoreStore.xcodeproj">
            </BuildableReference>
         </TestableReference>
@@ -58,7 +58,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
            ReferencedContainer = "container:CoreStore.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -80,7 +80,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
            ReferencedContainer = "container:CoreStore.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -98,7 +98,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "2F03A52F19C5C6DA005002A5"
            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore"
+            BlueprintName = "CoreStore iOS"
            ReferencedContainer = "container:CoreStore.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0700"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B563216E1BD65082006C9394"
+               BuildableName = "CoreStore.framework"
+               BlueprintName = "CoreStore watchOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B563216E1BD65082006C9394"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore watchOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B563216E1BD65082006C9394"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore watchOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/CoreStore/CoreStore.h
+++ b/CoreStore/CoreStore.h
@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //

+#import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>

 FOUNDATION_EXPORT double CoreStoreVersionNumber;
--- a/Clauses/OrderBy.swift
+++ b/Clauses/OrderBy.swift
@@ -24,6 +24,7 @@
 //

 import Foundation
+import CoreData


 public func +(left: OrderBy, right: OrderBy) -> OrderBy {
--- a/Clauses/Where.swift
+++ b/Clauses/Where.swift
@@ -24,6 +24,7 @@
 //

 import Foundation
+import CoreData


 public func &&(left: Where, right: Where) -> Where {
--- a/Querying/CoreStore+Querying.swift
+++ b/Querying/CoreStore+Querying.swift
@@ -24,6 +24,8 @@
 //

 import Foundation
+import CoreData
+

 // MARK: - CoreStore

--- a/CoreStore/Info.plist
+++ b/CoreStore/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStore/Internal/FetchedResultsControllerDelegate.swift
+++ b/CoreStore/Internal/FetchedResultsControllerDelegate.swift
@@ -49,6 +49,8 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
    
    // MARK: Internal
    
+    internal var enabled = true
+    
    internal weak var handler: FetchedResultsControllerHandler?
    internal weak var fetchedResultsController: NSFetchedResultsController? {
        
@@ -69,6 +71,11 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
    
    @objc dynamic func controllerWillChangeContent(controller: NSFetchedResultsController) {
        
+        guard self.enabled else {
+            
+            return
+        }
+        
        self.deletedSections = []
        self.insertedSections = []
        
@@ -77,49 +84,38 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
    
    @objc dynamic func controllerDidChangeContent(controller: NSFetchedResultsController) {
        
+        guard self.enabled else {
+            
+            return
+        }
+        
        self.handler?.controllerDidChangeContent(controller)
    }
    
    @objc dynamic func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
        
-        if #available(iOS 9, *) {
+        guard self.enabled else {
            
-            self.handler?.controller(
-                controller,
-                didChangeObject: anObject,
-                atIndexPath: indexPath,
-                forChangeType: type,
-                newIndexPath: newIndexPath
-            )
            return
        }
        
-        // Workaround a nasty bug introduced in XCode 7 targeted at iOS 8 devices
+        guard let actualType = NSFetchedResultsChangeType(rawValue: type.rawValue) else {
+            
+            // This fix is for a bug where iOS passes 0 for NSFetchedResultsChangeType, but this is not a valid enum case.
+            // Swift will then always execute the first case of the switch causing strange behaviour.
+            // https://forums.developer.apple.com/thread/12184#31850
+            return
+        }
+        
+        // This whole dance is a workaround for a nasty bug introduced in XCode 7 targeted at iOS 8 devices
        // http://stackoverflow.com/questions/31383760/ios-9-attempt-to-delete-and-reload-the-same-index-path/31384014#31384014
        // https://forums.developer.apple.com/message/9998#9998
        // https://forums.developer.apple.com/message/31849#31849
-        switch type {
-            
-        case .Move:
-            guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
-                
-                return
-            }
-            if indexPath == newIndexPath
-                && self.deletedSections.contains(indexPath.section) {
-                    
-                    self.handler?.controller(
-                        controller,
-                        didChangeObject: anObject,
-                        atIndexPath: nil,
-                        forChangeType: .Insert,
-                        newIndexPath: indexPath
-                    )
-                    return
-            }
+        
+        switch actualType {
            
        case .Update:
-            guard let section = indexPath?.section else {
+            guard let section = indexPath?.indexAtPosition(0) else {
                
                return
            }
@@ -129,6 +125,47 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
                    return
            }
            
+        case .Move:
+            guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
+                
+                return
+            }
+            guard indexPath == newIndexPath else {
+                
+                break
+            }
+            if self.insertedSections.contains(indexPath.indexAtPosition(0)) {
+                
+                // Observers that handle the .Move change are advised to delete then reinsert the object instead of just moving. This is especially true when indexPath and newIndexPath are equal. For example, calling tableView.moveRowAtIndexPath(_:toIndexPath) when both indexPaths are the same will crash the tableView.
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: indexPath,
+                    forChangeType: .Move,
+                    newIndexPath: newIndexPath
+                )
+                return
+            }
+            if self.deletedSections.contains(indexPath.indexAtPosition(0)) {
+                
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: nil,
+                    forChangeType: .Insert,
+                    newIndexPath: indexPath
+                )
+                return
+            }
+            self.handler?.controller(
+                controller,
+                didChangeObject: anObject,
+                atIndexPath: indexPath,
+                forChangeType: .Update,
+                newIndexPath: nil
+            )
+            return
+            
        default:
            break
        }
@@ -137,13 +174,18 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult
            controller,
            didChangeObject: anObject,
            atIndexPath: indexPath,
-            forChangeType: type,
+            forChangeType: actualType,
            newIndexPath: newIndexPath
        )
    }
    
    @objc dynamic func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
        
+        guard self.enabled else {
+            
+            return
+        }
+        
        switch type {
            
        case .Delete:   self.deletedSections.insert(sectionIndex)
--- a/CoreStore/Migrating/DataStack+Migration.swift
+++ b/CoreStore/Migrating/DataStack+Migration.swift
@@ -146,7 +146,8 @@ public extension DataStack {
            
            let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
            )
            
            return self.upgradeSQLiteStoreIfNeeded(
@@ -265,7 +266,8 @@ public extension DataStack {
            
            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
            )
        }
        catch {
@@ -323,7 +325,8 @@ public extension DataStack {
            
            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
                NSSQLiteStoreType,
-                URL: fileURL
+                URL: fileURL,
+                options: self.optionsForSQLiteStore()
            )
        }
        catch {
--- a/CoreStore/NSError+CoreStore.swift
+++ b/CoreStore/NSError+CoreStore.swift
@@ -24,6 +24,7 @@
 //

 import Foundation
+import CoreData

 /**
 The `NSError` error domain for `CoreStore`.
--- a/CoreStore/Observing/ListMonitor.swift
+++ b/CoreStore/Observing/ListMonitor.swift
@@ -102,7 +102,7 @@ public final class ListMonitor<T: NSManagedObject> {
    */
    public subscript(sectionIndex: Int, itemIndex: Int) -> T {
        
-        return self[NSIndexPath(forItem: itemIndex, inSection: sectionIndex)]
+        return self[NSIndexPath(indexes: [sectionIndex, itemIndex], length: 2)]
    }
    
    /**
@@ -157,7 +157,10 @@ public final class ListMonitor<T: NSManagedObject> {
    */
    public subscript(safeIndexPath indexPath: NSIndexPath) -> T? {
        
-        return self[safeSectionIndex: indexPath.section, safeItemIndex: indexPath.item]
+        return self[
+            safeSectionIndex: indexPath.indexAtPosition(0),
+            safeItemIndex: indexPath.indexAtPosition(1)
+        ]
    }
    
    /**
@@ -840,7 +843,7 @@ public final class ListMonitor<T: NSManagedObject> {
                return
            }
            
-            strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = nil
+            strongSelf.fetchedResultsControllerDelegate.enabled = false
            
            let fetchRequest = strongSelf.fetchedResultsController.fetchRequest
            for clause in fetchClauses {
@@ -864,7 +867,7 @@ public final class ListMonitor<T: NSManagedObject> {
                        return
                    }
                    
-                    strongSelf.fetchedResultsControllerDelegate.fetchedResultsController = strongSelf.fetchedResultsController
+                    strongSelf.fetchedResultsControllerDelegate.enabled = true
                    strongSelf.isPendingRefetch = false
                    
                    NSNotificationCenter.defaultCenter().postNotificationName(
@@ -924,6 +927,11 @@ public final class ListMonitor<T: NSManagedObject> {
        try! fetchedResultsController.performFetch()
    }
    
+    deinit {
+        
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
+    }
+    
    
    // MARK: Private
    
@@ -1133,7 +1141,7 @@ extension ListMonitor: FetchedResultsControllerHandler {
    }
    
   internal func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String?) -> String? {
-        
+    
        return self.sectionIndexTransformer(sectionName: sectionName)
    }
 }
--- a/CoreStore/Observing/ObjectMonitor.swift
+++ b/CoreStore/Observing/ObjectMonitor.swift
@@ -198,6 +198,11 @@ public final class ObjectMonitor<T: NSManagedObject> {
        self.lastCommittedAttributes = (self.object?.committedValuesForKeys(nil) as? [String: NSObject]) ?? [:]
    }
    
+    deinit {
+        
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
+    }
+    
    
    // MARK: Private
    
--- a/Processing/UnsafeDataTransaction.swift
+++ b/Processing/UnsafeDataTransaction.swift
@@ -24,6 +24,7 @@
 //

 import Foundation
+import CoreData
 import GCDKit


--- a/Up/DataStack.swift
+++ b/Up/DataStack.swift
@@ -213,6 +213,7 @@ public final class DataStack {
        
        var store: NSPersistentStore?
        var storeError: NSError?
+        let options = self.optionsForSQLiteStore()
        coordinator.performBlockAndWait {
            
            do {
@@ -221,7 +222,7 @@ public final class DataStack {
                    NSSQLiteStoreType,
                    configuration: configuration,
                    URL: fileURL,
-                    options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+                    options: options
                )
            }
            catch {
@@ -293,6 +294,11 @@ public final class DataStack {
        return migrationQueue
    }()
    
+    internal func optionsForSQLiteStore() -> [String: AnyObject] {
+        
+        return [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+    }
+    
    internal func entityNameForEntityClass(entityClass: AnyClass) -> String? {
        
        return self.model.entityNameForClass(entityClass)
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -48,6 +48,13 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		B56321C51BD65965006C9394 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B563216F1BD65082006C9394;
+			remoteInfo = "CoreStore watchOS";
+		};
 		B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
@@ -279,7 +286,8 @@
 			isa = PBXGroup;
 			children = (
 				B583A91B1AF5F4F4001F76AF /* CoreStore.framework */,
-				B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */,
+				B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */,
+				B56321C61BD65965006C9394 /* CoreStore.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -347,6 +355,13 @@
 /* End PBXProject section */

 /* Begin PBXReferenceProxy section */
+		B56321C61BD65965006C9394 /* CoreStore.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = CoreStore.framework;
+			remoteRef = B56321C51BD65965006C9394 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -354,10 +369,10 @@
 			remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = {
+		B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = CoreStoreTests.xctest;
+			path = "CoreStoreTests iOS.xctest";
 			remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
--- a/CoreStoreTests/CoreStoreTests.swift
+++ b/CoreStoreTests/CoreStoreTests.swift
@@ -23,7 +23,6 @@
 //  SOFTWARE.
 //

-import UIKit
 import XCTest

@testable
--- a/Libraries/GCDKit
+++ b/Libraries/GCDKit
Author	SHA1	Message	Date
John Rommel Estropia	91aef44803	fix pod dependency	2015-10-23 00:49:34 +09:00
John Rommel Estropia	dcfb09eda7	attempt sight improvement for the FRC bug workaround #20	2015-10-23 00:40:38 +09:00
John Estropia	9ca83d9c5d	watchOS support (fixes #19 )	2015-10-20 21:01:10 +09:00
John Estropia	b00eaf2d0b	fix warnings on watchOS	2015-10-20 20:54:09 +09:00
John Estropia	dc8bdf3bad	watch OS support	2015-10-20 20:38:58 +09:00
John Estropia	4792c4462e	fix section index titles when refetching a listMonitor	2015-10-15 18:29:08 +09:00
John Estropia	524757a7cf	just a safety measure for the rare case that the FRC delegate gets released earlier than the FRC	2015-10-13 10:47:48 +09:00
John Rommel Estropia	0b6298a802	tidy up	2015-10-07 00:57:48 +09:00
John Estropia	ae77558ae8	Merge pull request #16 from mac-cain13/patch-1 Fix FRCdelegate issue where invalid type is passed	2015-10-07 00:44:15 +09:00
Mathijs Kadijk	d33aa9c5cf	Fix FRCdelegate issue where invalid type is passed See also https://forums.developer.apple.com/thread/12184#31850	2015-10-06 15:30:22 +02:00
John Estropia	d89319d324	Workaround for Xcode 7.0.1+iOS 9 FRC bug	2015-09-30 11:41:27 +09:00