starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-16 22:16:53 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

swift 3.1 support

Browse Source
This commit is contained in:
John Estropia
2017-02-07 18:17:40 +09:00
parent 69d96c53d6
commit bdf6308d8f
29 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Fetching and Querying/Concrete Clauses/From.swift
View File

@@ -206,7 +206,7 @@ public struct From<T: NSManagedObject> {
return stores?.isEmpty == false
}
internal func upcast() -> From<NSManagedObject> {
internal func downcast() -> From<NSManagedObject> {
return From<NSManagedObject>(
entityClass: self.entityClass,

12
Sources/Importing/CoreDataNativeType.swift
View File

@@ -169,7 +169,7 @@ extension Bool: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Bool? {
return value as Bool
return value.boolValue
}
public func cs_toNativeType() -> CoreStoreNativeType {
@@ -184,7 +184,7 @@ extension Int16: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int16? {
return value as Int16
return value.int16Value
}
public func cs_toNativeType() -> CoreStoreNativeType {
@@ -199,7 +199,7 @@ extension Int32: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int32? {
return value as Int32
return value.int32Value
}
public func cs_toNativeType() -> CoreStoreNativeType {
@@ -214,7 +214,7 @@ extension Int64: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Int64? {
return value as Int64
return value.int64Value
}
public func cs_toNativeType() -> CoreStoreNativeType {
@@ -229,7 +229,7 @@ extension Double: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Double? {
return value as Double
return value.doubleValue
}
public func cs_toNativeType() -> CoreStoreNativeType {
@@ -244,7 +244,7 @@ extension Float: CoreStoreSupportedAttributeType {
public static func cs_fromNativeType(_ value: CoreStoreNativeType) -> Float? {
return value as Float
return value.floatValue
}
public func cs_toNativeType() -> CoreStoreNativeType {

2
Sources/Internal/NSManagedObjectModel+Setup.swift
View File

@@ -123,7 +123,7 @@ internal extension NSManagedObjectModel {
&PropertyKeys.currentModelVersion,
inObject: self
)
return value as? String
return value as String?
}
set {

5
Sources/ObjectiveC/CSAsynchronousDataTransaction.swift
View File

@@ -168,5 +168,8 @@ extension AsynchronousDataTransaction: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSAsynchronousDataTransaction
public var bridgeToObjectiveC: CSAsynchronousDataTransaction {
return CSAsynchronousDataTransaction(self)
}
}

10
Sources/ObjectiveC/CSBaseDataTransaction.swift
View File

@@ -294,13 +294,3 @@ public class CSBaseDataTransaction: NSObject, CoreStoreObjectiveCType {
private let swiftTransaction: BaseDataTransaction
}
//// MARK: - BaseDataTransaction
//
//extension BaseDataTransaction: CoreStoreSwiftType {
//
// // MARK: CoreStoreSwiftType
//
// public typealias ObjectiveCType = CSBaseDataTransaction
//}

5
Sources/ObjectiveC/CSDataStack.swift
View File

@@ -277,5 +277,8 @@ extension DataStack: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSDataStack
public var bridgeToObjectiveC: CSDataStack {
return CSDataStack(self)
}
}

2
Sources/ObjectiveC/CSFrom.swift
View File

@@ -146,7 +146,7 @@ public final class CSFrom: NSObject, CoreStoreObjectiveCType {
public init<T: NSManagedObject>(_ swiftValue: From<T>) {
self.bridgeToSwift = swiftValue.upcast()
self.bridgeToSwift = swiftValue.downcast()
super.init()
}
}

5
Sources/ObjectiveC/CSGroupBy.swift
View File

@@ -118,5 +118,8 @@ extension GroupBy: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSGroupBy
public var bridgeToObjectiveC: CSGroupBy {
return CSGroupBy(self)
}
}

5
Sources/ObjectiveC/CSInMemoryStore.swift
View File

@@ -125,5 +125,8 @@ extension InMemoryStore: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSInMemoryStore
public var bridgeToObjectiveC: CSInMemoryStore {
return CSInMemoryStore(self)
}
}

2
Sources/ObjectiveC/CSInto.swift
View File

@@ -114,7 +114,7 @@ public final class CSInto: NSObject, CoreStoreObjectiveCType {
public required init<T: NSManagedObject>(_ swiftValue: Into<T>) {
self.bridgeToSwift = swiftValue.upcast()
self.bridgeToSwift = swiftValue.downcast()
super.init()
}
}

2
Sources/ObjectiveC/CSListMonitor.swift
View File

@@ -538,7 +538,7 @@ public final class CSListMonitor: NSObject, CoreStoreObjectiveCType {
@nonobjc
public required init<T: NSManagedObject>(_ swiftValue: ListMonitor<T>) {
self.bridgeToSwift = swiftValue.upcast()
self.bridgeToSwift = swiftValue.downcast()
super.init()
}
}

5
Sources/ObjectiveC/CSMigrationResult.swift
View File

@@ -177,5 +177,8 @@ extension MigrationResult: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSMigrationResult
public var bridgeToObjectiveC: CSMigrationResult {
return CSMigrationResult(self)
}
}

5
Sources/ObjectiveC/CSMigrationType.swift
View File

@@ -123,5 +123,8 @@ extension MigrationType: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSMigrationType
public var bridgeToObjectiveC: CSMigrationType {
return CSMigrationType(self)
}
}

2
Sources/ObjectiveC/CSObjectMonitor.swift
View File

@@ -130,7 +130,7 @@ public final class CSObjectMonitor: NSObject, CoreStoreObjectiveCType {
@nonobjc
public required init<T: NSManagedObject>(_ swiftValue: ObjectMonitor<T>) {
self.bridgeToSwift = swiftValue.upcast()
self.bridgeToSwift = swiftValue.downcast()
super.init()
}
}

5
Sources/ObjectiveC/CSOrderBy.swift
View File

@@ -126,5 +126,8 @@ extension OrderBy: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSOrderBy
public var bridgeToObjectiveC: CSOrderBy {
return CSOrderBy(self)
}
}

5
Sources/ObjectiveC/CSSQliteStore.swift
View File

@@ -203,5 +203,8 @@ extension SQLiteStore: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSQLiteStore
public var bridgeToObjectiveC: CSSQLiteStore {
return CSSQLiteStore(self)
}
}

5
Sources/ObjectiveC/CSSaveResult.swift
View File

@@ -177,5 +177,8 @@ extension SaveResult: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSaveResult
public var bridgeToObjectiveC: CSSaveResult {
return CSSaveResult(self)
}
}

5
Sources/ObjectiveC/CSSectionBy.swift
View File

@@ -91,7 +91,10 @@ extension SectionBy: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSectionBy
public var bridgeToObjectiveC: CSSectionBy {
return CSSectionBy(self)
}
}
#endif

