diff --git a/Cartfile b/Cartfile index d8f515a..849cd7e 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "JohnEstropia/GCDKit" == 1.1.7 +github "JohnEstropia/GCDKit" == 1.2.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 2c136d3..65a9da9 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "JohnEstropia/GCDKit" "1.1.7" +github "JohnEstropia/GCDKit" "1.2.0" diff --git a/Carthage/Checkouts/GCDKit b/Carthage/Checkouts/GCDKit index 7f6b560..b927cd6 160000 --- a/Carthage/Checkouts/GCDKit +++ b/Carthage/Checkouts/GCDKit @@ -1 +1 @@ -Subproject commit 7f6b560ffd4ba0f7b1c6f1ec7e17d32928a9858b +Subproject commit b927cd65a88f50592f3468c845dffad44ad84ebd diff --git a/CoreStore.podspec b/CoreStore.podspec index 1201e31..ceb2965 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -12,11 +12,11 @@ Pod::Spec.new do |s| s.watchos.deployment_target = "2.0" s.tvos.deployment_target = "9.0" - s.source_files = "CoreStore", "CoreStore/**/*.{swift}" - s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Internal/CoreStoreFetchedResultsController.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift" + s.source_files = "Sources", "Sources/**/*.{swift}" + s.osx.exclude_files = "Sources/Observing/*.{swift}", "Sources/Internal/FetchedResultsControllerDelegate.swift", "Sources/Internal/CoreStoreFetchedResultsController.swift", "Sources/Convenience Helpers/NSFetchedResultsController+Convenience.swift" s.frameworks = "Foundation", "CoreData" s.requires_arc = true s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' } - s.dependency "GCDKit", "1.1.7" + s.dependency "GCDKit", "1.2.0" end \ No newline at end of file diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 78376bc..78ae19d 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -340,7 +340,8 @@ B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSPersistentStoreCoordinator+Setup.swift"; sourceTree = ""; }; B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFileManager+Setup.swift"; sourceTree = ""; }; B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = ""; }; - B5BDC91A1C202269008147CD /* CartFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CartFile; sourceTree = ""; }; + B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; }; + B5BDC91A1C202269008147CD /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cartfile; path = ../Cartfile; sourceTree = ""; }; B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; }; B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UnsafeDataTransaction+Observing.swift"; sourceTree = ""; }; B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchedResultsController.swift; sourceTree = ""; }; @@ -472,7 +473,7 @@ isa = PBXGroup; children = ( 2F291E3119C6D4D3007AF63F /* Frameworks */, - 2F03A53219C5C6DA005002A5 /* CoreStore */, + 2F03A53219C5C6DA005002A5 /* Sources */, 2F03A53C19C5C6DA005002A5 /* CoreStoreTests */, 2F03A53119C5C6DA005002A5 /* Products */, ); @@ -492,7 +493,7 @@ name = Products; sourceTree = ""; }; - 2F03A53219C5C6DA005002A5 /* CoreStore */ = { + 2F03A53219C5C6DA005002A5 /* Sources */ = { isa = PBXGroup; children = ( 2F03A53519C5C6DA005002A5 /* CoreStore.h */, @@ -510,7 +511,7 @@ B5E84F291AFF849C0064E85B /* Internal */, 2F03A53319C5C6DA005002A5 /* Supporting Files */, ); - path = CoreStore; + path = Sources; sourceTree = ""; }; 2F03A53319C5C6DA005002A5 /* Supporting Files */ = { @@ -520,8 +521,9 @@ B5E84ED81AFF82360064E85B /* README.md */, B5E84ED91AFF82360064E85B /* LICENSE */, B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */, - B5BDC91A1C202269008147CD /* CartFile */, + B5BDC91A1C202269008147CD /* Cartfile */, B5BDC9271C2024F2008147CD /* .travis.yml */, + B5AD60CD1C90141E00F2B2E8 /* Package.swift */, ); name = "Supporting Files"; sourceTree = ""; @@ -1353,6 +1355,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Sources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; @@ -1398,6 +1401,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Sources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; @@ -1421,7 +1425,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1439,7 +1442,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1486,7 +1488,6 @@ 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1505,7 +1506,6 @@ 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1556,7 +1556,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; @@ -1580,7 +1579,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = CoreStore/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; @@ -1598,7 +1596,7 @@ COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = CoreStore/Info.plist; + INFOPLIST_FILE = CoreStoreTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStoreTests; @@ -1616,7 +1614,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = CoreStore/Info.plist; + INFOPLIST_FILE = CoreStoreTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; PRODUCT_NAME = CoreStoreTests; @@ -1633,7 +1631,6 @@ 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; @@ -1654,7 +1651,6 @@ 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"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore; diff --git a/CoreStore/CartFile b/CoreStore/CartFile deleted file mode 100644 index d8f515a..0000000 --- a/CoreStore/CartFile +++ /dev/null @@ -1 +0,0 @@ -github "JohnEstropia/GCDKit" == 1.1.7 diff --git a/Package.swift b/Package.swift index f78484e..a0d5c0d 100644 --- a/Package.swift +++ b/Package.swift @@ -25,6 +25,27 @@ import PackageDescription +let targets: [Target] +#if os(iOS) +targets = [Target(name: "CoreStore iOS")] +#elseif os(OSX) +targets = [Target(name: "CoreStore OSX")] +#elseif os(watchOS) +targets = [Target(name: "CoreStore watchOS")] +#elseif os(tvOS) +targets = [Target(name: "CoreStore tvOS")] +#else +targets = [] +#endif + let package = Package( - name: "CoreStore" + name: "CoreStore", + targets: targets, + dependencies: [ + .Package( + url: "https://github.com/JohnEstropia/GCDKit.git", + majorVersion: 1, minor: 2 + ) + ], + exclude: ["Carthage", "CoreStoreDemo", "Sources/libA/images"] ) diff --git a/README.md b/README.md index b6e1c5f..ecae7d0 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ CoreStore -[![Build Status](https://img.shields.io/travis/JohnEstropia/CoreStore/master.svg)](https://travis-ci.org/JohnEstropia/CoreStore) +[![Build Status](https://img.shields.io/travis/JohnEstropia/CoreStore/master.svg?style=flat)](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) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +[![Swift Package Manager compatible](https://img.shields.io/badge/Swift_Package_Manager-compatible-orange.svg?style=flat)](https://swiftpkgs.ng.bluemix.net/package/27993573) Unleashing the real power of Core Data with the elegance and safety of Swift @@ -1174,7 +1175,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift In your `Cartfile`, add ``` github "JohnEstropia/CoreStore" >= 1.4.4 -github "JohnEstropia/GCDKit" >= 1.1.7 +github "JohnEstropia/GCDKit" >= 1.2.0 ``` and run ``` diff --git a/CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift b/Sources/Convenience Helpers/NSFetchedResultsController+Convenience.swift similarity index 100% rename from CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift rename to Sources/Convenience Helpers/NSFetchedResultsController+Convenience.swift diff --git a/CoreStore/Convenience Helpers/NSManagedObject+Convenience.swift b/Sources/Convenience Helpers/NSManagedObject+Convenience.swift similarity index 100% rename from CoreStore/Convenience Helpers/NSManagedObject+Convenience.swift rename to Sources/Convenience Helpers/NSManagedObject+Convenience.swift diff --git a/CoreStore/Convenience Helpers/NSProgress+Convenience.swift b/Sources/Convenience Helpers/NSProgress+Convenience.swift similarity index 100% rename from CoreStore/Convenience Helpers/NSProgress+Convenience.swift rename to Sources/Convenience Helpers/NSProgress+Convenience.swift diff --git a/CoreStore/CoreStore.h b/Sources/CoreStore.h similarity index 100% rename from CoreStore/CoreStore.h rename to Sources/CoreStore.h diff --git a/CoreStore/CoreStore.swift b/Sources/CoreStore.swift similarity index 100% rename from CoreStore/CoreStore.swift rename to Sources/CoreStore.swift diff --git a/CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift b/Sources/Fetching and Querying/BaseDataTransaction+Querying.swift similarity index 100% rename from CoreStore/Fetching and Querying/BaseDataTransaction+Querying.swift rename to Sources/Fetching and Querying/BaseDataTransaction+Querying.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/From.swift b/Sources/Fetching and Querying/Concrete Clauses/From.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/From.swift rename to Sources/Fetching and Querying/Concrete Clauses/From.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/GroupBy.swift b/Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/GroupBy.swift rename to Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift b/Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/OrderBy.swift rename to Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/Select.swift b/Sources/Fetching and Querying/Concrete Clauses/Select.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/Select.swift rename to Sources/Fetching and Querying/Concrete Clauses/Select.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/Tweak.swift b/Sources/Fetching and Querying/Concrete Clauses/Tweak.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/Tweak.swift rename to Sources/Fetching and Querying/Concrete Clauses/Tweak.swift diff --git a/CoreStore/Fetching and Querying/Concrete Clauses/Where.swift b/Sources/Fetching and Querying/Concrete Clauses/Where.swift similarity index 100% rename from CoreStore/Fetching and Querying/Concrete Clauses/Where.swift rename to Sources/Fetching and Querying/Concrete Clauses/Where.swift diff --git a/CoreStore/Fetching and Querying/CoreStore+Querying.swift b/Sources/Fetching and Querying/CoreStore+Querying.swift similarity index 100% rename from CoreStore/Fetching and Querying/CoreStore+Querying.swift rename to Sources/Fetching and Querying/CoreStore+Querying.swift diff --git a/CoreStore/Fetching and Querying/DataStack+Querying.swift b/Sources/Fetching and Querying/DataStack+Querying.swift similarity index 100% rename from CoreStore/Fetching and Querying/DataStack+Querying.swift rename to Sources/Fetching and Querying/DataStack+Querying.swift diff --git a/CoreStore/Fetching and Querying/Protocol Clauses/ClauseTypes.swift b/Sources/Fetching and Querying/Protocol Clauses/ClauseTypes.swift similarity index 100% rename from CoreStore/Fetching and Querying/Protocol Clauses/ClauseTypes.swift rename to Sources/Fetching and Querying/Protocol Clauses/ClauseTypes.swift diff --git a/CoreStore/Importing Data/BaseDataTransaction+Importing.swift b/Sources/Importing Data/BaseDataTransaction+Importing.swift similarity index 100% rename from CoreStore/Importing Data/BaseDataTransaction+Importing.swift rename to Sources/Importing Data/BaseDataTransaction+Importing.swift diff --git a/CoreStore/Importing Data/ImportableObject.swift b/Sources/Importing Data/ImportableObject.swift similarity index 100% rename from CoreStore/Importing Data/ImportableObject.swift rename to Sources/Importing Data/ImportableObject.swift diff --git a/CoreStore/Importing Data/ImportableUniqueObject.swift b/Sources/Importing Data/ImportableUniqueObject.swift similarity index 100% rename from CoreStore/Importing Data/ImportableUniqueObject.swift rename to Sources/Importing Data/ImportableUniqueObject.swift diff --git a/CoreStore/Info.plist b/Sources/Info.plist similarity index 100% rename from CoreStore/Info.plist rename to Sources/Info.plist diff --git a/CoreStore/Internal/AssociatedObjects.swift b/Sources/Internal/AssociatedObjects.swift similarity index 100% rename from CoreStore/Internal/AssociatedObjects.swift rename to Sources/Internal/AssociatedObjects.swift diff --git a/CoreStore/Internal/CoreStoreFetchedResultsController.swift b/Sources/Internal/CoreStoreFetchedResultsController.swift similarity index 100% rename from CoreStore/Internal/CoreStoreFetchedResultsController.swift rename to Sources/Internal/CoreStoreFetchedResultsController.swift diff --git a/CoreStore/Internal/FetchedResultsControllerDelegate.swift b/Sources/Internal/FetchedResultsControllerDelegate.swift similarity index 100% rename from CoreStore/Internal/FetchedResultsControllerDelegate.swift rename to Sources/Internal/FetchedResultsControllerDelegate.swift diff --git a/CoreStore/Internal/Functions.swift b/Sources/Internal/Functions.swift similarity index 100% rename from CoreStore/Internal/Functions.swift rename to Sources/Internal/Functions.swift diff --git a/CoreStore/Internal/MigrationManager.swift b/Sources/Internal/MigrationManager.swift similarity index 100% rename from CoreStore/Internal/MigrationManager.swift rename to Sources/Internal/MigrationManager.swift diff --git a/CoreStore/Internal/NSFileManager+Setup.swift b/Sources/Internal/NSFileManager+Setup.swift similarity index 100% rename from CoreStore/Internal/NSFileManager+Setup.swift rename to Sources/Internal/NSFileManager+Setup.swift diff --git a/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift b/Sources/Internal/NSManagedObjectContext+CoreStore.swift similarity index 100% rename from CoreStore/Internal/NSManagedObjectContext+CoreStore.swift rename to Sources/Internal/NSManagedObjectContext+CoreStore.swift diff --git a/CoreStore/Internal/NSManagedObjectContext+Querying.swift b/Sources/Internal/NSManagedObjectContext+Querying.swift similarity index 100% rename from CoreStore/Internal/NSManagedObjectContext+Querying.swift rename to Sources/Internal/NSManagedObjectContext+Querying.swift diff --git a/CoreStore/Internal/NSManagedObjectContext+Setup.swift b/Sources/Internal/NSManagedObjectContext+Setup.swift similarity index 100% rename from CoreStore/Internal/NSManagedObjectContext+Setup.swift rename to Sources/Internal/NSManagedObjectContext+Setup.swift diff --git a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift b/Sources/Internal/NSManagedObjectContext+Transaction.swift similarity index 100% rename from CoreStore/Internal/NSManagedObjectContext+Transaction.swift rename to Sources/Internal/NSManagedObjectContext+Transaction.swift diff --git a/CoreStore/Internal/NSManagedObjectModel+Setup.swift b/Sources/Internal/NSManagedObjectModel+Setup.swift similarity index 100% rename from CoreStore/Internal/NSManagedObjectModel+Setup.swift rename to Sources/Internal/NSManagedObjectModel+Setup.swift diff --git a/CoreStore/Internal/NSPersistentStoreCoordinator+Setup.swift b/Sources/Internal/NSPersistentStoreCoordinator+Setup.swift similarity index 100% rename from CoreStore/Internal/NSPersistentStoreCoordinator+Setup.swift rename to Sources/Internal/NSPersistentStoreCoordinator+Setup.swift diff --git a/CoreStore/Internal/NotificationObserver.swift b/Sources/Internal/NotificationObserver.swift similarity index 100% rename from CoreStore/Internal/NotificationObserver.swift rename to Sources/Internal/NotificationObserver.swift diff --git a/CoreStore/Internal/WeakObject.swift b/Sources/Internal/WeakObject.swift similarity index 100% rename from CoreStore/Internal/WeakObject.swift rename to Sources/Internal/WeakObject.swift diff --git a/CoreStore/Logging/CoreStore+Logging.swift b/Sources/Logging/CoreStore+Logging.swift similarity index 100% rename from CoreStore/Logging/CoreStore+Logging.swift rename to Sources/Logging/CoreStore+Logging.swift diff --git a/CoreStore/Logging/CoreStoreLogger.swift b/Sources/Logging/CoreStoreLogger.swift similarity index 100% rename from CoreStore/Logging/CoreStoreLogger.swift rename to Sources/Logging/CoreStoreLogger.swift diff --git a/CoreStore/Logging/DefaultLogger.swift b/Sources/Logging/DefaultLogger.swift similarity index 100% rename from CoreStore/Logging/DefaultLogger.swift rename to Sources/Logging/DefaultLogger.swift diff --git a/CoreStore/Migrating/CoreStore+Migration.swift b/Sources/Migrating/CoreStore+Migration.swift similarity index 100% rename from CoreStore/Migrating/CoreStore+Migration.swift rename to Sources/Migrating/CoreStore+Migration.swift diff --git a/CoreStore/Migrating/DataStack+Migration.swift b/Sources/Migrating/DataStack+Migration.swift similarity index 100% rename from CoreStore/Migrating/DataStack+Migration.swift rename to Sources/Migrating/DataStack+Migration.swift diff --git a/CoreStore/Migrating/MigrationChain.swift b/Sources/Migrating/MigrationChain.swift similarity index 100% rename from CoreStore/Migrating/MigrationChain.swift rename to Sources/Migrating/MigrationChain.swift diff --git a/CoreStore/Migrating/MigrationResult.swift b/Sources/Migrating/MigrationResult.swift similarity index 100% rename from CoreStore/Migrating/MigrationResult.swift rename to Sources/Migrating/MigrationResult.swift diff --git a/CoreStore/Migrating/MigrationType.swift b/Sources/Migrating/MigrationType.swift similarity index 100% rename from CoreStore/Migrating/MigrationType.swift rename to Sources/Migrating/MigrationType.swift diff --git a/CoreStore/NSError+CoreStore.swift b/Sources/NSError+CoreStore.swift similarity index 100% rename from CoreStore/NSError+CoreStore.swift rename to Sources/NSError+CoreStore.swift diff --git a/CoreStore/Observing/CoreStore+Observing.swift b/Sources/Observing/CoreStore+Observing.swift similarity index 100% rename from CoreStore/Observing/CoreStore+Observing.swift rename to Sources/Observing/CoreStore+Observing.swift diff --git a/CoreStore/Observing/DataStack+Observing.swift b/Sources/Observing/DataStack+Observing.swift similarity index 100% rename from CoreStore/Observing/DataStack+Observing.swift rename to Sources/Observing/DataStack+Observing.swift diff --git a/CoreStore/Observing/ListMonitor.swift b/Sources/Observing/ListMonitor.swift similarity index 100% rename from CoreStore/Observing/ListMonitor.swift rename to Sources/Observing/ListMonitor.swift diff --git a/CoreStore/Observing/ListObserver.swift b/Sources/Observing/ListObserver.swift similarity index 100% rename from CoreStore/Observing/ListObserver.swift rename to Sources/Observing/ListObserver.swift diff --git a/CoreStore/Observing/ObjectMonitor.swift b/Sources/Observing/ObjectMonitor.swift similarity index 100% rename from CoreStore/Observing/ObjectMonitor.swift rename to Sources/Observing/ObjectMonitor.swift diff --git a/CoreStore/Observing/ObjectObserver.swift b/Sources/Observing/ObjectObserver.swift similarity index 100% rename from CoreStore/Observing/ObjectObserver.swift rename to Sources/Observing/ObjectObserver.swift diff --git a/CoreStore/Observing/SectionBy.swift b/Sources/Observing/SectionBy.swift similarity index 100% rename from CoreStore/Observing/SectionBy.swift rename to Sources/Observing/SectionBy.swift diff --git a/CoreStore/Observing/UnsafeDataTransaction+Observing.swift b/Sources/Observing/UnsafeDataTransaction+Observing.swift similarity index 100% rename from CoreStore/Observing/UnsafeDataTransaction+Observing.swift rename to Sources/Observing/UnsafeDataTransaction+Observing.swift diff --git a/CoreStore/Saving and Processing/AsynchronousDataTransaction.swift b/Sources/Saving and Processing/AsynchronousDataTransaction.swift similarity index 100% rename from CoreStore/Saving and Processing/AsynchronousDataTransaction.swift rename to Sources/Saving and Processing/AsynchronousDataTransaction.swift diff --git a/CoreStore/Saving and Processing/BaseDataTransaction.swift b/Sources/Saving and Processing/BaseDataTransaction.swift similarity index 100% rename from CoreStore/Saving and Processing/BaseDataTransaction.swift rename to Sources/Saving and Processing/BaseDataTransaction.swift diff --git a/CoreStore/Saving and Processing/CoreStore+Transaction.swift b/Sources/Saving and Processing/CoreStore+Transaction.swift similarity index 100% rename from CoreStore/Saving and Processing/CoreStore+Transaction.swift rename to Sources/Saving and Processing/CoreStore+Transaction.swift diff --git a/CoreStore/Saving and Processing/DataStack+Transaction.swift b/Sources/Saving and Processing/DataStack+Transaction.swift similarity index 100% rename from CoreStore/Saving and Processing/DataStack+Transaction.swift rename to Sources/Saving and Processing/DataStack+Transaction.swift diff --git a/CoreStore/Saving and Processing/Into.swift b/Sources/Saving and Processing/Into.swift similarity index 100% rename from CoreStore/Saving and Processing/Into.swift rename to Sources/Saving and Processing/Into.swift diff --git a/CoreStore/Saving and Processing/NSManagedObject+Transaction.swift b/Sources/Saving and Processing/NSManagedObject+Transaction.swift similarity index 100% rename from CoreStore/Saving and Processing/NSManagedObject+Transaction.swift rename to Sources/Saving and Processing/NSManagedObject+Transaction.swift diff --git a/CoreStore/Saving and Processing/SaveResult.swift b/Sources/Saving and Processing/SaveResult.swift similarity index 100% rename from CoreStore/Saving and Processing/SaveResult.swift rename to Sources/Saving and Processing/SaveResult.swift diff --git a/CoreStore/Saving and Processing/SynchronousDataTransaction.swift b/Sources/Saving and Processing/SynchronousDataTransaction.swift similarity index 100% rename from CoreStore/Saving and Processing/SynchronousDataTransaction.swift rename to Sources/Saving and Processing/SynchronousDataTransaction.swift diff --git a/CoreStore/Saving and Processing/UnsafeDataTransaction.swift b/Sources/Saving and Processing/UnsafeDataTransaction.swift similarity index 100% rename from CoreStore/Saving and Processing/UnsafeDataTransaction.swift rename to Sources/Saving and Processing/UnsafeDataTransaction.swift diff --git a/CoreStore/Setting Up/CoreStore+Setup.swift b/Sources/Setting Up/CoreStore+Setup.swift similarity index 100% rename from CoreStore/Setting Up/CoreStore+Setup.swift rename to Sources/Setting Up/CoreStore+Setup.swift diff --git a/CoreStore/Setting Up/DataStack.swift b/Sources/Setting Up/DataStack.swift similarity index 100% rename from CoreStore/Setting Up/DataStack.swift rename to Sources/Setting Up/DataStack.swift diff --git a/CoreStore/Setting Up/PersistentStores/InMemoryStore.swift b/Sources/Setting Up/PersistentStores/InMemoryStore.swift similarity index 100% rename from CoreStore/Setting Up/PersistentStores/InMemoryStore.swift rename to Sources/Setting Up/PersistentStores/InMemoryStore.swift diff --git a/CoreStore/Setting Up/PersistentStores/LegacySQLiteStore.swift b/Sources/Setting Up/PersistentStores/LegacySQLiteStore.swift similarity index 100% rename from CoreStore/Setting Up/PersistentStores/LegacySQLiteStore.swift rename to Sources/Setting Up/PersistentStores/LegacySQLiteStore.swift diff --git a/CoreStore/Setting Up/PersistentStores/SQLiteStore.swift b/Sources/Setting Up/PersistentStores/SQLiteStore.swift similarity index 100% rename from CoreStore/Setting Up/PersistentStores/SQLiteStore.swift rename to Sources/Setting Up/PersistentStores/SQLiteStore.swift diff --git a/CoreStore/Setting Up/PersistentStores/StorageInterface.swift b/Sources/Setting Up/PersistentStores/StorageInterface.swift similarity index 100% rename from CoreStore/Setting Up/PersistentStores/StorageInterface.swift rename to Sources/Setting Up/PersistentStores/StorageInterface.swift diff --git a/CoreStore/Setting Up/SetupResult.swift b/Sources/Setting Up/SetupResult.swift similarity index 100% rename from CoreStore/Setting Up/SetupResult.swift rename to Sources/Setting Up/SetupResult.swift