Merge branch 'develop' into datasources

# Conflicts:
#	CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
#	CoreStoreTests/DynamicModelTests.swift
#	Sources/BaseDataTransaction+Importing.swift
#	Sources/CoreStoreObject.swift
#	Sources/CustomSchemaMappingProvider.swift
#	Sources/DynamicObject.swift
#	Sources/Functions.swift
#	Sources/ImportableUniqueObject.swift
#	Sources/NSManagedObjectContext+Querying.swift
This commit is contained in:
John Estropia
2019-08-29 17:15:45 +09:00
97 changed files with 2224 additions and 1721 deletions

View File

@@ -303,7 +303,7 @@ public final class SQLiteStore: LocalStorage {
// MARK: Internal
internal static let defaultRootDirectory: URL = cs_lazy {
internal static let defaultRootDirectory: URL = Internals.with {
#if os(tvOS)
let systemDirectorySearchPath = FileManager.SearchPathDirectory.cachesDirectory
@@ -328,7 +328,7 @@ public final class SQLiteStore: LocalStorage {
)
.appendingPathExtension("sqlite")
internal static let legacyDefaultRootDirectory: URL = cs_lazy {
internal static let legacyDefaultRootDirectory: URL = Internals.with {
#if os(tvOS)
let systemDirectorySearchPath = FileManager.SearchPathDirectory.cachesDirectory
@@ -341,7 +341,7 @@ public final class SQLiteStore: LocalStorage {
in: .userDomainMask).first!
}
internal static let legacyDefaultFileURL = cs_lazy {
internal static let legacyDefaultFileURL = Internals.with {
return SQLiteStore.legacyDefaultRootDirectory
.appendingPathComponent(DataStack.applicationName, isDirectory: false)