5
Sources/ObjectiveC/CSSelect.swift
View File

@@ -192,7 +192,10 @@ extension SelectTerm: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSelectTerm
public var bridgeToObjectiveC: CSSelectTerm {
return CSSelectTerm(self)
}
}

2
Sources/ObjectiveC/CSSetupResult.swift
View File

@@ -181,8 +181,6 @@ extension SetupResult where T: CoreStoreSwiftType, T.ObjectiveCType: CSStorageIn
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSetupResult
public var bridgeToObjectiveC: CSSetupResult {
return CSSetupResult(self)

5
Sources/ObjectiveC/CSSynchronousDataTransaction.swift
View File

@@ -167,5 +167,8 @@ extension SynchronousDataTransaction: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSSynchronousDataTransaction
public var bridgeToObjectiveC: CSSynchronousDataTransaction {
return CSSynchronousDataTransaction(self)
}
}

5
Sources/ObjectiveC/CSTweak.swift
View File

@@ -94,5 +94,8 @@ extension Tweak: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSTweak
public var bridgeToObjectiveC: CSTweak {
return CSTweak(self)
}
}

5
Sources/ObjectiveC/CSUnsafeDataTransaction.swift
View File

@@ -197,5 +197,8 @@ extension UnsafeDataTransaction: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSUnsafeDataTransaction
public var bridgeToObjectiveC: CSUnsafeDataTransaction {
return CSUnsafeDataTransaction(self)
}
}

