updated travis.yml

Let ListMonitor expose methods for Section Indexes (fixes #32 )
Merge branch 'master' into develop
2026-01-12 04:10:36 +01:00 · 2016-01-06 19:29:58 +09:00 · 2016-01-06 19:16:46 +09:00 · 2016-01-06 18:45:45 +09:00 · 2016-01-04 19:38:42 +09:00 · 2016-01-04 19:38:11 +09:00
38 changed files with 595 additions and 406 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata
 CoreStore.xcodeproj/project.xcworkspace/xcuserdata
 CoreStore.xcodeproj/xcuserdata
 CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata
+Carthage/Build
+CoreStore.xcworkspace/xcuserdata
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Libraries/GCDKit"]
-	path = Libraries/GCDKit
-	url = git@github.com:JohnEstropia/GCDKit.git
+[submodule "Carthage/Checkouts/GCDKit"]
+	path = Carthage/Checkouts/GCDKit
+	url = https://github.com/JohnEstropia/GCDKit.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,40 @@
+language: objective-c
+osx_image: xcode7.1
+sudo: false
+git:
+  submodules: false
+notifications:
+  email: false
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  matrix:
+    - DESTINATION="OS=9.1,name=iPhone 6s" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.4,name=iPhone 6" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
+    - DESTINATION="OS=8.2,name=iPhone 5" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="arch=x86_64" SCHEME="CoreStore OSX" SDK=macosx10.11 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=2.0,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.0 RUN_TESTS="NO" POD_LINT="NO"
+before_install:
+  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
+  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+  - brew update
+  - brew install carthage
+before_script:
+  - carthage update --use-submodules
+script:
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+  - if [ $RUN_TESTS == "YES" ]; then 
+      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+    fi
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - if [ $POD_LINT == "YES" ]; then
+      pod lib lint --quick;
+    fi
--- a/1
+++ b/1
@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" == 1.1.5
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" "1.1.5"
--- a/Carthage/Checkouts/GCDKit
+++ b/Carthage/Checkouts/GCDKit
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "1.3.3"
+    s.version = "1.4.2"
    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"
@@ -12,8 +12,10 @@ Pod::Spec.new do |s|
    s.watchos.deployment_target = "2.0"

    s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
-    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift"
+    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
    s.frameworks = "Foundation", "CoreData"
    s.requires_arc = true
-    s.dependency "GCDKit", "1.1.3"
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
+    
+    s.dependency "GCDKit", "1.1.5"
 end
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -13,8 +13,9 @@
 		2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
 		B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; };
 		B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; };
+		B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
+		B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
 		B52DD17E1BE1F8CD00949AFE /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52DD1741BE1F8CC00949AFE /* CoreStore.framework */; };
-		B52DD1901BE1F8E600949AFE /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; };
 		B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD51BD65AE00077652A /* Foundation.framework */; };
 		B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5548CD71BD65AE50077652A /* CoreData.framework */; };
 		B52DD1931BE1F8FD00949AFE /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -76,7 +77,6 @@
 		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 */; };
 		B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; };
@@ -138,12 +138,13 @@
 		B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; };
 		B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; };
 		B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; };
+		B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; };
+		B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; };
 		B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; };
 		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 */; };
 		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 */; };
 		B5E834BB1B7691F3001D3D50 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; };
 		B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; };
@@ -198,41 +199,6 @@
 			remoteGlobalIDString = B52DD1731BE1F8CC00949AFE;
 			remoteInfo = "CoreStore OSX";
 		};
-		B52DD18E1BE1F8DC00949AFE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B563212A1BD6359A006C9394;
-			remoteInfo = "GCDKit OSX";
-		};
-		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 */;
@@ -240,27 +206,6 @@
 			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
 			remoteInfo = CoreStore;
 		};
-		B5D808011A34715700A44484 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2FBBCACB19A9FE610070E4AB;
-			remoteInfo = GCDKit;
-		};
-		B5D808031A34715700A44484 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2FBBCAD619A9FE610070E4AB;
-			remoteInfo = GCDKitTests;
-		};
-		B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2FBBCACA19A9FE610070E4AB;
-			remoteInfo = GCDKit;
-		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
@@ -274,6 +219,7 @@
 		2F291E2619C6D3CF007AF63F /* CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStore.swift; sourceTree = "<group>"; };
 		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>"; };
+		B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFetchedResultsController+Convenience.swift"; sourceTree = "<group>"; };
 		B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = "<group>"; };
@@ -289,13 +235,15 @@
 		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>"; };
 		B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = "<group>"; };
+		B5BDC91A1C202269008147CD /* CartFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CartFile; sourceTree = "<group>"; };
+		B5BDC91C1C2023CF008147CD /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<group>"; };
+		B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
 		B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+CoreStore.swift"; sourceTree = "<group>"; };
 		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; };
 		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; };
+		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
 		B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
 		B5E834BA1B7691F3001D3D50 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
 		B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
@@ -349,7 +297,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */,
+				B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */,
 				B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */,
 				2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */,
 			);
