modo-studio/SugarRecord
1
1
Fork 0
mirror of https://github.com/modo-studio/SugarRecord.git synced 2024-09-11 14:36:41 +03:00
Code Issues Projects Releases Wiki Activity

[feature/carthage] Bump Swift version to 2.3

Browse Source
This commit is contained in:
Pedro Piñera Buendía 2016-09-08 00:49:58 +02:00
parent 732850f923
commit c77f9e0aca
5 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CarthageProjects/SugarRecord.xcodeproj/project.pbxproj
View File

@ -931,15 +931,31 @@
TargetAttributes = {
2334C4691D7DD8A500ACBC3A = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
};
2334C49D1D7DD93600ACBC3A = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
};
2334C4AA1D7DD95C00ACBC3A = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
};
2334C4B71D7DD97B00ACBC3A = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
};
2334C4C01D7DDA1400ACBC3A = {
LastSwiftMigration = 0800;
};
2334C4CA1D7DDA4F00ACBC3A = {
LastSwiftMigration = 0800;
};
2334C4D41D7DDA9900ACBC3A = {
LastSwiftMigration = 0800;
};
2334C4DE1D7DDAEF00ACBC3A = {
LastSwiftMigration = 0800;
};
};
};
@ -1381,6 +1397,7 @@
PRODUCT_BUNDLE_IDENTIFIER = in.caramba.SugarRecord;
PRODUCT_NAME = SugarRecordCoreData;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@ -1398,6 +1415,7 @@
PRODUCT_BUNDLE_IDENTIFIER = in.caramba.SugarRecord;
PRODUCT_NAME = SugarRecordCoreData;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};
@ -1417,6 +1435,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
@ -1438,6 +1457,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
@ -1458,6 +1478,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
};
@ -1478,6 +1499,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
};
@ -1502,6 +1524,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@ -1524,6 +1547,7 @@
PRODUCT_NAME = SugarRecordCoreData;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};
@ -1542,6 +1566,7 @@
PRODUCT_BUNDLE_IDENTIFIER = in.caramba.SugarRecord;
PRODUCT_NAME = SugarRecord;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@ -1560,6 +1585,7 @@
PRODUCT_BUNDLE_IDENTIFIER = in.caramba.SugarRecord;
PRODUCT_NAME = SugarRecord;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};
@ -1580,6 +1606,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
@ -1602,6 +1629,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.2;
};
@ -1623,6 +1651,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
};
@ -1644,6 +1673,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
};
@ -1669,6 +1699,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@ -1692,6 +1723,7 @@
PRODUCT_NAME = SugarRecordRealm;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};

18
SugarRecord/Source/CoreData/Entities/CoreDataObservable.swift
View File

@ -54,23 +54,11 @@ public class CoreDataObservable<T: NSManagedObject where T:Equatable>: RequestOb
public func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
switch type {
case .Delete:
#if os(watchOS) || os(tvOS)
self.batchChanges.append(.Delete(indexPath!.indexAtPosition(0), anObject as! T))
#else
self.batchChanges.append(.Delete(indexPath!.row, anObject as! T))
#endif
self.batchChanges.append(.Delete(indexPath!.indexAtPosition(0), anObject as! T))
case .Insert:
#if os(watchOS) || os(tvOS)
self.batchChanges.append(.Insert(newIndexPath!.indexAtPosition(0), anObject as! T))
#else
self.batchChanges.append(.Insert(newIndexPath!.row, anObject as! T))
#endif
self.batchChanges.append(.Insert(newIndexPath!.indexAtPosition(0), anObject as! T))
case .Update:
#if os(watchOS) || os(tvOS)
self.batchChanges.append(.Update(indexPath!.indexAtPosition(0), anObject as! T))
#else
self.batchChanges.append(.Update(indexPath!.row, anObject as! T))
#endif
self.batchChanges.append(.Update(indexPath!.indexAtPosition(0), anObject as! T))
default: break
}
}

2
SugarRecord/Source/CoreData/Entities/Store.swift
View File

@ -12,7 +12,7 @@ public extension CoreData {
switch self {
case .URL(let url): return url
case .Named(let name):
return NSURL(fileURLWithPath: documentsDirectory()).URLByAppendingPathComponent(name)
return NSURL(fileURLWithPath: documentsDirectory()).URLByAppendingPathComponent(name)!
}
}

2
SugarRecord/Source/CoreData/Storages/CoreDataDefaultStorage.swift
View File

@ -180,7 +180,7 @@ internal func cdAddPersistentStore(store: CoreData.Store, storeCoordinator: NSPe
}
internal func cdCleanStoreFilesAfterFailedMigration(store store: CoreData.Store) throws {
let rawUrl: String = store.path().absoluteString
let rawUrl: String = store.path().absoluteString!
let shmSidecar: NSURL = NSURL(string: rawUrl.stringByAppendingString("-shm"))!
let walSidecar: NSURL = NSURL(string: rawUrl.stringByAppendingString("-wal"))!
try NSFileManager.defaultManager().removeItemAtURL(store.path())

2
SugarRecord/Source/CoreData/Storages/CoreDataiCloudStorage.swift
View File

@ -133,6 +133,6 @@ internal func cdiCloudInitializeStore(storeCoordinator storeCoordinator: NSPersi
var options = CoreData.Options.Migration.dict()
options[NSPersistentStoreUbiquitousContentURLKey] = storeURL
options[NSPersistentStoreUbiquitousContentNameKey] = iCloud.ubiquitousContentName
let store = CoreData.Store.URL(storeURL)
let store = CoreData.Store.URL(storeURL!)
return try (store, cdAddPersistentStore(store, storeCoordinator: storeCoordinator, options: options))
}