Merge branch 'develop' into corestore4_develop

Browse Source

# Conflicts:
#	CoreStore.podspec
#	Sources/CoreStoreImportableAttributeType.swift
#	Sources/CoreStoreQueryableAttributeType.swift
#	Sources/Info.plist
#	Sources/NSManagedObjectModel+Setup.swift

...

This commit is contained in:

John Estropia committed 2017-05-10 19:11:01 +09:00

2 parents 8ff163af30 42c28b064a

commit e0abb9b0af

143 files changed

+20 -24

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Sources/Transactions/AsynchronousDataTransaction.swift → Sources/AsynchronousDataTransaction.swift

File renamed without changes.

Sources/Importing/BaseDataTransaction+Importing.swift → Sources/BaseDataTransaction+Importing.swift

File renamed without changes.

Sources/Fetching and Querying/BaseDataTransaction+Querying.swift → Sources/BaseDataTransaction+Querying.swift

File renamed without changes.

Sources/Transactions/BaseDataTransaction.swift → Sources/BaseDataTransaction.swift

File renamed without changes.

Sources/ObjectiveC/CSAsynchronousDataTransaction.swift → Sources/CSAsynchronousDataTransaction.swift

File renamed without changes.

Sources/ObjectiveC/CSBaseDataTransaction+Querying.swift → Sources/CSBaseDataTransaction+Querying.swift

File renamed without changes.

Sources/ObjectiveC/CSBaseDataTransaction.swift → Sources/CSBaseDataTransaction.swift

File renamed without changes.

Sources/ObjectiveC/CSClauseTypes.swift → Sources/CSClauseTypes.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore+Migrating.swift → Sources/CSCoreStore+Migrating.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore+Observing.swift → Sources/CSCoreStore+Observing.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore+Querying.swift → Sources/CSCoreStore+Querying.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore+Setup.swift → Sources/CSCoreStore+Setup.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore+Transaction.swift → Sources/CSCoreStore+Transaction.swift

File renamed without changes.

Sources/ObjectiveC/CSCoreStore.swift → Sources/CSCoreStore.swift

File renamed without changes.

Sources/ObjectiveC/CSDataStack+Migrating.swift → Sources/CSDataStack+Migrating.swift

File renamed without changes.

Sources/ObjectiveC/CSDataStack+Observing.swift → Sources/CSDataStack+Observing.swift

File renamed without changes.

Sources/ObjectiveC/CSDataStack+Querying.swift → Sources/CSDataStack+Querying.swift

File renamed without changes.

Sources/ObjectiveC/CSDataStack+Transaction.swift → Sources/CSDataStack+Transaction.swift

File renamed without changes.

Sources/ObjectiveC/CSDataStack.swift → Sources/CSDataStack.swift

File renamed without changes.

Sources/ObjectiveC/CSDynamicSchema.swift → Sources/CSDynamicSchema.swift

File renamed without changes.

Sources/ObjectiveC/CSError.swift → Sources/CSError.swift

File renamed without changes.

Sources/ObjectiveC/CSFrom.swift → Sources/CSFrom.swift

File renamed without changes.

Sources/ObjectiveC/CSGroupBy.swift → Sources/CSGroupBy.swift

File renamed without changes.

Sources/ObjectiveC/CSInMemoryStore.swift → Sources/CSInMemoryStore.swift

File renamed without changes.

Sources/ObjectiveC/CSInto.swift → Sources/CSInto.swift

File renamed without changes.

Sources/ObjectiveC/CSLegacyXcodeDataModelSchema.swift → Sources/CSLegacyXcodeDataModelSchema.swift

File renamed without changes.

Sources/ObjectiveC/CSListMonitor.swift → Sources/CSListMonitor.swift

File renamed without changes.

Sources/ObjectiveC/CSListObserver.swift → Sources/CSListObserver.swift

File renamed without changes.

Sources/ObjectiveC/CSMigrationResult.swift → Sources/CSMigrationResult.swift

File renamed without changes.

Sources/ObjectiveC/CSMigrationType.swift → Sources/CSMigrationType.swift

File renamed without changes.

Sources/ObjectiveC/CSObjectMonitor.swift → Sources/CSObjectMonitor.swift

File renamed without changes.

Sources/ObjectiveC/CSObjectObserver.swift → Sources/CSObjectObserver.swift

File renamed without changes.