@@ -366,9 +314,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */,
 				B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */,
 				B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */,
-				B52DD1901BE1F8E600949AFE /* GCDKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -384,7 +332,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */,
 				B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */,
 				B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */,
 			);
@@ -396,7 +343,6 @@
 		2F03A52619C5C6DA005002A5 = {
 			isa = PBXGroup;
 			children = (
-				B5D806BB1A34715700A44484 /* Libraries */,
 				2F291E3119C6D4D3007AF63F /* Frameworks */,
 				2F03A53219C5C6DA005002A5 /* CoreStore */,
 				2F03A53C19C5C6DA005002A5 /* CoreStoreTests */,
@@ -443,6 +389,8 @@
 				B5E84ED81AFF82360064E85B /* README.md */,
 				B5E84ED91AFF82360064E85B /* LICENSE */,
 				B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */,
+				B5BDC91A1C202269008147CD /* CartFile */,
+				B5BDC9271C2024F2008147CD /* .travis.yml */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -470,6 +418,7 @@
 		2F291E3119C6D4D3007AF63F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B5BDC91C1C2023CF008147CD /* GCDKit.framework */,
 				B5548CD71BD65AE50077652A /* CoreData.framework */,
 				B56321791BD650DE006C9394 /* CoreData.framework */,
 				2F03A54C19C5C872005002A5 /* CoreData.framework */,
@@ -492,34 +441,6 @@
 			path = Migrating;
 			sourceTree = "<group>";
 		};
-		B5D806BB1A34715700A44484 /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				B5D806BC1A34715700A44484 /* GCDKit */,
-			);
-			path = Libraries;
-			sourceTree = "<group>";
-		};
-		B5D806BC1A34715700A44484 /* GCDKit */ = {
-			isa = PBXGroup;
-			children = (
-				B5D806C51A34715700A44484 /* GCDKit.xcodeproj */,
-			);
-			path = GCDKit;
-			sourceTree = "<group>";
-		};
-		B5D806C61A34715700A44484 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B5D808021A34715700A44484 /* GCDKit.framework */,
-				B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */,
-				B56321651BD64F99006C9394 /* GCDKit.framework */,
-				B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */,
-				B56321691BD64F99006C9394 /* GCDKit.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		B5E834B61B7630BD001D3D50 /* Importing Data */ = {
 			isa = PBXGroup;
 			children = (
@@ -617,6 +538,7 @@
 			children = (
 				B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */,
 				B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */,
+				B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */,
 			);
 			path = "Convenience Helpers";
 			sourceTree = "<group>";
@@ -683,7 +605,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */,
 			);
 			name = "CoreStore iOS";
 			productName = CoreStore;
@@ -720,7 +641,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B52DD18F1BE1F8DC00949AFE /* PBXTargetDependency */,
 			);
 			name = "CoreStore OSX";
 			productName = "CoreStore OSX";
@@ -757,7 +677,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B56321781BD650A3006C9394 /* PBXTargetDependency */,
 			);
 			name = "CoreStore watchOS";
 			productName = "CoreStore watchOS";
@@ -802,12 +721,6 @@
 			mainGroup = 2F03A52619C5C6DA005002A5;
 			productRefGroup = 2F03A53119C5C6DA005002A5 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = B5D806C61A34715700A44484 /* Products */;
-					ProjectRef = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				2F03A52F19C5C6DA005002A5 /* CoreStore iOS */,
@@ -819,44 +732,6 @@
 		};
 /* 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;
-			path = GCDKit.framework;
-			remoteRef = B5D808011A34715700A44484 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "GCDKitTests iOS.xctest";
-			remoteRef = B5D808031A34715700A44484 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		2F03A52E19C5C6DA005002A5 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -918,6 +793,7 @@
 				B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */,
 				B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */,
 				B5E84F111AFF847B0064E85B /* Select.swift in Sources */,
+				B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */,
 				B5E84F251AFF84860064E85B /* ObjectObserver.swift in Sources */,
 				B5E84F2F1AFF849C0064E85B /* NotificationObserver.swift in Sources */,
@@ -1056,6 +932,7 @@
 				B56321811BD65216006C9394 /* DataStack.swift in Sources */,
 				B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */,
 				B56321981BD65216006C9394 /* Where.swift in Sources */,
+				B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */,
 				B56321971BD65216006C9394 /* Select.swift in Sources */,
 				B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */,
@@ -1107,26 +984,11 @@
 			target = B52DD1731BE1F8CC00949AFE /* CoreStore OSX */;
 			targetProxy = B52DD17F1BE1F8CD00949AFE /* PBXContainerItemProxy */;
 		};
