From 74c64619c3c9e16e017d5e926efae95cb0133398 Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Tue, 8 Aug 2017 07:56:21 +0900 Subject: [PATCH 1/2] Fix compile error for Xcode 9 beta 5 --- Sources/XcodeDataModelSchema.swift | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Sources/XcodeDataModelSchema.swift b/Sources/XcodeDataModelSchema.swift index e4db7ff..19a9819 100644 --- a/Sources/XcodeDataModelSchema.swift +++ b/Sources/XcodeDataModelSchema.swift @@ -145,7 +145,7 @@ public final class XcodeDataModelSchema: DynamicSchema { public required init(modelName: ModelVersion, modelVersionFileURL: URL) { CoreStore.assert( - NSManagedObjectModel(contentsOf: modelVersionFileURL) != nil, + FileManager.default.fileExists(atPath: modelVersionFileURL.path), "Could not find the \"\(modelName).mom\" version file for the model at URL \"\(modelVersionFileURL)\"." ) @@ -164,12 +164,13 @@ public final class XcodeDataModelSchema: DynamicSchema { return cachedRawModel } - if let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL) { - - self.cachedRawModel = rawModel - return rawModel - } - CoreStore.abort("Could not create an \(cs_typeName(NSManagedObjectModel.self)) from the model at URL \"\(self.modelVersionFileURL)\".") + CoreStore.assert( + FileManager.default.fileExists(atPath: self.modelVersionFileURL.path), + "Could not find the \"\(self.modelVersion).mom\" version file for the model at URL \"\(self.modelVersionFileURL)\"." + ) + let rawModel = NSManagedObjectModel(contentsOf: self.modelVersionFileURL) + self.cachedRawModel = rawModel + return rawModel } From f7aaf4fb2a6f71d8edc2092071dec49b0a7a51b2 Mon Sep 17 00:00:00 2001 From: John Rommel Estropia Date: Tue, 8 Aug 2017 08:02:05 +0900 Subject: [PATCH 2/2] Fix compile errors for Xcode 9 beta 5 --- Sources/CoreStore+CustomDebugStringConvertible.swift | 9 --------- Sources/CoreStoreSchema.swift | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift index ca39d52..db99e03 100644 --- a/Sources/CoreStore+CustomDebugStringConvertible.swift +++ b/Sources/CoreStore+CustomDebugStringConvertible.swift @@ -1093,15 +1093,6 @@ fileprivate extension String { return String(repeating: " ", count: level * 4) } - fileprivate func trimSwiftModuleName() -> String { - - if self.hasPrefix("Swift.") { - - return self.substring(from: "Swift.".endIndex) - } - return self - } - fileprivate mutating func indent(_ level: Int) { self = self.replacingOccurrences(of: "\n", with: "\n\(String.indention(level))") diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift index 633f3cb..cbd0c98 100644 --- a/Sources/CoreStoreSchema.swift +++ b/Sources/CoreStoreSchema.swift @@ -538,7 +538,7 @@ public final class CoreStoreSchema: DynamicSchema { } else { - let newMethod = class_getClassMethod(managedObjectClass, newSelector) + let newMethod = class_getClassMethod(managedObjectClass, newSelector)! method_exchangeImplementations(origMethod, newMethod) } }