Sources/ObjectiveC/CSOrderBy.swift → Sources/CSOrderBy.swift

File renamed without changes.

Sources/ObjectiveC/CSSQliteStore.swift → Sources/CSSQliteStore.swift

File renamed without changes.

Sources/ObjectiveC/CSSaveResult.swift → Sources/CSSaveResult.swift

File renamed without changes.

Sources/ObjectiveC/CSSectionBy.swift → Sources/CSSectionBy.swift

File renamed without changes.

Sources/ObjectiveC/CSSelect.swift → Sources/CSSelect.swift

File renamed without changes.

Sources/ObjectiveC/CSSetupResult.swift → Sources/CSSetupResult.swift

File renamed without changes.

Sources/ObjectiveC/CSStorageInterface.swift → Sources/CSStorageInterface.swift

File renamed without changes.

Sources/ObjectiveC/CSSynchronousDataTransaction.swift → Sources/CSSynchronousDataTransaction.swift

File renamed without changes.

Sources/ObjectiveC/CSTweak.swift → Sources/CSTweak.swift

File renamed without changes.

Sources/ObjectiveC/CSUnsafeDataTransaction.swift → Sources/CSUnsafeDataTransaction.swift

File renamed without changes.

Sources/ObjectiveC/CSWhere.swift → Sources/CSWhere.swift

File renamed without changes.

Sources/ObjectiveC/CSXcodeDataModelSchema.swift → Sources/CSXcodeDataModelSchema.swift

File renamed without changes.

Sources/Fetching and Querying/Protocol Clauses/ClauseTypes.swift → Sources/ClauseTypes.swift

File renamed without changes.

Sources/Logging/CoreStore+CustomDebugStringConvertible.swift → Sources/CoreStore+CustomDebugStringConvertible.swift

File renamed without changes.

Sources/Logging/CoreStore+Logging.swift → Sources/CoreStore+Logging.swift

File renamed without changes.

Sources/Migrating/CoreStore+Migration.swift → Sources/CoreStore+Migration.swift

File renamed without changes.

Sources/Observing/CoreStore+Observing.swift → Sources/CoreStore+Observing.swift

File renamed without changes.

Sources/Fetching and Querying/CoreStore+Querying.swift → Sources/CoreStore+Querying.swift

File renamed without changes.

Sources/Setup/CoreStore+Setup.swift → Sources/CoreStore+Setup.swift

File renamed without changes.

Sources/Transactions/CoreStore+Transaction.swift → Sources/CoreStore+Transaction.swift

File renamed without changes.

Sources/ObjectiveC/CoreStoreBridge.h → Sources/CoreStoreBridge.h

File renamed without changes.

Sources/ObjectiveC/CoreStoreBridge.m → Sources/CoreStoreBridge.m

File renamed without changes.

Sources/ObjectiveC/CoreStoreBridge.swift → Sources/CoreStoreBridge.swift

File renamed without changes.

Sources/Internal/CoreStoreFetchRequest+CoreStore.swift → Sources/CoreStoreFetchRequest+CoreStore.swift

File renamed without changes.

Sources/Internal/CoreStoreFetchedResultsController.swift → Sources/CoreStoreFetchedResultsController.swift

File renamed without changes.

Sources/Logging/CoreStoreLogger.swift → Sources/CoreStoreLogger.swift

File renamed without changes.

Sources/Convenience/CoreStoreObject+Convenience.swift → Sources/CoreStoreObject+Convenience.swift

File renamed without changes.

Sources/Fetching and Querying/CoreStoreObject+Querying.swift → Sources/CoreStoreObject+Querying.swift

File renamed without changes.

Sources/Setup/Dynamic Models/CoreStoreObject.swift → Sources/CoreStoreObject.swift

File renamed without changes.

Sources/Setup/Dynamic Models/Dynamic Schema/CoreStoreSchema.swift → Sources/CoreStoreSchema.swift

File renamed without changes.

Sources/Migrating/Schema Mapping Providers/CustomSchemaMappingProvider.swift → Sources/CustomSchemaMappingProvider.swift

File renamed without changes.

Sources/Migrating/DataStack+Migration.swift → Sources/DataStack+Migration.swift

File renamed without changes.

Sources/Observing/DataStack+Observing.swift → Sources/DataStack+Observing.swift

File renamed without changes.

Sources/Fetching and Querying/DataStack+Querying.swift → Sources/DataStack+Querying.swift