-		B52DD18F1BE1F8DC00949AFE /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "GCDKit OSX";
-			targetProxy = B52DD18E1BE1F8DC00949AFE /* PBXContainerItemProxy */;
-		};
-		B56321781BD650A3006C9394 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "GCDKit watchOS";
-			targetProxy = B56321771BD650A3006C9394 /* PBXContainerItemProxy */;
-		};
 		B5D372881A39CF4D00F583D9 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */;
 			targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */;
 		};
-		B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = GCDKit;
-			targetProxy = B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */;
-		};
 /* End PBXTargetDependency section */

 /* Begin XCBuildConfiguration section */
@@ -1166,14 +1028,17 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS -D DEBUG";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Debug;
 		};
@@ -1199,6 +1064,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1206,14 +1072,17 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_SWIFT_FLAGS = "-D USE_FRAMEWORKS";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
+				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
 			name = Release;
 		};
@@ -1225,16 +1094,12 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = 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";
-				OTHER_SWIFT_FLAGS = "-D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStore;
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
 		};
@@ -1246,21 +1111,19 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = 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.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStore;
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
 		2F03A54719C5C6DA005002A5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1270,12 +1133,14 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
 		};
 		2F03A54819C5C6DA005002A5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1300,7 +1165,6 @@
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = macosx;
@@ -1325,7 +1189,6 @@
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = macosx;
@@ -1336,22 +1199,24 @@
 		B52DD1871BE1F8CD00949AFE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
 		};
 		B52DD1881BE1F8CD00949AFE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
@@ -1359,7 +1224,6 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = macosx;
@@ -1377,14 +1241,12 @@
 				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;
 		};
@@ -1400,14 +1262,12 @@
 				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;
 		};
--- a/CoreStore.xcworkspace/contents.xcworkspacedata
+++ b/CoreStore.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:CoreStore.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:CoreStoreDemo/CoreStoreDemo.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Carthage/Checkouts/GCDKit/GCDKit.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint
+++ b/CoreStore.xcworkspace/xcshareddata/CoreStore.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "EBFDEFFE-8BA0-441A-862A-1DE28AA5CD21",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStore\/Carthage\/Checkouts\/GCDKit\/",
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStore.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/CoreStore",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JohnEstropia\/GCDKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
+    }
+  ]
+}
--- a/CoreStore/CartFile
+++ b/CoreStore/CartFile
@@ -0,0 +1 @@
+github "JohnEstropia/GCDKit" == 1.1.5
--- a/Helpers/NSFetchedResultsController+Convenience.swift
+++ b/Helpers/NSFetchedResultsController+Convenience.swift
@@ -0,0 +1,50 @@
+//
+//  NSManagedObject+Convenience.swift
+//  CoreStore
+//
+//  Copyright (c) 2015 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - NSFetchedResultsController
+
+public extension NSFetchedResultsController {
+    
+    public convenience init<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) {
+        
+        let context = dataStack.mainContext
+        from?.applyToFetchRequest(fetchRequest, context: context)
+        for clause in fetchClauses {
+            
+            clause.applyToFetchRequest(fetchRequest)
+        }
+        
+        self.init(
+            fetchRequest: fetchRequest,
+            managedObjectContext: context,
+            sectionNameKeyPath: sectionBy?.sectionKeyPath,
+            cacheName: nil
+        )
+    }
+}
--- a/Helpers/NSProgress+Convenience.swift
+++ b/Helpers/NSProgress+Convenience.swift
@@ -24,7 +24,9 @@
 //

 import Foundation
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - NSProgress
--- a/CoreStore/CoreStore.swift
+++ b/CoreStore/CoreStore.swift
@@ -24,7 +24,9 @@
 //

 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - CoreStore
