Merge branch 'release/4.0.0'

Author: ffried

FFCoreData/FFCoreData.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

FFCoreData/FFCoreData.xcodeproj/xcshareddata/xcschemes/FFCoreData.xcscheme

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

FFCoreData/FFCoreData.xcworkspace/contents.xcworkspacedata

@@ -184,7 +184,7 @@ extension CoreDataStack {
         public let storePath: URL
         public private(set) lazy var storeURL: URL = self.storePath.appendingPathComponent(self.sqliteStoreName)
 
-        #if os(OSX)
+        #if os(macOS)
         public let applicationSupportSubfolderName: String
         #endif
 
@@ -199,7 +199,7 @@ extension CoreDataStack {
             }
             return dataFolderURL
         }()
-        #elseif os(OSX)
+        #elseif os(macOS)
         public static func appDataDirectoryURL(withSubfolderName subfolderName: String) -> URL {
             let fileManager = FileManager.default
             let url = fileManager.urls(for: .applicationSupportDirectory, in: .userDomainMask).last!
@@ -231,7 +231,7 @@ extension CoreDataStack {
 
             #if os(iOS) || os(watchOS) || os(tvOS)
                 self.storePath = storePath ?? CoreDataStack.Configuration.appDataDirectoryURL
-            #elseif os(OSX)
+            #elseif os(macOS)
                 let subfolderName = appSupportFolderName ?? bundle.bundleIdentifier ?? targetName(from: bundle)
                 self.applicationSupportSubfolderName = subfolderName
                 self.storePath = storePath ?? CoreDataStack.Configuration.appDataDirectoryURL(withSubfolderName: subfolderName)
@@ -242,7 +242,7 @@ extension CoreDataStack {
         public init(bundle: Bundle, storePath: URL? = nil, modelName: String? = nil, sqliteName: String? = nil, removeNamespaces: Bool = true) {
             self.init(bundle: bundle, modelName: modelName, sqliteName: sqliteName, storePath: storePath, appSupportFolderName: nil, removeNamespaces: removeNamespaces)
         }
-        #elseif os(OSX)
+        #elseif os(macOS)
         public init(bundle: Bundle, applicationSupportSubfolder: String? = nil, storePath: URL? = nil, modelName: String? = nil, sqliteName: String? = nil, removeNamespaces: Bool = true) {
             self.init(bundle: bundle, modelName: modelName, sqliteName: sqliteName, storePath: storePath, appSupportFolderName: applicationSupportSubfolder, removeNamespaces: removeNamespaces)
         }

FFCoreData/FFCoreData.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.3</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

…oreData/FFCoreData/CoreDataManager.swift …ta/CoreDataManager/CoreDataManager.swiftFFCoreData/FFCoreData/CoreDataManager.swift renamed to FFCoreData/FFCoreData/CoreDataManager/CoreDataManager.swift FFCoreData/FFCoreData/CoreDataManager.swift renamed to FFCoreData/FFCoreData/CoreDataManager/CoreDataManager.swift

@@ -26,7 +26,7 @@ import class CoreData.NSManagedObjectContext
 public final class MOCObjectsObserver: MOCObserver {
     public var objectIDs: [NSManagedObjectID] {
         didSet {
-            precondition(objectIDs.filter { $0.isTemporaryID }.isEmpty,
+            precondition(!objectIDs.contains { $0.isTemporaryID },
                    "FFCoreData: ERROR: Temporary NSManagedObjectIDs set on MOCObjectsObserver! Be sure to only use non-temporary IDs for MOCObservers!")
         }
     }