File renamed without changes.

Sources/Transactions/DataStack+Transaction.swift → Sources/DataStack+Transaction.swift

File renamed without changes.

Sources/Setup/DataStack.swift → Sources/DataStack.swift

File renamed without changes.

Sources/Logging/DefaultLogger.swift → Sources/DefaultLogger.swift

File renamed without changes.

Sources/Internal/DispatchQueue+CoreStore.swift → Sources/DispatchQueue+CoreStore.swift

File renamed without changes.

Sources/Setup/Dynamic Models/DynamicObject.swift → Sources/DynamicObject.swift

File renamed without changes.

Sources/Convenience/DynamicSchema+Convenience.swift → Sources/DynamicSchema+Convenience.swift

File renamed without changes.

Sources/Setup/Dynamic Models/Dynamic Schema/DynamicSchema.swift → Sources/DynamicSchema.swift

File renamed without changes.

Sources/Setup/Dynamic Models/Entity.swift → Sources/Entity.swift

File renamed without changes.

Sources/Internal/EntityIdentifier.swift → Sources/EntityIdentifier.swift

File renamed without changes.

Sources/Fetching and Querying/FetchableSource.swift → Sources/FetchableSource.swift

File renamed without changes.

Sources/Internal/FetchedResultsControllerDelegate.swift → Sources/FetchedResultsControllerDelegate.swift

File renamed without changes.

Sources/Fetching and Querying/Concrete Clauses/From.swift → Sources/From.swift

File renamed without changes.

Sources/Internal/Functions.swift → Sources/Functions.swift

File renamed without changes.

Sources/Fetching and Querying/Concrete Clauses/GroupBy.swift → Sources/GroupBy.swift

File renamed without changes.

Sources/Setup/StorageInterfaces/ICloudStore.swift → Sources/ICloudStore.swift

File renamed without changes.

Sources/Setup/StorageInterfaces/ICloudStoreObserver.swift → Sources/ICloudStoreObserver.swift

File renamed without changes.

Sources/Importing/ImportableAttributeType.swift → Sources/ImportableAttributeType.swift

File renamed without changes.

Sources/Importing/ImportableObject.swift → Sources/ImportableObject.swift

File renamed without changes.

Sources/Importing/ImportableUniqueObject.swift → Sources/ImportableUniqueObject.swift

File renamed without changes.

Sources/Setup/StorageInterfaces/InMemoryStore.swift → Sources/InMemoryStore.swift

File renamed without changes.

Sources/Migrating/Schema Mapping Providers/InferredSchemaMappingProvider.swift → Sources/InferredSchemaMappingProvider.swift

File renamed without changes.

Sources/Transactions/Into.swift → Sources/Into.swift

File renamed without changes.

Sources/Setup/StorageInterfaces/LegacySQLiteStore.swift → Sources/LegacySQLiteStore.swift

File renamed without changes.

Sources/Setup/Dynamic Models/Dynamic Schema/LegacyXcodeDataModelSchema.swift → Sources/LegacyXcodeDataModelSchema.swift

File renamed without changes.

Sources/Observing/ListMonitor.swift → Sources/ListMonitor.swift

File renamed without changes.

Sources/Observing/ListObserver.swift → Sources/ListObserver.swift

File renamed without changes.

Sources/Migrating/MigrationChain.swift → Sources/MigrationChain.swift

File renamed without changes.

Sources/Internal/MigrationManager.swift → Sources/MigrationManager.swift

File renamed without changes.

Sources/Migrating/MigrationResult.swift → Sources/MigrationResult.swift

File renamed without changes.

Sources/Migrating/MigrationType.swift → Sources/MigrationType.swift

File renamed without changes.

Sources/Internal/NSEntityDescription+DynamicModel.swift → Sources/NSEntityDescription+DynamicModel.swift

File renamed without changes.

Sources/Internal/NSEntityDescription+Migration.swift → Sources/NSEntityDescription+Migration.swift

File renamed without changes.

Sources/Convenience/NSFetchedResultsController+Convenience.swift → Sources/NSFetchedResultsController+Convenience.swift

File renamed without changes.

Sources/ObjectiveC/NSFetchedResultsController+ObjectiveC.swift → Sources/NSFetchedResultsController+ObjectiveC.swift

File renamed without changes.

Loaded 100 of 143 files, more files were not shown because too many files have changed in this diff. Show more