--- a/Querying/DataStack+Querying.swift
+++ b/Querying/DataStack+Querying.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - DataStack
--- a/Data/BaseDataTransaction+Importing.swift
+++ b/Data/BaseDataTransaction+Importing.swift
@@ -123,6 +123,11 @@ public extension BaseDataTransaction {
                
                if let object = self.fetchOne(From(T), Where(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                    
+                    guard T.shouldUpdateFromImportSource(source, inTransaction: self) else {
+                    
+                        return nil
+                    }
+                    
                    try object.updateFromImportSource(source, inTransaction: self)
                    return object
                }
--- a/CoreStore/Info.plist
+++ b/CoreStore/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.3</string>
+	<string>1.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - NSManagedObjectContext
--- a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - NSManagedObjectContext
--- a/CoreStore/Internal/NSManagedObjectModel+Setup.swift
+++ b/CoreStore/Internal/NSManagedObjectModel+Setup.swift
@@ -65,10 +65,13 @@ internal extension NSManagedObjectModel {
        }
        else if let resolvedVersion = modelVersions.first ?? modelVersionHints.first {
            
-            CoreStore.log(
-                .Warning,
-                message: "The MigrationChain leaf versions do not include any of the model file's embedded versions. Resolving to version \"\(resolvedVersion)\"."
-            )
+            if !modelVersionHints.isEmpty {
+                
+                CoreStore.log(
+                    .Warning,
+                    message: "The MigrationChain leaf versions do not include any of the model file's embedded versions. Resolving to version \"\(resolvedVersion)\"."
+                )
+            }
            currentModelVersion = resolvedVersion
        }
        else {
--- a/CoreStore/Migrating/CoreStore+Migration.swift
+++ b/CoreStore/Migrating/CoreStore+Migration.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - CoreStore
--- a/CoreStore/Migrating/DataStack+Migration.swift
+++ b/CoreStore/Migrating/DataStack+Migration.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - DataStack
--- a/CoreStore/Observing/CoreStore+Observing.swift
+++ b/CoreStore/Observing/CoreStore+Observing.swift
@@ -72,6 +72,30 @@ public extension CoreStore {
        return self.defaultStack.monitorList(from, queryClauses)
    }
    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: FetchClause...) {
+        
+        self.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: [FetchClause])  {
+        
+        self.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
    /**
    Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
    
@@ -99,4 +123,30 @@ public extension CoreStore {
        
        return self.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
    }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) {
+        
+        self.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public static func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) {
+        
+        self.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
 }
--- a/CoreStore/Observing/DataStack+Observing.swift
+++ b/CoreStore/Observing/DataStack+Observing.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - DataStack
@@ -95,6 +97,45 @@ public extension DataStack {
        )
    }
    
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: FetchClause...) {
+        
+        self.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: [FetchClause])  {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            dataStack: self,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+    
    /**
    Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
    
@@ -136,4 +177,45 @@ public extension DataStack {
            fetchClauses: fetchClauses
        )
    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) {
+        
+        self.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            dataStack: self,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
 }
--- a/CoreStore/Observing/ListMonitor.swift
+++ b/CoreStore/Observing/ListMonitor.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - ListMonitor
@@ -333,6 +335,56 @@ public final class ListMonitor<T: NSManagedObject> {
        return sections[section]
    }
    
+    /**
+     Returns the `NSFetchedResultsSectionInfo`s for all sections
+     
+     - returns: the `NSFetchedResultsSectionInfo`s for all sections
+     */
+    @warn_unused_result
+    public func sections() -> [NSFetchedResultsSectionInfo] {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sections ?? []
+    }
+    
+    /**
+     Returns the target section for a specified "Section Index" title and index.
+     
+     - parameter title: the title of the Section Index
+     - parameter index: the index of the Section Index
+     - returns: the target section for the specified "Section Index" title and index.
+     */
+    @warn_unused_result
+    public func targetSectionForSectionIndex(title title: String, index: Int) -> Int {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sectionForSectionIndexTitle(title, atIndex: index)
+    }
+    
+    /**
+     Returns the section index titles for all sections
+     
+     - returns: the section index titles for all sections
+     */
+    @warn_unused_result
+    public func sectionIndexTitles() -> [String] {
+        
+        CoreStore.assert(
+            !self.isPendingRefetch || NSThread.isMainThread(),
+            "Attempted to access a \(typeName(self)) outside the main thread while a refetch is in progress."
+        )
+        
+        return self.fetchedResultsController.sectionIndexTitles
+    }
+    
    /**
    Returns the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
    
@@ -883,29 +935,53 @@ public final class ListMonitor<T: NSManagedObject> {
    
    // MARK: Internal
    
-    internal init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
+    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
+     
+        self.init(
+            dataStack: dataStack,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            prepareFetch: { _, performFetch in performFetch() }
+        )
+    }
+    
+    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: (ListMonitor<T>) -> Void) {
        
-        let context = dataStack.mainContext
+        self.init(
+            dataStack: dataStack,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            prepareFetch: { listMonitor, performFetch in
+                
+                dataStack.childTransactionQueue.async {
+                    
+                    performFetch()
+                    GCDQueue.Main.async {
+                        
+                        createAsynchronously(listMonitor)
+                    }
+                }
+            }
+        )
+    }
+    
+    private init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], prepareFetch: (ListMonitor<T>, () -> Void) -> Void) {
        
        let fetchRequest = NSFetchRequest()
-        from.applyToFetchRequest(fetchRequest, context: context)
-        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
        fetchRequest.fetchBatchSize = 20
        fetchRequest.includesPendingChanges = false
        fetchRequest.shouldRefreshRefetchedObjects = true
        
-        for clause in fetchClauses {
-            
-            clause.applyToFetchRequest(fetchRequest)
-        }
-        
        let fetchedResultsController = NSFetchedResultsController(
+            dataStack: dataStack,
            fetchRequest: fetchRequest,
-            managedObjectContext: context,
-            sectionNameKeyPath: sectionBy?.sectionKeyPath,
-            cacheName: nil
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
        )
        
        let fetchedResultsControllerDelegate = FetchedResultsControllerDelegate()
@@ -925,7 +1001,8 @@ public final class ListMonitor<T: NSManagedObject> {
        
        fetchedResultsControllerDelegate.handler = self
        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetch()
+        
+        prepareFetch(self, { try! fetchedResultsController.performFetch() })
    }
    
    deinit {
--- a/CoreStore/Observing/ListObserver.swift
+++ b/CoreStore/Observing/ListObserver.swift
@@ -205,7 +205,6 @@ public protocol ListSectionObserver: ListObjectObserver {
    - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section
    - parameter sectionIndex: the new section index for the new section
     */
-    @available(iOS 8.0, *)
    func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int)
    
    /**
@@ -215,7 +214,6 @@ public protocol ListSectionObserver: ListObjectObserver {
    - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section
    - parameter sectionIndex: the previous section index for the deleted section
     */
-    @available(iOS 8.0, *)
    func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int)
 }