5
Sources/ObjectiveC/CSWhere.swift
View File

@@ -163,5 +163,8 @@ extension Where: CoreStoreSwiftType {
// MARK: CoreStoreSwiftType
public typealias ObjectiveCType = CSWhere
public var bridgeToObjectiveC: CSWhere {
return CSWhere(self)
}
}

14
Sources/ObjectiveC/CoreStoreBridge.swift
View File

@@ -68,28 +68,20 @@ public protocol CoreStoreSwiftType {
var bridgeToObjectiveC: ObjectiveCType { get }
}
public extension CoreStoreSwiftType where ObjectiveCType: CoreStoreObjectiveCType, Self == ObjectiveCType.SwiftType {
public var bridgeToObjectiveC: ObjectiveCType {
return ObjectiveCType(self)
}
}
// MARK: - Internal
internal func bridge<T: CoreStoreSwiftType>(_ closure: () -> T) -> T.ObjectiveCType where T.ObjectiveCType: CoreStoreObjectiveCType, T == T.ObjectiveCType.SwiftType {
internal func bridge<T: CoreStoreSwiftType>(_ closure: () -> T) -> T.ObjectiveCType {
return closure().bridgeToObjectiveC
}
internal func bridge<T: CoreStoreSwiftType>(_ closure: () -> T?) -> T.ObjectiveCType? where T.ObjectiveCType: CoreStoreObjectiveCType, T == T.ObjectiveCType.SwiftType {
internal func bridge<T: CoreStoreSwiftType>(_ closure: () -> T?) -> T.ObjectiveCType? {
return closure()?.bridgeToObjectiveC
}
internal func bridge<T: CoreStoreSwiftType>(_ closure: () throws -> T) throws -> T.ObjectiveCType where T.ObjectiveCType: CoreStoreObjectiveCType, T == T.ObjectiveCType.SwiftType {
internal func bridge<T: CoreStoreSwiftType>(_ closure: () throws -> T) throws -> T.ObjectiveCType {
do {

2
Sources/ObjectiveC/NSFetchedResultsController+ObjectiveC.swift
View File

@@ -88,7 +88,7 @@ fileprivate func createFRC(fromContext context: NSManagedObjectContext, from: CS
let controller = CoreStoreFetchedResultsController(
context: context,
fetchRequest: CoreStoreFetchRequest().dynamicCast(),
from: from?.bridgeToSwift.upcast(),
from: from?.bridgeToSwift.downcast(),
sectionBy: sectionBy?.bridgeToSwift,
applyFetchClauses: { (fetchRequest) in

4
Sources/Observing/ListMonitor.swift
View File

@@ -675,9 +675,9 @@ public final class ListMonitor<T: NSManagedObject>: Hashable {
)
}
internal func upcast() -> ListMonitor<NSManagedObject> {
internal func downcast() -> ListMonitor<NSManagedObject> {
return unsafeBitCast(self, to: ListMonitor<NSManagedObject>.self)
return unsafeDowncast(self, to: ListMonitor<NSManagedObject>.self)
}
internal func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<T>) -> Void) {

4
Sources/Observing/ObjectMonitor.swift
View File

@@ -210,9 +210,9 @@ public final class ObjectMonitor<EntityType: NSManagedObject>: Equatable {
cs_setAssociatedRetainedObject(nilValue, forKey: &self.didUpdateObjectKey, inObject: observer)
}
internal func upcast() -> ObjectMonitor<NSManagedObject> {
internal func downcast() -> ObjectMonitor<NSManagedObject> {
return unsafeBitCast(self, to: ObjectMonitor<NSManagedObject>.self)
return unsafeDowncast(self, to: ObjectMonitor<NSManagedObject>.self)
}
deinit {

2
Sources/Transactions/Into.swift
View File

@@ -163,7 +163,7 @@ public struct Into<T: NSManagedObject>: Hashable {
internal let inferStoreIfPossible: Bool
internal func upcast() -> Into<NSManagedObject> {
internal func downcast() -> Into<NSManagedObject> {
return Into<NSManagedObject>(
entityClass: self.entityClass,