From dc8bdf3bada4f96cc45824d82687397758d94dfc Mon Sep 17 00:00:00 2001 From: John Estropia Date: Tue, 20 Oct 2015 20:38:58 +0900 Subject: [PATCH] watch OS support --- CoreStore.xcodeproj/project.pbxproj | 336 ++++++++++++++++-- ...eStore.xcscheme => CoreStore iOS.xcscheme} | 16 +- .../xcschemes/CoreStore watchOS.xcscheme | 80 +++++ CoreStore/CoreStore.h | 2 +- .../Concrete Clauses/OrderBy.swift | 1 + .../Concrete Clauses/Where.swift | 1 + .../CoreStore+Querying.swift | 2 + .../FetchedResultsControllerDelegate.swift | 4 +- CoreStore/NSError+CoreStore.swift | 1 + CoreStore/Observing/ListMonitor.swift | 7 +- .../UnsafeDataTransaction.swift | 1 + .../CoreStoreDemo.xcodeproj/project.pbxproj | 21 +- CoreStoreTests/CoreStoreTests.swift | 1 - Libraries/GCDKit | 2 +- 14 files changed, 433 insertions(+), 42 deletions(-) rename CoreStore.xcodeproj/xcshareddata/xcschemes/{CoreStore.xcscheme => CoreStore iOS.xcscheme} (90%) create mode 100644 CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index effbe37..75b6539 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -17,6 +17,66 @@ B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; }; B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; }; B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; }; + B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321791BD650DE006C9394 /* CoreData.framework */; }; + B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B563217B1BD650E3006C9394 /* Foundation.framework */; }; + B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56321691BD64F99006C9394 /* GCDKit.framework */; }; + B563217E1BD65110006C9394 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B563217F1BD65216006C9394 /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; settings = {ASSET_TAGS = (); }; }; + B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; settings = {ASSET_TAGS = (); }; }; + B56321811BD65216006C9394 /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; settings = {ASSET_TAGS = (); }; }; + B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */; settings = {ASSET_TAGS = (); }; }; + B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; settings = {ASSET_TAGS = (); }; }; + B56321841BD65216006C9394 /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; settings = {ASSET_TAGS = (); }; }; + B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */; settings = {ASSET_TAGS = (); }; }; + B56321861BD65216006C9394 /* CoreStoreLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */; settings = {ASSET_TAGS = (); }; }; + B56321871BD65216006C9394 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; settings = {ASSET_TAGS = (); }; }; + B56321881BD65216006C9394 /* BaseDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */; settings = {ASSET_TAGS = (); }; }; + B56321891BD65216006C9394 /* AsynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */; settings = {ASSET_TAGS = (); }; }; + B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */; settings = {ASSET_TAGS = (); }; }; + B563218B1BD65216006C9394 /* UnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EED1AFF846E0064E85B /* UnsafeDataTransaction.swift */; settings = {ASSET_TAGS = (); }; }; + B563218C1BD65216006C9394 /* DataStack+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */; settings = {ASSET_TAGS = (); }; }; + B563218D1BD65216006C9394 /* CoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */; settings = {ASSET_TAGS = (); }; }; + B563218E1BD65216006C9394 /* SaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF21AFF846E0064E85B /* SaveResult.swift */; settings = {ASSET_TAGS = (); }; }; + B563218F1BD65216006C9394 /* ImportableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */; settings = {ASSET_TAGS = (); }; }; + B56321901BD65216006C9394 /* ImportableUniqueObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */; settings = {ASSET_TAGS = (); }; }; + B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; settings = {ASSET_TAGS = (); }; }; + B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */; settings = {ASSET_TAGS = (); }; }; + B56321931BD65216006C9394 /* DataStack+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */; settings = {ASSET_TAGS = (); }; }; + B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */; settings = {ASSET_TAGS = (); }; }; + B56321951BD65216006C9394 /* ClauseTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */; settings = {ASSET_TAGS = (); }; }; + B56321961BD65216006C9394 /* From.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F011AFF847B0064E85B /* From.swift */; settings = {ASSET_TAGS = (); }; }; + B56321971BD65216006C9394 /* Select.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F031AFF847B0064E85B /* Select.swift */; settings = {ASSET_TAGS = (); }; }; + B56321981BD65216006C9394 /* Where.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F051AFF847B0064E85B /* Where.swift */; settings = {ASSET_TAGS = (); }; }; + B56321991BD65216006C9394 /* OrderBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F041AFF847B0064E85B /* OrderBy.swift */; settings = {ASSET_TAGS = (); }; }; + B563219A1BD65216006C9394 /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F021AFF847B0064E85B /* GroupBy.swift */; settings = {ASSET_TAGS = (); }; }; + B563219B1BD65216006C9394 /* Tweak.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F001AFF847B0064E85B /* Tweak.swift */; settings = {ASSET_TAGS = (); }; }; + B563219C1BD65216006C9394 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; settings = {ASSET_TAGS = (); }; }; + B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */; settings = {ASSET_TAGS = (); }; }; + B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */; settings = {ASSET_TAGS = (); }; }; + B563219F1BD65216006C9394 /* ObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A11BD65216006C9394 /* ListMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ListMonitor.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A21BD65216006C9394 /* ListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ListObserver.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A31BD65216006C9394 /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A51BD65216006C9394 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A61BD65216006C9394 /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */; settings = {ASSET_TAGS = (); }; }; + B56321A91BD65219006C9394 /* NSProgress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AA1BD6521C006C9394 /* AssociatedObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AC1BD6521C006C9394 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AD1BD6521C006C9394 /* MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* MigrationManager.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AE1BD6521C006C9394 /* NotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */; settings = {ASSET_TAGS = (); }; }; + B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B01BD6521C006C9394 /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B51BD6521C006C9394 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; settings = {ASSET_TAGS = (); }; }; + B56321B61BD6521C006C9394 /* WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* WeakObject.swift */; settings = {ASSET_TAGS = (); }; }; B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; }; B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; }; B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; }; @@ -25,7 +85,6 @@ B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; }; B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; }; B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0119FD00C9000E91BB /* Foundation.framework */; }; - B5D39A0419FD00DE000E91BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0319FD00DE000E91BB /* UIKit.framework */; }; B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */; }; B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; }; B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; }; @@ -75,6 +134,34 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + B56321641BD64F99006C9394 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B563212B1BD6359A006C9394; + remoteInfo = "GCDKit OSX"; + }; + B56321661BD64F99006C9394 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B56321401BD63D14006C9394; + remoteInfo = "GCDKitTests OSX"; + }; + B56321681BD64F99006C9394 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B56321501BD6408F006C9394; + remoteInfo = "GCDKit watchOS"; + }; + B56321771BD650A3006C9394 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B563214F1BD6408F006C9394; + remoteInfo = "GCDKit watchOS"; + }; B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */; @@ -109,7 +196,7 @@ 2F03A53019C5C6DA005002A5 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2F03A53419C5C6DA005002A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2F03A53519C5C6DA005002A5 /* CoreStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreStore.h; sourceTree = ""; }; - 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 2F03A53B19C5C6DA005002A5 /* CoreStoreTests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "CoreStoreTests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2F03A53E19C5C6DA005002A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStoreTests.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 2F03A54C19C5C872005002A5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -117,9 +204,14 @@ B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = ""; }; B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = ""; }; B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchedResultsControllerDelegate.swift; sourceTree = ""; }; + B5548CD51BD65AE00077652A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + B5548CD71BD65AE50077652A /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; }; B56007101B3F6BD500A9A8F9 /* Into.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Into.swift; sourceTree = ""; }; B56007131B3F6C2800A9A8F9 /* SectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionBy.swift; sourceTree = ""; }; B56007151B4018AB00A9A8F9 /* MigrationChain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChain.swift; sourceTree = ""; }; + B563216F1BD65082006C9394 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B56321791BD650DE006C9394 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; }; + B563217B1BD650E3006C9394 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Migration.swift"; sourceTree = ""; }; B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = ""; }; B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFileManager+Setup.swift"; sourceTree = ""; }; @@ -128,7 +220,6 @@ B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; B5D372851A39CDDB00F583D9 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = ""; }; B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - B5D39A0319FD00DE000E91BB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = ""; }; B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = ""; }; B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; }; @@ -186,7 +277,6 @@ buildActionMask = 2147483647; files = ( B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */, - B5D39A0419FD00DE000E91BB /* UIKit.framework in Frameworks */, B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */, 2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */, ); @@ -199,6 +289,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B563216B1BD65082006C9394 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B563217D1BD650FA006C9394 /* GCDKit.framework in Frameworks */, + B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */, + B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -217,7 +317,8 @@ isa = PBXGroup; children = ( 2F03A53019C5C6DA005002A5 /* CoreStore.framework */, - 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */, + 2F03A53B19C5C6DA005002A5 /* CoreStoreTests iOS.xctest */, + B563216F1BD65082006C9394 /* CoreStore.framework */, ); name = Products; sourceTree = ""; @@ -276,9 +377,12 @@ 2F291E3119C6D4D3007AF63F /* Frameworks */ = { isa = PBXGroup; children = ( + B5548CD71BD65AE50077652A /* CoreData.framework */, + B56321791BD650DE006C9394 /* CoreData.framework */, 2F03A54C19C5C872005002A5 /* CoreData.framework */, + B5548CD51BD65AE00077652A /* Foundation.framework */, + B563217B1BD650E3006C9394 /* Foundation.framework */, B5D39A0119FD00C9000E91BB /* Foundation.framework */, - B5D39A0319FD00DE000E91BB /* UIKit.framework */, ); name = Frameworks; sourceTree = ""; @@ -315,7 +419,10 @@ isa = PBXGroup; children = ( B5D808021A34715700A44484 /* GCDKit.framework */, - B5D808041A34715700A44484 /* GCDKitTests.xctest */, + B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */, + B56321651BD64F99006C9394 /* GCDKit.framework */, + B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */, + B56321691BD64F99006C9394 /* GCDKit.framework */, ); name = Products; sourceTree = ""; @@ -452,12 +559,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B563216C1BD65082006C9394 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B563217E1BD65110006C9394 /* CoreStore.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 2F03A52F19C5C6DA005002A5 /* CoreStore */ = { + 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */; + buildConfigurationList = 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore iOS" */; buildPhases = ( 2F03A52B19C5C6DA005002A5 /* Sources */, 2F03A52C19C5C6DA005002A5 /* Frameworks */, @@ -469,14 +584,14 @@ dependencies = ( B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */, ); - name = CoreStore; + name = "CoreStore iOS"; productName = CoreStore; productReference = 2F03A53019C5C6DA005002A5 /* CoreStore.framework */; productType = "com.apple.product-type.framework"; }; - 2F03A53A19C5C6DA005002A5 /* CoreStoreTests */ = { + 2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */; + buildConfigurationList = 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests iOS" */; buildPhases = ( 2F03A53719C5C6DA005002A5 /* Sources */, 2F03A53819C5C6DA005002A5 /* Frameworks */, @@ -487,11 +602,30 @@ dependencies = ( B5D372881A39CF4D00F583D9 /* PBXTargetDependency */, ); - name = CoreStoreTests; + name = "CoreStoreTests iOS"; productName = CoreStoreTests; - productReference = 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */; + productReference = 2F03A53B19C5C6DA005002A5 /* CoreStoreTests iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + B563216E1BD65082006C9394 /* CoreStore watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B56321741BD65082006C9394 /* Build configuration list for PBXNativeTarget "CoreStore watchOS" */; + buildPhases = ( + B563216A1BD65082006C9394 /* Sources */, + B563216B1BD65082006C9394 /* Frameworks */, + B563216C1BD65082006C9394 /* Headers */, + B563216D1BD65082006C9394 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + B56321781BD650A3006C9394 /* PBXTargetDependency */, + ); + name = "CoreStore watchOS"; + productName = "CoreStore watchOS"; + productReference = B563216F1BD65082006C9394 /* CoreStore.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -508,6 +642,9 @@ 2F03A53A19C5C6DA005002A5 = { CreatedOnToolsVersion = 6.0; }; + B563216E1BD65082006C9394 = { + CreatedOnToolsVersion = 7.0.1; + }; }; }; buildConfigurationList = 2F03A52A19C5C6DA005002A5 /* Build configuration list for PBXProject "CoreStore" */; @@ -529,13 +666,35 @@ ); projectRoot = ""; targets = ( - 2F03A52F19C5C6DA005002A5 /* CoreStore */, - 2F03A53A19C5C6DA005002A5 /* CoreStoreTests */, + 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */, + 2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */, + B563216E1BD65082006C9394 /* CoreStore watchOS */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + B56321651BD64F99006C9394 /* GCDKit.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = GCDKit.framework; + remoteRef = B56321641BD64F99006C9394 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B56321671BD64F99006C9394 /* GCDKitTests OSX.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "GCDKitTests OSX.xctest"; + remoteRef = B56321661BD64F99006C9394 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B56321691BD64F99006C9394 /* GCDKit.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = GCDKit.framework; + remoteRef = B56321681BD64F99006C9394 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; B5D808021A34715700A44484 /* GCDKit.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -543,10 +702,10 @@ remoteRef = B5D808011A34715700A44484 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B5D808041A34715700A44484 /* GCDKitTests.xctest */ = { + B5D808041A34715700A44484 /* GCDKitTests iOS.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = GCDKitTests.xctest; + path = "GCDKitTests iOS.xctest"; remoteRef = B5D808031A34715700A44484 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -567,6 +726,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B563216D1BD65082006C9394 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -644,12 +810,80 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B563216A1BD65082006C9394 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B56321A91BD65219006C9394 /* NSProgress+Convenience.swift in Sources */, + B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */, + B56321AD1BD6521C006C9394 /* MigrationManager.swift in Sources */, + B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */, + B56321961BD65216006C9394 /* From.swift in Sources */, + B56321AA1BD6521C006C9394 /* AssociatedObjects.swift in Sources */, + B563218C1BD65216006C9394 /* DataStack+Transaction.swift in Sources */, + B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */, + B56321891BD65216006C9394 /* AsynchronousDataTransaction.swift in Sources */, + B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */, + B563217F1BD65216006C9394 /* CoreStore.swift in Sources */, + B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */, + B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */, + B56321811BD65216006C9394 /* DataStack.swift in Sources */, + B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */, + B56321981BD65216006C9394 /* Where.swift in Sources */, + B56321AF1BD6521C006C9394 /* NSFileManager+Setup.swift in Sources */, + B56321971BD65216006C9394 /* Select.swift in Sources */, + B56321AB1BD6521C006C9394 /* FetchedResultsControllerDelegate.swift in Sources */, + B56321821BD65216006C9394 /* PersistentStoreResult.swift in Sources */, + B563219C1BD65216006C9394 /* SectionBy.swift in Sources */, + B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */, + B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */, + B56321AE1BD6521C006C9394 /* NotificationObserver.swift in Sources */, + B56321931BD65216006C9394 /* DataStack+Querying.swift in Sources */, + B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */, + B56321A11BD65216006C9394 /* ListMonitor.swift in Sources */, + B56321881BD65216006C9394 /* BaseDataTransaction.swift in Sources */, + B56321A31BD65216006C9394 /* DataStack+Migration.swift in Sources */, + B56321901BD65216006C9394 /* ImportableUniqueObject.swift in Sources */, + B56321871BD65216006C9394 /* Into.swift in Sources */, + B563219A1BD65216006C9394 /* GroupBy.swift in Sources */, + B563219B1BD65216006C9394 /* Tweak.swift in Sources */, + B56321B51BD6521C006C9394 /* NSManagedObjectModel+Setup.swift in Sources */, + B563218F1BD65216006C9394 /* ImportableObject.swift in Sources */, + B56321991BD65216006C9394 /* OrderBy.swift in Sources */, + B56321A51BD65216006C9394 /* MigrationChain.swift in Sources */, + B56321B01BD6521C006C9394 /* NSManagedObject+Transaction.swift in Sources */, + B563218E1BD65216006C9394 /* SaveResult.swift in Sources */, + B56321A21BD65216006C9394 /* ListObserver.swift in Sources */, + B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */, + B563219F1BD65216006C9394 /* ObjectMonitor.swift in Sources */, + B56321B61BD6521C006C9394 /* WeakObject.swift in Sources */, + B56321AC1BD6521C006C9394 /* Functions.swift in Sources */, + B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */, + B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */, + B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */, + B563218D1BD65216006C9394 /* CoreStore+Transaction.swift in Sources */, + B563218B1BD65216006C9394 /* UnsafeDataTransaction.swift in Sources */, + B56321A61BD65216006C9394 /* MigrationType.swift in Sources */, + B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */, + B56321861BD65216006C9394 /* CoreStoreLogger.swift in Sources */, + B56321841BD65216006C9394 /* DefaultLogger.swift in Sources */, + B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */, + B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */, + B56321951BD65216006C9394 /* ClauseTypes.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + B56321781BD650A3006C9394 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "GCDKit watchOS"; + targetProxy = B56321771BD650A3006C9394 /* PBXContainerItemProxy */; + }; B5D372881A39CF4D00F583D9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2F03A52F19C5C6DA005002A5 /* CoreStore */; + target = 2F03A52F19C5C6DA005002A5 /* CoreStore iOS */; targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */; }; B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */ = { @@ -762,9 +996,9 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = CoreStore; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; @@ -782,7 +1016,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = CoreStore; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; @@ -822,6 +1056,51 @@ }; name = Release; }; + B56321751BD65082006C9394 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = CoreStore/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; + PRODUCT_NAME = CoreStore; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Debug; + }; + B56321761BD65082006C9394 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = CoreStore/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; + PRODUCT_NAME = CoreStore; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -834,7 +1113,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore" */ = { + 2F03A54319C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStore iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2F03A54419C5C6DA005002A5 /* Debug */, @@ -843,7 +1122,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests" */ = { + 2F03A54619C5C6DA005002A5 /* Build configuration list for PBXNativeTarget "CoreStoreTests iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2F03A54719C5C6DA005002A5 /* Debug */, @@ -852,6 +1131,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B56321741BD65082006C9394 /* Build configuration list for PBXNativeTarget "CoreStore watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B56321751BD65082006C9394 /* Debug */, + B56321761BD65082006C9394 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme similarity index 90% rename from CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore.xcscheme rename to CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme index 5a4a862..0d6020b 100644 --- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore.xcscheme +++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "2F03A52F19C5C6DA005002A5" BuildableName = "CoreStore.framework" - BlueprintName = "CoreStore" + BlueprintName = "CoreStore iOS" ReferencedContainer = "container:CoreStore.xcodeproj"> @@ -29,8 +29,8 @@ @@ -47,8 +47,8 @@ @@ -58,7 +58,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "2F03A52F19C5C6DA005002A5" BuildableName = "CoreStore.framework" - BlueprintName = "CoreStore" + BlueprintName = "CoreStore iOS" ReferencedContainer = "container:CoreStore.xcodeproj"> @@ -80,7 +80,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "2F03A52F19C5C6DA005002A5" BuildableName = "CoreStore.framework" - BlueprintName = "CoreStore" + BlueprintName = "CoreStore iOS" ReferencedContainer = "container:CoreStore.xcodeproj"> @@ -98,7 +98,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "2F03A52F19C5C6DA005002A5" BuildableName = "CoreStore.framework" - BlueprintName = "CoreStore" + BlueprintName = "CoreStore iOS" ReferencedContainer = "container:CoreStore.xcodeproj"> diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme new file mode 100644 index 0000000..c2bb597 --- /dev/null +++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreStore/CoreStore.h b/CoreStore/CoreStore.h index e8daf7f..a8d74f2 100644 --- a/CoreStore/CoreStore.h +++ b/CoreStore/CoreStore.h @@ -23,7 +23,7 @@ // SOFTWARE. // -#import +#import FOUNDATION_EXPORT double CoreStoreVersionNumber; FOUNDATION_EXPORT const unsigned char CoreStoreVersionString[]; diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift b/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift index 1cffc29..2254a1b 100644 --- a/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift @@ -24,6 +24,7 @@ // import Foundation +import CoreData public func +(left: OrderBy, right: OrderBy) -> OrderBy { diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift b/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift index 6e3928c..da6a9c2 100644 --- a/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift +++ b/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift @@ -24,6 +24,7 @@ // import Foundation +import CoreData public func &&(left: Where, right: Where) -> Where { diff --git a/CoreStore/Fetching and Querying/CoreStore+Querying.swift b/CoreStore/Fetching and Querying/CoreStore+Querying.swift index 05ffee5..df2e49e 100644 --- a/CoreStore/Fetching and Querying/CoreStore+Querying.swift +++ b/CoreStore/Fetching and Querying/CoreStore+Querying.swift @@ -24,6 +24,8 @@ // import Foundation +import CoreData + // MARK: - CoreStore diff --git a/CoreStore/Internal/FetchedResultsControllerDelegate.swift b/CoreStore/Internal/FetchedResultsControllerDelegate.swift index 32fefc6..2f01636 100644 --- a/CoreStore/Internal/FetchedResultsControllerDelegate.swift +++ b/CoreStore/Internal/FetchedResultsControllerDelegate.swift @@ -149,7 +149,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult break } - if self.deletedSections.contains(indexPath.section) { + if self.deletedSections.contains(indexPath.indexAtPosition(0)) { self.handler?.controller( controller, @@ -162,7 +162,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult } case .Update: - guard let section = indexPath?.section else { + guard let section = indexPath?.indexAtPosition(0) else { return } diff --git a/CoreStore/NSError+CoreStore.swift b/CoreStore/NSError+CoreStore.swift index df04e3b..74c36e6 100644 --- a/CoreStore/NSError+CoreStore.swift +++ b/CoreStore/NSError+CoreStore.swift @@ -24,6 +24,7 @@ // import Foundation +import CoreData /** The `NSError` error domain for `CoreStore`. diff --git a/CoreStore/Observing/ListMonitor.swift b/CoreStore/Observing/ListMonitor.swift index d1effe6..e124d28 100644 --- a/CoreStore/Observing/ListMonitor.swift +++ b/CoreStore/Observing/ListMonitor.swift @@ -102,7 +102,7 @@ public final class ListMonitor { */ public subscript(sectionIndex: Int, itemIndex: Int) -> T { - return self[NSIndexPath(forItem: itemIndex, inSection: sectionIndex)] + return self[NSIndexPath(indexes: [sectionIndex, itemIndex], length: 2)] } /** @@ -157,7 +157,10 @@ public final class ListMonitor { */ public subscript(safeIndexPath indexPath: NSIndexPath) -> T? { - return self[safeSectionIndex: indexPath.section, safeItemIndex: indexPath.item] + return self[ + safeSectionIndex: indexPath.indexAtPosition(0), + safeItemIndex: indexPath.indexAtPosition(1) + ] } /** diff --git a/CoreStore/Saving and Processing/UnsafeDataTransaction.swift b/CoreStore/Saving and Processing/UnsafeDataTransaction.swift index 09e8594..98831ba 100644 --- a/CoreStore/Saving and Processing/UnsafeDataTransaction.swift +++ b/CoreStore/Saving and Processing/UnsafeDataTransaction.swift @@ -24,6 +24,7 @@ // import Foundation +import CoreData import GCDKit diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj index b398311..8693038 100644 --- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj +++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj @@ -48,6 +48,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + B56321C51BD65965006C9394 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B563216F1BD65082006C9394; + remoteInfo = "CoreStore watchOS"; + }; B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */; @@ -279,7 +286,8 @@ isa = PBXGroup; children = ( B583A91B1AF5F4F4001F76AF /* CoreStore.framework */, - B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */, + B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */, + B56321C61BD65965006C9394 /* CoreStore.framework */, ); name = Products; sourceTree = ""; @@ -347,6 +355,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + B56321C61BD65965006C9394 /* CoreStore.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CoreStore.framework; + remoteRef = B56321C51BD65965006C9394 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; B583A91B1AF5F4F4001F76AF /* CoreStore.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -354,10 +369,10 @@ remoteRef = B583A91A1AF5F4F4001F76AF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B583A91D1AF5F4F4001F76AF /* CoreStoreTests.xctest */ = { + B583A91D1AF5F4F4001F76AF /* CoreStoreTests iOS.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = CoreStoreTests.xctest; + path = "CoreStoreTests iOS.xctest"; remoteRef = B583A91C1AF5F4F4001F76AF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/CoreStoreTests/CoreStoreTests.swift b/CoreStoreTests/CoreStoreTests.swift index be80482..72be724 100644 --- a/CoreStoreTests/CoreStoreTests.swift +++ b/CoreStoreTests/CoreStoreTests.swift @@ -23,7 +23,6 @@ // SOFTWARE. // -import UIKit import XCTest @testable diff --git a/Libraries/GCDKit b/Libraries/GCDKit index 2be8773..6b72512 160000 --- a/Libraries/GCDKit +++ b/Libraries/GCDKit @@ -1 +1 @@ -Subproject commit 2be8773f8245a1d6edbe777ae34d7cb2c8d8905b +Subproject commit 6b72512258092d76e6e515672a308b8ec34257ae