--- a/CoreStore/Observing/ObjectMonitor.swift
+++ b/CoreStore/Observing/ObjectMonitor.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - ObjectMonitor
@@ -165,25 +167,18 @@ public final class ObjectMonitor<T: NSManagedObject> {
    
    internal init(dataStack: DataStack, object: T) {
        
-        let context = dataStack.mainContext
-        
        let fetchRequest = NSFetchRequest()
        fetchRequest.entity = object.entity
-        
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
        fetchRequest.sortDescriptors = []
        fetchRequest.includesPendingChanges = false
        fetchRequest.shouldRefreshRefetchedObjects = true
        
-        let originalObjectID = object.objectID
-        Where("SELF", isEqualTo: originalObjectID).applyToFetchRequest(fetchRequest)
-        
        let fetchedResultsController = NSFetchedResultsController(
+            dataStack: dataStack,
            fetchRequest: fetchRequest,
-            managedObjectContext: context,
-            sectionNameKeyPath: nil,
-            cacheName: nil
+            fetchClauses: [Where("SELF", isEqualTo: object.objectID)]
        )
        
        let fetchedResultsControllerDelegate = FetchedResultsControllerDelegate()
--- a/Processing/AsynchronousDataTransaction.swift
+++ b/Processing/AsynchronousDataTransaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - AsynchronousDataTransaction
@@ -190,16 +192,21 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-    */
-    public override func rollback() {
+     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
+     */
+    @available(*, deprecated=1.3.4, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
        
        CoreStore.assert(
            !self.isCommitted,
            "Attempted to rollback an already committed \(typeName(self))."
        )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
        
-        super.rollback()
+        self.context.reset()
    }
    
    
@@ -209,7 +216,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
        
        self.closure = closure
        
-        super.init(mainContext: mainContext, queue: queue)
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false)
    }
    
    internal func perform() {
--- a/Processing/BaseDataTransaction.swift
+++ b/Processing/BaseDataTransaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - BaseDataTransaction
@@ -186,47 +188,39 @@ public /*abstract*/ class BaseDataTransaction {
        objects.forEach { context.fetchExisting($0)?.deleteFromContext() }
    }
    
-    // MARK: Saving changes
-    
-    /**
-    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid.
-    */
-    public func rollback() {
-        
-        CoreStore.assert(
-            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
-            "Attempted to rollback a \(typeName(self)) outside its designated queue."
-        )
-        
-        self.context.reset()
-    }
-    
    
    // MARK: Internal
    
    internal let context: NSManagedObjectContext
    internal let transactionQueue: GCDQueue
    internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue")
+    internal let supportsUndo: Bool
+    internal let bypassesQueueing: Bool
+    
    
    internal var isCommitted = false
    internal var result: SaveResult?
    
-    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue) {
-        
-        self.transactionQueue = queue
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool, bypassesQueueing: Bool) {
        
        let context = mainContext.temporaryContextInTransactionWithConcurrencyType(
            queue == .Main
                ? .MainQueueConcurrencyType
                : .PrivateQueueConcurrencyType
        )
+        self.transactionQueue = queue
        self.context = context
+        self.supportsUndo = supportsUndo
+        self.bypassesQueueing = bypassesQueueing
        
        context.parentTransaction = self
-    }
-    
-    internal var bypassesQueueing: Bool {
-        
-        return false
+        if !supportsUndo {
+            
+            context.undoManager = nil
+        }
+        else if context.undoManager == nil {
+            
+            context.undoManager = NSUndoManager()
+        }
    }
 }
--- a/Processing/CoreStore+Transaction.swift
+++ b/Processing/CoreStore+Transaction.swift
@@ -43,25 +43,26 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
    public static func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
        
        return self.defaultStack.beginSynchronous(closure)
    }
    
    /**
-    Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
-    
-    - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
    @warn_unused_result
-    public static func beginUnsafe() -> UnsafeDataTransaction {
+    public static func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
        
-        return self.defaultStack.beginUnsafe()
+        return self.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
    }
    
    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
--- a/Processing/DataStack+Transaction.swift
+++ b/Processing/DataStack+Transaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - DataStack
@@ -48,11 +50,11 @@ public extension DataStack {
    }
    
    /**
-    Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
    public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
        
        return SynchronousDataTransaction(
@@ -62,19 +64,21 @@ public extension DataStack {
    }
    
    /**
-    Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
-    
-    - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+     Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
    @warn_unused_result
-    public func beginUnsafe() -> UnsafeDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
        
        return UnsafeDataTransaction(
            mainContext: self.rootSavingContext,
            queue: .createSerial(
                "com.coreStore.dataStack.unsafeTransactionQueue",
                targetQueue: .UserInitiated
-            )
+            ),
+            supportsUndo: supportsUndo
        )
    }
    
--- a/Processing/SynchronousDataTransaction.swift
+++ b/Processing/SynchronousDataTransaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - SynchronousDataTransaction
@@ -181,20 +183,32 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    
    /**
    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
-    */
-    public override func rollback() {
+     */
+    @available(*, deprecated=1.3.4, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
+    public func rollback() {
        
        CoreStore.assert(
            !self.isCommitted,
            "Attempted to rollback an already committed \(typeName(self))."
        )
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
        
-        super.rollback()
+        self.context.reset()
    }
    
    
    // MARK: Internal
    
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: SynchronousDataTransaction) -> Void) {
+        
+        self.closure = closure
+        
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: false, bypassesQueueing: false)
+    }
+    
    internal func performAndWait() -> SaveResult? {
        
        self.transactionQueue.sync {
@@ -212,13 +226,6 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
        return self.result
    }
    
-    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, closure: (transaction: SynchronousDataTransaction) -> Void) {
-        
-        self.closure = closure
-        
-        super.init(mainContext: mainContext, queue: queue)
-    }
-    
    
    // MARK: Private
    
--- a/Processing/UnsafeDataTransaction.swift
+++ b/Processing/UnsafeDataTransaction.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


@available(*, deprecated=1.3.1, renamed="UnsafeDataTransaction")
@@ -56,26 +58,64 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     Rolls back the transaction.
+     */
+    public func rollback() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to rollback a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.rollback()
+    }
    
-    - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
-    */
+    /**
+     Undo's the last change made to the transaction.
+     */
+    public func undo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to undo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.undo()
+    }
+    
+    /**
+     Redo's the last undone change to the transaction.
+     */
+    public func redo() {
+        
+        CoreStore.assert(
+            self.supportsUndo,
+            "Attempted to redo a \(typeName(self)) with Undo support disabled."
+        )
+        self.context.redo()
+    }
+    
+    /**
+     Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     
+     - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
+     - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
+     */
    @warn_unused_result
-    public func beginUnsafe() -> UnsafeDataTransaction {
+    public func beginUnsafe(supportsUndo supportsUndo: Bool = false) -> UnsafeDataTransaction {
        
        return UnsafeDataTransaction(
            mainContext: self.context,
-            queue: self.transactionQueue
+            queue: self.transactionQueue,
+            supportsUndo: supportsUndo
        )
    }
    
    /**
-    Returns the `NSManagedObjectContext` for this unsafe transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
-    
-    Note that it is the developer's responsibility to ensure the following:
-    - that the `UnsafeDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
-    - that all saves will be done either through the `UnsafeDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
-    */
+     Returns the `NSManagedObjectContext` for this unsafe transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
+     
+     Note that it is the developer's responsibility to ensure the following:
+     - that the `UnsafeDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
+     - that all saves will be done either through the `UnsafeDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
+     */
    public var internalContext: NSManagedObjectContext {
        
        return self.context
@@ -91,9 +131,8 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
    
    // MARK: Internal
    
-    internal override var bypassesQueueing: Bool {
+    internal init(mainContext: NSManagedObjectContext, queue: GCDQueue, supportsUndo: Bool) {
        
-        return true
+        super.init(mainContext: mainContext, queue: queue, supportsUndo: supportsUndo, bypassesQueueing: true)
    }
 }
-
--- a/Up/CoreStore+Setup.swift
+++ b/Up/CoreStore+Setup.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 // MARK: - CoreStore
--- a/Up/DataStack.swift
+++ b/Up/DataStack.swift
@@ -25,7 +25,9 @@

 import Foundation
 import CoreData
-import GCDKit
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif


 internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -35,10 +35,10 @@
 		B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; };
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
-		B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; };
-		B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; };
-		B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
+		B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; };
+		B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
 		B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; };
 		B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; };
@@ -47,44 +47,6 @@
 		B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; };
 /* 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 */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53019C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2F03A53B19C5C6DA005002A5;
-			remoteInfo = CoreStoreTests;
-		};
-		B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-		B583A9221AF5F542001F76AF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2F03A52F19C5C6DA005002A5;
-			remoteInfo = CoreStore;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		B583A9241AF5F542001F76AF /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -92,8 +54,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */,
-				B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */,
+				B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */,
+				B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -131,8 +93,8 @@
 		B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = "<group>"; };
 		B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = "<group>"; };
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
-		B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreStore.xcodeproj; path = ../CoreStore.xcodeproj; sourceTree = "<group>"; };
-		B5D9C9181B20AB1900E64F0E /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GCDKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CoreStore.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/CoreStore.framework"; sourceTree = "<absolute>"; };
+		B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<absolute>"; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
@@ -149,9 +111,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
+				B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */,
+				B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
-				B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */,
-				B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -182,9 +144,9 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */,
-				B5D9C9181B20AB1900E64F0E /* GCDKit.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
+				B5BDC9211C202429008147CD /* CoreStore.framework */,
+				B5BDC9241C202429008147CD /* GCDKit.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
 			);
 			name = Frameworks;
@@ -282,16 +244,6 @@
 			path = "Migrations Demo";
 			sourceTree = "<group>";
 		};
-		B583A9151AF5F4F3001F76AF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B583A91B1AF5F4F4001F76AF /* CoreStore.framework */,
-				B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */,
-				B56321C61BD65965006C9394 /* CoreStore.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -307,8 +259,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B583A91F1AF5F512001F76AF /* PBXTargetDependency */,
-				B583A9231AF5F542001F76AF /* PBXTargetDependency */,
 			);
 			name = CoreStoreDemo;
 			productName = CoreStoreDemo;
@@ -341,12 +291,6 @@
 			mainGroup = B54AAD401AF4D26E00848AE0;
 			productRefGroup = B54AAD4A1AF4D26E00848AE0 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = B583A9151AF5F4F3001F76AF /* Products */;
-					ProjectRef = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				B54AAD481AF4D26E00848AE0 /* CoreStoreDemo */,
@@ -354,30 +298,6 @@
 		};
 /* 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;
-			path = CoreStore.framework;
-			remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "CoreStoreTests iOS.xctest";
-			remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		B54AAD471AF4D26E00848AE0 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -430,19 +350,6 @@
 		};
 /* End PBXSourcesBuildPhase section */

-/* Begin PBXTargetDependency section */
-		B583A91F1AF5F512001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A91E1AF5F512001F76AF /* PBXContainerItemProxy */;
-		};
-		B583A9231AF5F542001F76AF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = CoreStore;
-			targetProxy = B583A9221AF5F542001F76AF /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		B54AAD571AF4D26E00848AE0 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
--- a/Libraries/GCDKit
+++ b/Libraries/GCDKit
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # CoreStore
+[![Build Status](https://img.shields.io/travis/JohnEstropia/CoreStore/develop.svg)](https://travis-ci.org/JohnEstropia/CoreStore)
 [![Version](https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![Platform](https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![License](https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat)](https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE)
@@ -24,7 +25,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 - Documentation! No magic here; all public classes, functions, properties, etc. have detailed Apple Docs. This README also introduces a lot of concepts and explains a lot of CoreStore's behavior.
 - **New in 1.3.0:** Efficient importing utilities!

-**CoreStore's goal is not to expose shorter, magical syntax, but to provide an API that focuses on readability, consistency, and safety.**
+**[Or vote for the next feature!](http://goo.gl/RIiHMP)**



@@ -255,7 +256,7 @@ class MyViewController: UIViewController {


 ## Migrations
-So far we have only seen `addSQLiteStoreAndWait(...)` used to initialize our persistent store. As the method name's "AndWait" suffix suggests, this method will block, even if a migration occurs. If migrations are expected, the asynchronous variant `addSQLiteStore(... completion:)` method is recommended:
+So far we have only seen `addSQLiteStoreAndWait(...)` used to initialize our persistent store. As the method name's "AndWait" suffix suggests, this method blocks so it should not do long tasks such as store migrations (in fact CoreStore won't even attempt to, and any model mismatch will be reported as an error). If migrations are expected, the asynchronous variant `addSQLiteStore(... completion:)` method should be used instead:
 ```swift
 do {
    let progress: NSProgress = try dataStack.addSQLiteStore(
@@ -1181,6 +1182,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 ### Install with Carthage
 ```
 github "JohnEstropia/CoreStore" >= 1.3.0
+github "JohnEstropia/GCDKit" >= 1.1.5
 ```

 ### Install as Git Submodule
Author	SHA1	Message	Date
John Estropia	c63bc389b2	updated travis.yml	2016-01-06 19:29:58 +09:00
John Estropia	71c3abc4f3	Let ListMonitor expose methods for Section Indexes (fixes #32 )	2016-01-06 19:16:46 +09:00
John Estropia	863d4d1d5a	Merge branch 'master' into develop # Conflicts: # README.md	2016-01-06 18:45:45 +09:00
John Estropia	06d177e8bd	Update README.md	2016-01-04 19:38:42 +09:00
John Estropia	c2bbd537cf	Update README.md	2016-01-04 19:38:11 +09:00
John Estropia	761d349b97	Rename CartFile to Cartfile. Sorry about that	2016-01-04 12:38:05 +09:00
John Rommel Estropia	6c28594e41	fixed shouldUpdateFromImportSource() not called from importUniqueObject() (fixes #31 )	2015-12-29 08:25:06 +08:00
John Estropia	c229af19a2	added GCDKit to Carthage installation guide	2015-12-18 19:28:02 +09:00
John Estropia	8b8a7c7b08	fix macOSX development target	2015-12-16 14:01:56 +09:00
John Estropia	eb828d8e42	update deployment version	2015-12-15 21:20:56 +09:00
John Estropia	88a24540c6	remove IPHONEOS_DEPLOYMENT_TARGET flag	2015-12-15 20:51:48 +09:00
John Estropia	74ded8fb7d	update .travis.yml	2015-12-15 19:58:59 +09:00
John Estropia	969f4cefb4	use workspaces for better carthage support	2015-12-15 19:56:07 +09:00
John Estropia	1d2947ad26	added Carthage dependency	2015-12-08 18:34:10 +09:00
John Estropia	49274c3c94	fix swift project settings	2015-12-08 16:35:50 +09:00
John Rommel Estropia	c0fbb2655b	version bump	2015-12-06 20:32:06 +09:00
John Rommel Estropia	cefd6f6cbc	fix watchOS travis configuration	2015-12-05 20:28:24 +09:00
John Rommel Estropia	2653f7b977	fix watchOS travis configuration	2015-12-05 20:13:52 +09:00
John Rommel Estropia	c1163283f5	fix watchOS travis configuration	2015-12-05 20:03:21 +09:00
John Rommel Estropia	529347b6a2	fix watchOS travis configuration	2015-12-05 19:48:40 +09:00
John Rommel Estropia	eba7e99374	fixed yml	2015-12-05 19:35:23 +09:00
John Rommel Estropia	3c4350bd5d	enable testability	2015-12-05 19:30:04 +09:00
John Rommel Estropia	88b13189e5	fix yml	2015-12-05 19:23:12 +09:00
John Rommel Estropia	03da3544f6	change GCDKit submodule path to public url to make sir Travis happy	2015-12-05 19:20:27 +09:00
John Rommel Estropia	648b59e1ee	fix yml	2015-12-05 19:14:35 +09:00
John Rommel Estropia	ab3c8ca812	tidy up	2015-12-05 19:01:07 +09:00
John Rommel Estropia	900a31c541	added build status to readme	2015-12-05 18:55:20 +09:00
John Rommel Estropia	656a107767	test travis ci	2015-12-05 18:50:54 +09:00
John Rommel Estropia	4ce3d5de3c	undo interface	2015-12-05 18:21:21 +09:00
John Rommel Estropia	dec9757dc2	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2015-12-05 18:19:33 +09:00
John Estropia	578e4966fc	added a convenience initializer for clients that only support NSFetchedResultsController (i.e. Objective-C)	2015-11-24 19:12:04 +09:00
John Estropia	b741626574	updated GCDKit	2015-11-24 17:50:23 +09:00
John Estropia	f79a77ab78	remove unneeded imports in demo app	2015-11-24 17:02:23 +09:00
John Estropia	1f2a70fd42	minor fixes	2015-11-24 16:06:48 +09:00
John Estropia	718d2c9b7d	Added ability to initialize ListMonitors asynchronously. This is a deadlock-preventive measure for apps that heavily recreates ListMonitors while updates and saves are running in the background (because NSFetchedResultController's performFetch() locks the whole NSManagedObjectContext chain up until the NSPersistentStoreCoordinator)	2015-11-24 14:49:43 +09:00
John Estropia	c5ff02335e	debug flag	2015-11-24 12:32:10 +09:00
John Estropia	66b57faa44	Merge branch 'master' into develop	2015-11-24 11:34:35 +09:00
John Estropia	eef5a3d80b	allow CoreStore installation both through frameworks or through direct linking	2015-11-24 11:33:52 +09:00
John Estropia	bc0757cf06	README: Added link to poll for new features	2015-11-18 19:46:17 +09:00
John Rommel Estropia	0c0a2a382c	Deprecated rollback() on async and sync transactions. Added undo utilities to unsafe transactions.	2015-11-14 20:00:40 +09:00