diff --git a/CoreStore.podspec b/CoreStore.podspec index 2600d7e..20e0c36 100644 --- a/CoreStore.podspec +++ b/CoreStore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CoreStore" - s.version = "5.2.0" + s.version = "5.3.0" s.swift_version = "4.1" s.license = "MIT" s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift" diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 593997e..a37bae9 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -2695,7 +2695,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -2757,7 +2757,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -2783,7 +2783,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -2803,7 +2803,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -2824,7 +2824,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -2840,7 +2840,7 @@ SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -2861,7 +2861,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; }; name = Debug; @@ -2883,7 +2883,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; }; name = Release; @@ -2902,7 +2902,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; }; name = Debug; @@ -2921,7 +2921,7 @@ SDKROOT = appletvos; SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; }; name = Release; @@ -2947,7 +2947,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -2973,7 +2973,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -2994,7 +2994,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -3015,7 +3015,7 @@ SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -3037,7 +3037,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; }; name = Debug; @@ -3061,7 +3061,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; }; name = Release; diff --git a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift index 6e433b7..e3be77d 100644 --- a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift +++ b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/02. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib index 8286b32..e53eb1b 100644 --- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib +++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib @@ -1,9 +1,11 @@ - - + + + + + - - - + + @@ -12,10 +14,10 @@ - - + diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift index d39a850..9a62511 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingAndQueryingDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/12. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift index d49c5f2..875be32 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/17. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift index 2f01c73..66d8227 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/17. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift index 35780e0..97c8cbd 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/TimeZone.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/15. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift index 133e2bb..849f0fb 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/02. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift index 0af561b..f76d107 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/06. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift index a59e085..b8f74cf 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift index 31f93ed..8888a1a 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/05. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift index cb61495..eeb1b1f 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/05. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift index 9a309ed..1548c5a 100644 --- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/05. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift index 56fa48f..7443e71 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift index 918939e..d38fb95 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismProtocol.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift index 94996b0..924b323 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/07/12. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift index e0b76de..818ad7c 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV1.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift index 527ef5f..e2c242a 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/21. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift index cbb9cbe..ca10fb8 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV2ToV3MigrationPolicy.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import CoreData diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift index eb508aa..99afd41 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/OrganismV3.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/27. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift index b7a1124..3316b44 100644 --- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift +++ b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/FemaleAccount.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/06. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift index 65631bd..2d55e72 100644 --- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift +++ b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/MaleAccount.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/06/06. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift index df64d9d..1487f31 100644 --- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/StackSetupDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift index 6f72237..53635cd 100644 --- a/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift +++ b/CoreStoreDemo/CoreStoreDemo/Stack Setup Demo/UserAccount.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift index f2389a4..3d68f0c 100644 --- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift +++ b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/Place.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import Foundation diff --git a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift index 7aca9d8..b7c67fa 100644 --- a/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift @@ -3,7 +3,7 @@ // CoreStoreDemo // // Created by John Rommel Estropia on 2015/05/24. -// Copyright © 2015 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // import UIKit diff --git a/CoreStoreTests/BaseTests/BaseTestCase.swift b/CoreStoreTests/BaseTests/BaseTestCase.swift index a487b31..d2e75b9 100644 --- a/CoreStoreTests/BaseTests/BaseTestCase.swift +++ b/CoreStoreTests/BaseTests/BaseTestCase.swift @@ -2,7 +2,7 @@ // BaseTestCase.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift b/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift index 36a7a01..8b41f5b 100644 --- a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift +++ b/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift @@ -2,7 +2,7 @@ // BaseTestDataTestCase.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/BridgingTests.h b/CoreStoreTests/BridgingTests.h index 4785d6d..e2661da 100644 --- a/CoreStoreTests/BridgingTests.h +++ b/CoreStoreTests/BridgingTests.h @@ -2,7 +2,7 @@ // BridgingTests.h // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/BridgingTests.m b/CoreStoreTests/BridgingTests.m index aa81b49..7150ffc 100644 --- a/CoreStoreTests/BridgingTests.m +++ b/CoreStoreTests/BridgingTests.m @@ -2,7 +2,7 @@ // BridgingTests.m // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -193,7 +193,17 @@ XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]); XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType); XCTAssertNil(sqliteStorage.configuration); - XCTAssertEqualObjects(sqliteStorage.storeOptions, @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" } }); + NSDictionary *storeOptions; + if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, *)) { + + storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }, + NSBinaryStoreInsecureDecodingCompatibilityOption: @YES }; + } + else { + + storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }}; + } + XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions); XCTAssertNil(sqliteError); } diff --git a/CoreStoreTests/ConvenienceTests.swift b/CoreStoreTests/ConvenienceTests.swift index 98b24cf..5f605de 100644 --- a/CoreStoreTests/ConvenienceTests.swift +++ b/CoreStoreTests/ConvenienceTests.swift @@ -2,7 +2,7 @@ // ConvenienceTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreStore // MARK: - ConvenienceTests -@available(OSX 10.12, *) +@available(macOS 10.12, *) class ConvenienceTests: BaseTestCase { @objc diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift index 8cadd78..647955a 100644 --- a/CoreStoreTests/DynamicModelTests.swift +++ b/CoreStoreTests/DynamicModelTests.swift @@ -2,7 +2,7 @@ // DynamicModelTests.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import XCTest @testable import CoreStore -#if os(OSX) +#if os(macOS) typealias Color = NSColor #else @@ -171,7 +171,7 @@ class DynamicModelTests: BaseTestDataTestCase { XCTAssertTrue(person.pets.value.isEmpty) XCTAssertEqual( - type(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"), + cs_dynamicType(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"), ["title", "name"] ) diff --git a/CoreStoreTests/ErrorTests.swift b/CoreStoreTests/ErrorTests.swift index 0bb46b7..46f1747 100644 --- a/CoreStoreTests/ErrorTests.swift +++ b/CoreStoreTests/ErrorTests.swift @@ -2,7 +2,7 @@ // ErrorTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/FetchTests.swift b/CoreStoreTests/FetchTests.swift index 5d1037e..5b81514 100644 --- a/CoreStoreTests/FetchTests.swift +++ b/CoreStoreTests/FetchTests.swift @@ -2,7 +2,7 @@ // FetchTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/FromTests.swift b/CoreStoreTests/FromTests.swift index b43c979..88477be 100644 --- a/CoreStoreTests/FromTests.swift +++ b/CoreStoreTests/FromTests.swift @@ -2,7 +2,7 @@ // FromTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/GroupByTests.swift b/CoreStoreTests/GroupByTests.swift index 5f57f26..7735181 100644 --- a/CoreStoreTests/GroupByTests.swift +++ b/CoreStoreTests/GroupByTests.swift @@ -2,7 +2,7 @@ // GroupByTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/ImportTests.swift b/CoreStoreTests/ImportTests.swift index 05cb7fc..3b414e6 100644 --- a/CoreStoreTests/ImportTests.swift +++ b/CoreStoreTests/ImportTests.swift @@ -2,7 +2,7 @@ // ImportTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/IntoTests.swift b/CoreStoreTests/IntoTests.swift index 3f5f2be..6cf74c8 100644 --- a/CoreStoreTests/IntoTests.swift +++ b/CoreStoreTests/IntoTests.swift @@ -2,7 +2,7 @@ // IntoTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/ListObserverTests.swift b/CoreStoreTests/ListObserverTests.swift index 64ad58f..b89d4a7 100644 --- a/CoreStoreTests/ListObserverTests.swift +++ b/CoreStoreTests/ListObserverTests.swift @@ -2,7 +2,7 @@ // ListObserverTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ import CoreStore // MARK: - ListObserverTests -@available(OSX 10.12, *) +@available(macOS 10.12, *) class ListObserverTests: BaseTestDataTestCase { @objc @@ -551,7 +551,7 @@ class ListObserverTests: BaseTestDataTestCase { // MARK: TestListObserver -@available(OSX 10.12, *) +@available(macOS 10.12, *) class TestListObserver: ListSectionObserver { // MARK: ListObserver diff --git a/CoreStoreTests/MigrationChainTests.swift b/CoreStoreTests/MigrationChainTests.swift index 284107c..30ea94e 100644 --- a/CoreStoreTests/MigrationChainTests.swift +++ b/CoreStoreTests/MigrationChainTests.swift @@ -2,7 +2,7 @@ // MigrationChainTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/ObjectObserverTests.swift b/CoreStoreTests/ObjectObserverTests.swift index c544f3d..95a53e4 100644 --- a/CoreStoreTests/ObjectObserverTests.swift +++ b/CoreStoreTests/ObjectObserverTests.swift @@ -2,7 +2,7 @@ // ObjectObserverTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ import CoreStore // MARK: - ObjectObserverTests -@available(OSX 10.12, *) +@available(macOS 10.12, *) class ObjectObserverTests: BaseTestDataTestCase { @objc @@ -203,7 +203,7 @@ class ObjectObserverTests: BaseTestDataTestCase { // MARK: TestObjectObserver -@available(OSX 10.12, *) +@available(macOS 10.12, *) class TestObjectObserver: ObjectObserver { typealias ObjectEntityType = TestEntity1 diff --git a/CoreStoreTests/OrderByTests.swift b/CoreStoreTests/OrderByTests.swift index c1d861e..1a87633 100644 --- a/CoreStoreTests/OrderByTests.swift +++ b/CoreStoreTests/OrderByTests.swift @@ -2,7 +2,7 @@ // OrderByTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/QueryTests.swift b/CoreStoreTests/QueryTests.swift index a848c46..3e6fc07 100644 --- a/CoreStoreTests/QueryTests.swift +++ b/CoreStoreTests/QueryTests.swift @@ -2,7 +2,7 @@ // QueryTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/SectionByTests.swift b/CoreStoreTests/SectionByTests.swift index 686d109..eb23457 100644 --- a/CoreStoreTests/SectionByTests.swift +++ b/CoreStoreTests/SectionByTests.swift @@ -2,7 +2,7 @@ // SectionByTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ import CoreStore //MARK: - SectionByTests -@available(OSX 10.12, *) +@available(macOS 10.12, *) final class SectionByTests: XCTestCase { @objc diff --git a/CoreStoreTests/SelectTests.swift b/CoreStoreTests/SelectTests.swift index a2067e0..b9a41c3 100644 --- a/CoreStoreTests/SelectTests.swift +++ b/CoreStoreTests/SelectTests.swift @@ -2,7 +2,7 @@ // SelectTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/SetupTests.swift b/CoreStoreTests/SetupTests.swift index 87aef49..8750299 100644 --- a/CoreStoreTests/SetupTests.swift +++ b/CoreStoreTests/SetupTests.swift @@ -2,7 +2,7 @@ // SetupTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/StorageInterfaceTests.swift b/CoreStoreTests/StorageInterfaceTests.swift index 23f9615..ea06c57 100644 --- a/CoreStoreTests/StorageInterfaceTests.swift +++ b/CoreStoreTests/StorageInterfaceTests.swift @@ -2,7 +2,7 @@ // StorageInterfaceTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -83,7 +83,21 @@ final class StorageInterfaceTests: XCTestCase { let store = SQLiteStore() XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType) XCTAssertNil(store.configuration) - XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary) + if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"], + NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary + ) + } + else { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary + ) + } XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL) XCTAssertTrue(store.migrationMappingProviders.isEmpty) @@ -109,7 +123,21 @@ final class StorageInterfaceTests: XCTestCase { ) XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType) XCTAssertEqual(store.configuration, "config1") - XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary) + if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"], + NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary + ) + } + else { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary + ) + } XCTAssertEqual(store.fileURL, fileURL) XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider]) @@ -132,7 +160,21 @@ final class StorageInterfaceTests: XCTestCase { ) XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType) XCTAssertEqual(store.configuration, "config1") - XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary) + if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"], + NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary + ) + } + else { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary + ) + } XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory) XCTAssertEqual(store.fileURL.lastPathComponent, fileName) @@ -167,7 +209,21 @@ final class StorageInterfaceTests: XCTestCase { let store = SQLiteStore.legacy() XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType) XCTAssertNil(store.configuration) - XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary) + if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"], + NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary + ) + } + else { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary + ) + } XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL) XCTAssertTrue(store.migrationMappingProviders.isEmpty) @@ -190,7 +246,21 @@ final class StorageInterfaceTests: XCTestCase { ) XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType) XCTAssertEqual(store.configuration, "config1") - XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary) + if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"], + NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary + ) + } + else { + + XCTAssertEqual( + store.storeOptions as NSDictionary?, + [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary + ) + } XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory) XCTAssertEqual(store.fileURL.lastPathComponent, fileName) diff --git a/CoreStoreTests/TestEntities/TestEntity1.swift b/CoreStoreTests/TestEntities/TestEntity1.swift index 13f52ec..f7cdd19 100644 --- a/CoreStoreTests/TestEntities/TestEntity1.swift +++ b/CoreStoreTests/TestEntities/TestEntity1.swift @@ -2,7 +2,7 @@ // TestEntity1.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/TestEntities/TestEntity2.swift b/CoreStoreTests/TestEntities/TestEntity2.swift index 05419ca..f4484a8 100644 --- a/CoreStoreTests/TestEntities/TestEntity2.swift +++ b/CoreStoreTests/TestEntities/TestEntity2.swift @@ -2,7 +2,7 @@ // TestEntity1.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/TransactionTests.swift b/CoreStoreTests/TransactionTests.swift index c138f5b..318f9f4 100644 --- a/CoreStoreTests/TransactionTests.swift +++ b/CoreStoreTests/TransactionTests.swift @@ -2,7 +2,7 @@ // TransactionTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -387,7 +387,7 @@ final class TransactionTests: BaseTestCase { } - @available(OSX 10.12, *) + @available(macOS 10.12, *) @objc dynamic func test_ThatSynchronousTransactions_CanCommitWithoutWaitingForMerges() { diff --git a/CoreStoreTests/TweakTests.swift b/CoreStoreTests/TweakTests.swift index d8f1aae..467c1e5 100644 --- a/CoreStoreTests/TweakTests.swift +++ b/CoreStoreTests/TweakTests.swift @@ -2,7 +2,7 @@ // TweakTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/CoreStoreTests/WhereTests.swift b/CoreStoreTests/WhereTests.swift index 35540ab..a384147 100644 --- a/CoreStoreTests/WhereTests.swift +++ b/CoreStoreTests/WhereTests.swift @@ -2,7 +2,7 @@ // WhereTests.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/LICENSE b/LICENSE index 281de9f..4348b7f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright © 2014 John Rommel Estropia +Copyright © 2018 John Rommel Estropia Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Package.swift b/Package.swift index 0680db5..73d09d0 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ // Package.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ import PackageDescription let targets: [Target] #if os(iOS) targets = [Target(name: "CoreStore iOS")] -#elseif os(OSX) +#elseif os(macOS) targets = [Target(name: "CoreStore OSX")] #elseif os(watchOS) targets = [Target(name: "CoreStore watchOS")] diff --git a/README.md b/README.md index 50b81da..850c227 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift

-* **Swift 4.1:** iOS 9+ / macOS 10.10+ / watchOS 2.0+ / tvOS 9.0+ +* **Swift 4.2:** iOS 9+ / macOS 10.10+ / watchOS 2.0+ / tvOS 9.0+ * Other Swift versions: [Swift 3.2(version 4.2.3)](https://github.com/JohnEstropia/CoreStore/tree/4.2.3) Upgrading from CoreStore 4.2 (Swift 3.2) to 5.x (Swift 4.x)? Check out the [new features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases). diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift index a598e03..be5259e 100644 --- a/Sources/AsynchronousDataTransaction.swift +++ b/Sources/AsynchronousDataTransaction.swift @@ -2,7 +2,7 @@ // AsynchronousDataTransaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/AttributeProtocol.swift b/Sources/AttributeProtocol.swift index 86b97c7..11c3849 100644 --- a/Sources/AttributeProtocol.swift +++ b/Sources/AttributeProtocol.swift @@ -2,7 +2,7 @@ // AttributeProtocol.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/BaseDataTransaction+Importing.swift b/Sources/BaseDataTransaction+Importing.swift index 1c4955d..c55397d 100644 --- a/Sources/BaseDataTransaction+Importing.swift +++ b/Sources/BaseDataTransaction+Importing.swift @@ -2,7 +2,7 @@ // BaseDataTransaction+Importing.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -80,7 +80,7 @@ public extension BaseDataTransaction { try autoreleasepool { - let entityType = type(of: object) + let entityType = cs_dynamicType(of: object) guard entityType.shouldInsert(from: source, in: self) else { return diff --git a/Sources/BaseDataTransaction+Querying.swift b/Sources/BaseDataTransaction+Querying.swift index 7661762..39b05bd 100644 --- a/Sources/BaseDataTransaction+Querying.swift +++ b/Sources/BaseDataTransaction+Querying.swift @@ -2,7 +2,7 @@ // BaseDataTransaction+Querying.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift index ada259a..fb53382 100644 --- a/Sources/BaseDataTransaction.swift +++ b/Sources/BaseDataTransaction.swift @@ -2,7 +2,7 @@ // BaseDataTransaction.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSAsynchronousDataTransaction.swift b/Sources/CSAsynchronousDataTransaction.swift index 34074c2..99a432b 100644 --- a/Sources/CSAsynchronousDataTransaction.swift +++ b/Sources/CSAsynchronousDataTransaction.swift @@ -2,7 +2,7 @@ // CSAsynchronousDataTransaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSBaseDataTransaction+Querying.swift b/Sources/CSBaseDataTransaction+Querying.swift index 3a23037..357fe66 100644 --- a/Sources/CSBaseDataTransaction+Querying.swift +++ b/Sources/CSBaseDataTransaction+Querying.swift @@ -2,7 +2,7 @@ // CSBaseDataTransaction+Querying.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSBaseDataTransaction.swift b/Sources/CSBaseDataTransaction.swift index 7eb55d1..ae88425 100644 --- a/Sources/CSBaseDataTransaction.swift +++ b/Sources/CSBaseDataTransaction.swift @@ -2,7 +2,7 @@ // CSBaseDataTransaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSClauseTypes.swift b/Sources/CSClauseTypes.swift index 7699912..c73a5c4 100644 --- a/Sources/CSClauseTypes.swift +++ b/Sources/CSClauseTypes.swift @@ -2,7 +2,7 @@ // CSClauseTypes.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSCoreStore+Migrating.swift b/Sources/CSCoreStore+Migrating.swift index 8e99891..d8dfd2b 100644 --- a/Sources/CSCoreStore+Migrating.swift +++ b/Sources/CSCoreStore+Migrating.swift @@ -2,7 +2,7 @@ // CSCoreStore+Migrating.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSCoreStore+Observing.swift b/Sources/CSCoreStore+Observing.swift index 9652b16..53bf38f 100644 --- a/Sources/CSCoreStore+Observing.swift +++ b/Sources/CSCoreStore+Observing.swift @@ -2,7 +2,7 @@ // CSCoreStore+Observing.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - CSCoreStore -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension CSCoreStore { /** diff --git a/Sources/CSCoreStore+Querying.swift b/Sources/CSCoreStore+Querying.swift index 18f8864..03d6d35 100644 --- a/Sources/CSCoreStore+Querying.swift +++ b/Sources/CSCoreStore+Querying.swift @@ -2,7 +2,7 @@ // CSCoreStore+Querying.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSCoreStore+Setup.swift b/Sources/CSCoreStore+Setup.swift index 440478b..06cbb3e 100644 --- a/Sources/CSCoreStore+Setup.swift +++ b/Sources/CSCoreStore+Setup.swift @@ -2,7 +2,7 @@ // CSCoreStore+Setup.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSCoreStore+Transaction.swift b/Sources/CSCoreStore+Transaction.swift index ad19038..eeb1137 100644 --- a/Sources/CSCoreStore+Transaction.swift +++ b/Sources/CSCoreStore+Transaction.swift @@ -2,7 +2,7 @@ // CSCoreStore+Transaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSCoreStore.swift b/Sources/CSCoreStore.swift index 1d552af..7dbb47f 100644 --- a/Sources/CSCoreStore.swift +++ b/Sources/CSCoreStore.swift @@ -2,7 +2,7 @@ // CSCoreStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSDataStack+Migrating.swift b/Sources/CSDataStack+Migrating.swift index 51d4525..b00cb0f 100644 --- a/Sources/CSDataStack+Migrating.swift +++ b/Sources/CSDataStack+Migrating.swift @@ -2,7 +2,7 @@ // CSDataStack+Migrating.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSDataStack+Observing.swift b/Sources/CSDataStack+Observing.swift index 897d393..93c0106 100644 --- a/Sources/CSDataStack+Observing.swift +++ b/Sources/CSDataStack+Observing.swift @@ -2,7 +2,7 @@ // CSDataStack+Observing.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - CSDataStack -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension CSDataStack { /** diff --git a/Sources/CSDataStack+Querying.swift b/Sources/CSDataStack+Querying.swift index fadfd8e..9d5bfa0 100644 --- a/Sources/CSDataStack+Querying.swift +++ b/Sources/CSDataStack+Querying.swift @@ -2,7 +2,7 @@ // CSDataStack+Querying.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSDataStack+Transaction.swift b/Sources/CSDataStack+Transaction.swift index 0a8e90d..10d800f 100644 --- a/Sources/CSDataStack+Transaction.swift +++ b/Sources/CSDataStack+Transaction.swift @@ -2,7 +2,7 @@ // CSDataStack+Transaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSDataStack.swift b/Sources/CSDataStack.swift index 1822ac6..925dea5 100644 --- a/Sources/CSDataStack.swift +++ b/Sources/CSDataStack.swift @@ -2,7 +2,7 @@ // CSDataStack.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSDynamicSchema.swift b/Sources/CSDynamicSchema.swift index 39004d0..735b0e0 100644 --- a/Sources/CSDynamicSchema.swift +++ b/Sources/CSDynamicSchema.swift @@ -2,7 +2,7 @@ // CSDynamicSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSError.swift b/Sources/CSError.swift index d886a52..cec4792 100644 --- a/Sources/CSError.swift +++ b/Sources/CSError.swift @@ -2,7 +2,7 @@ // CSError.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSFrom.swift b/Sources/CSFrom.swift index 50d9d6c..155b6cb 100644 --- a/Sources/CSFrom.swift +++ b/Sources/CSFrom.swift @@ -2,7 +2,7 @@ // CSFrom.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSGroupBy.swift b/Sources/CSGroupBy.swift index f5f97c2..54e9add 100644 --- a/Sources/CSGroupBy.swift +++ b/Sources/CSGroupBy.swift @@ -2,7 +2,7 @@ // CSGroupBy.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSInMemoryStore.swift b/Sources/CSInMemoryStore.swift index d98c4ad..72a1b9b 100644 --- a/Sources/CSInMemoryStore.swift +++ b/Sources/CSInMemoryStore.swift @@ -2,7 +2,7 @@ // CSInMemoryStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSInto.swift b/Sources/CSInto.swift index 6f3687f..420d4a6 100644 --- a/Sources/CSInto.swift +++ b/Sources/CSInto.swift @@ -2,7 +2,7 @@ // CSInto.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSListMonitor.swift b/Sources/CSListMonitor.swift index 85c2e31..d639067 100644 --- a/Sources/CSListMonitor.swift +++ b/Sources/CSListMonitor.swift @@ -2,7 +2,7 @@ // CSListMonitor.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ import CoreData - SeeAlso: `ListMonitor` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public final class CSListMonitor: NSObject { @@ -545,7 +545,7 @@ public final class CSListMonitor: NSObject { // MARK: - ListMonitor -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ListMonitor where ListMonitor.ObjectType: NSManagedObject { // MARK: CoreStoreSwiftType diff --git a/Sources/CSListObserver.swift b/Sources/CSListObserver.swift index e9dfafd..e2b0f92 100644 --- a/Sources/CSListObserver.swift +++ b/Sources/CSListObserver.swift @@ -2,7 +2,7 @@ // CSListObserver.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -40,7 +40,7 @@ import CoreData - SeeAlso: `ListObserver` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public protocol CSListObserver: class { @@ -91,7 +91,7 @@ public protocol CSListObserver: class { - SeeAlso: `ListObjectObserver` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public protocol CSListObjectObserver: CSListObserver { @@ -152,7 +152,7 @@ public protocol CSListObjectObserver: CSListObserver { - SeeAlso: `ListSectionObserver` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public protocol CSListSectionObserver: CSListObjectObserver { diff --git a/Sources/CSMigrationResult.swift b/Sources/CSMigrationResult.swift index f6b3bea..54d29e6 100644 --- a/Sources/CSMigrationResult.swift +++ b/Sources/CSMigrationResult.swift @@ -2,7 +2,7 @@ // CSMigrationResult.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSMigrationType.swift b/Sources/CSMigrationType.swift index ee17b8f..61d5986 100644 --- a/Sources/CSMigrationType.swift +++ b/Sources/CSMigrationType.swift @@ -2,7 +2,7 @@ // CSMigrationType.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSObjectMonitor.swift b/Sources/CSObjectMonitor.swift index fc45bd7..71304b4 100644 --- a/Sources/CSObjectMonitor.swift +++ b/Sources/CSObjectMonitor.swift @@ -2,7 +2,7 @@ // CSObjectMonitor.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ import CoreData - SeeAlso: `ObjectMonitor` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public final class CSObjectMonitor: NSObject { @@ -137,7 +137,7 @@ public final class CSObjectMonitor: NSObject { // MARK: - ObjectMonitor -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ObjectMonitor where ObjectMonitor.ObjectType: NSManagedObject { // MARK: CoreStoreSwiftType diff --git a/Sources/CSObjectObserver.swift b/Sources/CSObjectObserver.swift index a5392eb..42cdf8d 100644 --- a/Sources/CSObjectObserver.swift +++ b/Sources/CSObjectObserver.swift @@ -2,7 +2,7 @@ // CSObjectObserver.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -38,7 +38,7 @@ import CoreData - SeeAlso: `ObjectObserver` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public protocol CSObjectObserver: class { diff --git a/Sources/CSOrderBy.swift b/Sources/CSOrderBy.swift index 403fbfc..2c97a89 100644 --- a/Sources/CSOrderBy.swift +++ b/Sources/CSOrderBy.swift @@ -2,7 +2,7 @@ // CSOrderBy.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSSQliteStore.swift b/Sources/CSSQliteStore.swift index fc5ff93..5e2f6d8 100644 --- a/Sources/CSSQliteStore.swift +++ b/Sources/CSSQliteStore.swift @@ -2,7 +2,7 @@ // CSSQLiteStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSSaveResult.swift b/Sources/CSSaveResult.swift index d1263bb..6b32b0a 100644 --- a/Sources/CSSaveResult.swift +++ b/Sources/CSSaveResult.swift @@ -2,7 +2,7 @@ // CSSaveResult.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSSectionBy.swift b/Sources/CSSectionBy.swift index f8c2fc7..a96a871 100644 --- a/Sources/CSSectionBy.swift +++ b/Sources/CSSectionBy.swift @@ -2,7 +2,7 @@ // CSSectionBy.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ import CoreData - SeeAlso: `SectionBy` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) @objc public final class CSSectionBy: NSObject { @@ -86,7 +86,7 @@ public final class CSSectionBy: NSObject { // MARK: - SectionBy -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension SectionBy { // MARK: CoreStoreSwiftType diff --git a/Sources/CSSelect.swift b/Sources/CSSelect.swift index 7312ff8..2a8c105 100644 --- a/Sources/CSSelect.swift +++ b/Sources/CSSelect.swift @@ -2,7 +2,7 @@ // CSSelect.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSSetupResult.swift b/Sources/CSSetupResult.swift index 2171945..9475ad9 100644 --- a/Sources/CSSetupResult.swift +++ b/Sources/CSSetupResult.swift @@ -2,7 +2,7 @@ // CSSetupResult.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSStorageInterface.swift b/Sources/CSStorageInterface.swift index 8ec6905..d8e0906 100644 --- a/Sources/CSStorageInterface.swift +++ b/Sources/CSStorageInterface.swift @@ -2,7 +2,7 @@ // CSStorageInterface.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSSynchronousDataTransaction.swift b/Sources/CSSynchronousDataTransaction.swift index dea87c2..3c49d8d 100644 --- a/Sources/CSSynchronousDataTransaction.swift +++ b/Sources/CSSynchronousDataTransaction.swift @@ -2,7 +2,7 @@ // CSSynchronousDataTransaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSTweak.swift b/Sources/CSTweak.swift index 6e2c09f..11cbf83 100644 --- a/Sources/CSTweak.swift +++ b/Sources/CSTweak.swift @@ -2,7 +2,7 @@ // CSTweak.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSUnsafeDataModelSchema.swift b/Sources/CSUnsafeDataModelSchema.swift index c907087..660782d 100644 --- a/Sources/CSUnsafeDataModelSchema.swift +++ b/Sources/CSUnsafeDataModelSchema.swift @@ -2,7 +2,7 @@ // CSUnsafeDataModelSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSUnsafeDataTransaction.swift b/Sources/CSUnsafeDataTransaction.swift index da8491c..b56ab1d 100644 --- a/Sources/CSUnsafeDataTransaction.swift +++ b/Sources/CSUnsafeDataTransaction.swift @@ -2,7 +2,7 @@ // CSUnsafeDataTransaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSWhere.swift b/Sources/CSWhere.swift index 0bd637b..e631c70 100644 --- a/Sources/CSWhere.swift +++ b/Sources/CSWhere.swift @@ -2,7 +2,7 @@ // CSWhere.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CSXcodeDataModelSchema.swift b/Sources/CSXcodeDataModelSchema.swift index cdc4685..ce8431c 100644 --- a/Sources/CSXcodeDataModelSchema.swift +++ b/Sources/CSXcodeDataModelSchema.swift @@ -2,7 +2,7 @@ // CSXcodeDataModelSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreDataNativeType.swift b/Sources/CoreDataNativeType.swift index a358fd5..dfa1717 100644 --- a/Sources/CoreDataNativeType.swift +++ b/Sources/CoreDataNativeType.swift @@ -2,7 +2,7 @@ // CoreDataNativeType.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift index 7ad5e97..cd0dbdc 100644 --- a/Sources/CoreStore+CustomDebugStringConvertible.swift +++ b/Sources/CoreStore+CustomDebugStringConvertible.swift @@ -2,7 +2,7 @@ // CoreStore+CustomDebugStringConvertible.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -292,7 +292,7 @@ extension GroupBy: CustomDebugStringConvertible, CoreStoreDebugStringConvertible } -#if os(iOS) || os(OSX) +#if os(iOS) || os(macOS) // MARK: - ICloudStore @@ -401,7 +401,7 @@ extension UnsafeDataModelSchema: CustomDebugStringConvertible, CoreStoreDebugStr // MARK: - ListMonitor -@available(OSX 10.12, *) +@available(macOS 10.12, *) private struct CoreStoreFetchedSectionInfoWrapper: CoreStoreDebugStringConvertible { let sectionInfo: NSFetchedResultsSectionInfo @@ -416,7 +416,7 @@ private struct CoreStoreFetchedSectionInfoWrapper: CoreStoreDebugStringConvertib } } -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ListMonitor: CustomDebugStringConvertible, CoreStoreDebugStringConvertible { // MARK: CustomDebugStringConvertible @@ -610,7 +610,7 @@ extension MigrationType: CustomDebugStringConvertible, CoreStoreDebugStringConve // MARK: - ObjectMonitor -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ObjectMonitor: CustomDebugStringConvertible, CoreStoreDebugStringConvertible { // MARK: CustomDebugStringConvertible @@ -695,7 +695,7 @@ extension SaveResult: CustomDebugStringConvertible, CoreStoreDebugStringConverti // MARK: - SectionBy -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension SectionBy: CustomDebugStringConvertible, CoreStoreDebugStringConvertible { // MARK: CustomDebugStringConvertible @@ -1249,7 +1249,7 @@ extension NSEntityDescription: CoreStoreDebugStringConvertible { ("versionHashModifier", self.versionHashModifier as Any), ("renamingIdentifier", self.renamingIdentifier as Any) ] - if #available(iOS 11.0, OSX 10.13, watchOS 4.0, tvOS 11.0, *) { + if #available(iOS 11.0, macOS 10.13, watchOS 4.0, tvOS 11.0, *) { info.append(("indexes", self.indexes)) } diff --git a/Sources/CoreStore+Logging.swift b/Sources/CoreStore+Logging.swift index f74b709..7f76255 100644 --- a/Sources/CoreStore+Logging.swift +++ b/Sources/CoreStore+Logging.swift @@ -2,7 +2,7 @@ // CoreStore+Logging.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore+Migration.swift b/Sources/CoreStore+Migration.swift index f93d6c9..1a618cb 100644 --- a/Sources/CoreStore+Migration.swift +++ b/Sources/CoreStore+Migration.swift @@ -2,7 +2,7 @@ // CoreStore+Migration.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift index 3a5da14..e594c26 100644 --- a/Sources/CoreStore+Observing.swift +++ b/Sources/CoreStore+Observing.swift @@ -2,7 +2,7 @@ // CoreStore+Observing.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - CoreStore -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension CoreStore { /** diff --git a/Sources/CoreStore+Querying.swift b/Sources/CoreStore+Querying.swift index 4c4cad7..a1be84f 100644 --- a/Sources/CoreStore+Querying.swift +++ b/Sources/CoreStore+Querying.swift @@ -2,7 +2,7 @@ // CoreStore+Querying.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore+Setup.swift b/Sources/CoreStore+Setup.swift index 2330c40..2b2b2d3 100644 --- a/Sources/CoreStore+Setup.swift +++ b/Sources/CoreStore+Setup.swift @@ -2,7 +2,7 @@ // CoreStore+Setup.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore+Transaction.swift b/Sources/CoreStore+Transaction.swift index 60e36e8..a037e04 100644 --- a/Sources/CoreStore+Transaction.swift +++ b/Sources/CoreStore+Transaction.swift @@ -2,7 +2,7 @@ // CoreStore+Transaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore.h b/Sources/CoreStore.h index 6e19c44..3715b92 100644 --- a/Sources/CoreStore.h +++ b/Sources/CoreStore.h @@ -2,7 +2,7 @@ // CoreStore.h // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStore.swift b/Sources/CoreStore.swift index 718231f..a365dd1 100644 --- a/Sources/CoreStore.swift +++ b/Sources/CoreStore.swift @@ -2,7 +2,7 @@ // CoreStore.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreBridge.h b/Sources/CoreStoreBridge.h index 5762ce2..06e8f3c 100644 --- a/Sources/CoreStoreBridge.h +++ b/Sources/CoreStoreBridge.h @@ -2,7 +2,7 @@ // CoreStoreBridge.h // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreBridge.m b/Sources/CoreStoreBridge.m index a5cb1c9..8f5db66 100644 --- a/Sources/CoreStoreBridge.m +++ b/Sources/CoreStoreBridge.m @@ -2,7 +2,7 @@ // CoreStoreBridge.m // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreBridge.swift b/Sources/CoreStoreBridge.swift index 33ee605..fc36eb7 100644 --- a/Sources/CoreStoreBridge.swift +++ b/Sources/CoreStoreBridge.swift @@ -2,7 +2,7 @@ // CoreStoreBridge.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreError.swift b/Sources/CoreStoreError.swift index 6138112..58c3078 100644 --- a/Sources/CoreStoreError.swift +++ b/Sources/CoreStoreError.swift @@ -2,7 +2,7 @@ // CoreStoreError.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreFetchRequest+CoreStore.swift b/Sources/CoreStoreFetchRequest+CoreStore.swift index 735b6c6..8a690cf 100644 --- a/Sources/CoreStoreFetchRequest+CoreStore.swift +++ b/Sources/CoreStoreFetchRequest+CoreStore.swift @@ -2,7 +2,7 @@ // CoreStoreFetchRequest+CoreStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreFetchedResultsController.swift b/Sources/CoreStoreFetchedResultsController.swift index 2230a22..f8e6280 100644 --- a/Sources/CoreStoreFetchedResultsController.swift +++ b/Sources/CoreStoreFetchedResultsController.swift @@ -2,7 +2,7 @@ // CoreStoreFetchedResultsController.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - CoreStoreFetchedResultsController -@available(OSX 10.12, *) +@available(macOS 10.12, *) internal final class CoreStoreFetchedResultsController: NSFetchedResultsController { // MARK: Internal diff --git a/Sources/CoreStoreLogger.swift b/Sources/CoreStoreLogger.swift index 57e1714..6bec546 100644 --- a/Sources/CoreStoreLogger.swift +++ b/Sources/CoreStoreLogger.swift @@ -2,7 +2,7 @@ // CoreStoreLogger.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreManagedObject.swift b/Sources/CoreStoreManagedObject.swift index 6654a75..37f1204 100644 --- a/Sources/CoreStoreManagedObject.swift +++ b/Sources/CoreStoreManagedObject.swift @@ -2,7 +2,7 @@ // CoreStoreManagedObject.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,6 +24,7 @@ // import CoreData +import Foundation // MARK: - CoreStoreManagedObject diff --git a/Sources/CoreStoreObject+Convenience.swift b/Sources/CoreStoreObject+Convenience.swift index 2457c89..cafe1f0 100644 --- a/Sources/CoreStoreObject+Convenience.swift +++ b/Sources/CoreStoreObject+Convenience.swift @@ -2,7 +2,7 @@ // CoreStoreObject+Convenience.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreObject+Querying.swift b/Sources/CoreStoreObject+Querying.swift index 3be80f5..137e871 100644 --- a/Sources/CoreStoreObject+Querying.swift +++ b/Sources/CoreStoreObject+Querying.swift @@ -2,7 +2,7 @@ // CoreStoreObject+Querying.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreObject.swift b/Sources/CoreStoreObject.swift index ec2aa7b..46622fc 100644 --- a/Sources/CoreStoreObject.swift +++ b/Sources/CoreStoreObject.swift @@ -2,7 +2,7 @@ // CoreStoreObject.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift index 22b5924..db9914b 100644 --- a/Sources/CoreStoreSchema.swift +++ b/Sources/CoreStoreSchema.swift @@ -2,7 +2,7 @@ // CoreStoreSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -461,7 +461,7 @@ public final class CoreStoreSchema: DynamicSchema { entityDescription.coreStoreEntity = entity // reserialize } let attributesByName = entityDescription.attributesByName - if #available(iOS 11.0, OSX 10.13, watchOS 4.0, tvOS 11.0, *) { + if #available(iOS 11.0, macOS 10.13, watchOS 4.0, tvOS 11.0, *) { entityDescription.indexes = entity.indexes.map { (compoundIndexes) in @@ -571,7 +571,7 @@ public final class CoreStoreSchema: DynamicSchema { } return [] } - let origSelector = #selector(NSManagedObject.keyPathsForValuesAffectingValue(forKey:)) + let origSelector = #selector(CoreStoreManagedObject.keyPathsForValuesAffectingValue(forKey:)) let metaClass: AnyClass = object_getClass(managedObjectClass)! let origMethod = class_getClassMethod(managedObjectClass, origSelector)! diff --git a/Sources/CoreStoreStrings.swift b/Sources/CoreStoreStrings.swift index e4a8464..b75726f 100644 --- a/Sources/CoreStoreStrings.swift +++ b/Sources/CoreStoreStrings.swift @@ -2,7 +2,7 @@ // CoreStoreStrings.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/CustomSchemaMappingProvider.swift b/Sources/CustomSchemaMappingProvider.swift index 7bc43a8..36497ad 100644 --- a/Sources/CustomSchemaMappingProvider.swift +++ b/Sources/CustomSchemaMappingProvider.swift @@ -2,7 +2,7 @@ // CustomSchemaMappingProvider.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DataStack+Migration.swift b/Sources/DataStack+Migration.swift index c6640dc..0c14b11 100644 --- a/Sources/DataStack+Migration.swift +++ b/Sources/DataStack+Migration.swift @@ -2,7 +2,7 @@ // DataStack+Migration.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift index 9946fdd..0e469ba 100644 --- a/Sources/DataStack+Observing.swift +++ b/Sources/DataStack+Observing.swift @@ -2,7 +2,7 @@ // DataStack+Observing.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - DataStack -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension DataStack { /** diff --git a/Sources/DataStack+Querying.swift b/Sources/DataStack+Querying.swift index 341d519..ba1374c 100644 --- a/Sources/DataStack+Querying.swift +++ b/Sources/DataStack+Querying.swift @@ -2,7 +2,7 @@ // DataStack+Querying.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DataStack+Transaction.swift b/Sources/DataStack+Transaction.swift index dc35caa..b77c790 100644 --- a/Sources/DataStack+Transaction.swift +++ b/Sources/DataStack+Transaction.swift @@ -2,7 +2,7 @@ // DataStack+Transaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DataStack.swift b/Sources/DataStack.swift index aa6263e..8c2b058 100644 --- a/Sources/DataStack.swift +++ b/Sources/DataStack.swift @@ -2,7 +2,7 @@ // DataStack.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DefaultLogger.swift b/Sources/DefaultLogger.swift index fcfc486..dc11730 100644 --- a/Sources/DefaultLogger.swift +++ b/Sources/DefaultLogger.swift @@ -2,7 +2,7 @@ // DefaultLogger.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DispatchQueue+CoreStore.swift b/Sources/DispatchQueue+CoreStore.swift index 0753e04..d52a968 100644 --- a/Sources/DispatchQueue+CoreStore.swift +++ b/Sources/DispatchQueue+CoreStore.swift @@ -2,7 +2,7 @@ // DispatchQueue+CoreStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DynamicKeyPath.swift b/Sources/DynamicKeyPath.swift index 24313e5..9edf2df 100644 --- a/Sources/DynamicKeyPath.swift +++ b/Sources/DynamicKeyPath.swift @@ -2,7 +2,7 @@ // DynamicKeyPath.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift index b6af806..cf95438 100644 --- a/Sources/DynamicObject.swift +++ b/Sources/DynamicObject.swift @@ -2,7 +2,7 @@ // DynamicObject.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DynamicSchema+Convenience.swift b/Sources/DynamicSchema+Convenience.swift index 12268f9..24f6f82 100644 --- a/Sources/DynamicSchema+Convenience.swift +++ b/Sources/DynamicSchema+Convenience.swift @@ -2,7 +2,7 @@ // DynamicSchema+Convenience.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/DynamicSchema.swift b/Sources/DynamicSchema.swift index bc33d8d..ab7cfb1 100644 --- a/Sources/DynamicSchema.swift +++ b/Sources/DynamicSchema.swift @@ -2,7 +2,7 @@ // DynamicSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Entity.swift b/Sources/Entity.swift index 73014c5..0c7c3be 100644 --- a/Sources/Entity.swift +++ b/Sources/Entity.swift @@ -2,7 +2,7 @@ // Entity.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/EntityIdentifier.swift b/Sources/EntityIdentifier.swift index b547584..3f0c29b 100644 --- a/Sources/EntityIdentifier.swift +++ b/Sources/EntityIdentifier.swift @@ -2,7 +2,7 @@ // EntityIdentifier.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/FetchChainBuilder.swift b/Sources/FetchChainBuilder.swift index 9ce7063..9c30ae2 100644 --- a/Sources/FetchChainBuilder.swift +++ b/Sources/FetchChainBuilder.swift @@ -2,7 +2,7 @@ // FetchChainBuilder.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/FetchableSource.swift b/Sources/FetchableSource.swift index ce4a425..31f1d50 100644 --- a/Sources/FetchableSource.swift +++ b/Sources/FetchableSource.swift @@ -2,7 +2,7 @@ // FetchableSource.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/FetchedResultsControllerDelegate.swift b/Sources/FetchedResultsControllerDelegate.swift index 613b418..68dee42 100644 --- a/Sources/FetchedResultsControllerDelegate.swift +++ b/Sources/FetchedResultsControllerDelegate.swift @@ -2,7 +2,7 @@ // FetchedResultsControllerDelegate.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - FetchedResultsControllerHandler -@available(OSX 10.12, *) +@available(macOS 10.12, *) internal protocol FetchedResultsControllerHandler: class { func controller(_ controller: NSFetchedResultsController, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) @@ -46,7 +46,7 @@ internal protocol FetchedResultsControllerHandler: class { // MARK: - FetchedResultsControllerDelegate -@available(OSX 10.12, *) +@available(macOS 10.12, *) internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate { // MARK: Internal diff --git a/Sources/From+Querying.swift b/Sources/From+Querying.swift index 91648bb..11b5e64 100644 --- a/Sources/From+Querying.swift +++ b/Sources/From+Querying.swift @@ -2,7 +2,7 @@ // From+Querying.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -161,7 +161,7 @@ public extension From { - parameter clause: the `SectionBy` to be used by the `ListMonitor` - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ clause: SectionBy) -> SectionMonitorChainBuilder { return .init( @@ -177,7 +177,7 @@ public extension From { - parameter sectionKeyPath: the key path to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPathString) -> SectionMonitorChainBuilder { return self.sectionBy(sectionKeyPath, { $0 }) @@ -191,7 +191,7 @@ public extension From { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPathString, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return .init( @@ -234,7 +234,7 @@ public extension From where D: NSManagedObject { - parameter sectionKeyPath: the `KeyPath` to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath) -> SectionMonitorChainBuilder { return self.sectionBy(sectionKeyPath._kvcKeyPathString!, { $0 }) @@ -248,7 +248,7 @@ public extension From where D: NSManagedObject { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return self.sectionBy(sectionKeyPath._kvcKeyPathString!, sectionIndexTransformer) @@ -318,7 +318,7 @@ public extension From where D: CoreStoreObject { - parameter sectionKeyPath: the `KeyPath` to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Required>) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 }) @@ -330,7 +330,7 @@ public extension From where D: CoreStoreObject { - parameter sectionKeyPath: the `KeyPath` to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Optional>) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 }) @@ -342,7 +342,7 @@ public extension From where D: CoreStoreObject { - parameter sectionKeyPath: the `KeyPath` to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Required>) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 }) @@ -354,7 +354,7 @@ public extension From where D: CoreStoreObject { - parameter sectionKeyPath: the `KeyPath` to use to group the objects into sections - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Optional>) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 }) @@ -368,7 +368,7 @@ public extension From where D: CoreStoreObject { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Required>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer) @@ -382,7 +382,7 @@ public extension From where D: CoreStoreObject { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Optional>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer) @@ -396,7 +396,7 @@ public extension From where D: CoreStoreObject { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Required>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer) @@ -410,7 +410,7 @@ public extension From where D: CoreStoreObject { - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path */ - @available(OSX 10.12, *) + @available(macOS 10.12, *) public func sectionBy(_ sectionKeyPath: KeyPath.Optional>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder { return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer) @@ -737,7 +737,7 @@ public extension QueryChainBuilder where D: CoreStoreObject { } } -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension SectionMonitorChainBuilder { /** @@ -842,7 +842,7 @@ public extension SectionMonitorChainBuilder { } } -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension SectionMonitorChainBuilder where D: CoreStoreObject { /** diff --git a/Sources/From.swift b/Sources/From.swift index 67ec6fe..65de91d 100644 --- a/Sources/From.swift +++ b/Sources/From.swift @@ -2,7 +2,7 @@ // From.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Functions.swift b/Sources/Functions.swift index 2500fa0..7cc83dc 100644 --- a/Sources/Functions.swift +++ b/Sources/Functions.swift @@ -2,7 +2,7 @@ // Functions.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,6 +27,15 @@ import Foundation // MARK: Associated Objects +@inline(__always) +/// type(of:) doesn't return the dynamic type anymore, use this to guarantee correct dispatch of class methods +internal func cs_dynamicType(of instance: T) -> T.Type { + + return object_getClass(instance) as! T.Type +} + +// MARK: Associated Objects + @inline(__always) internal func cs_getAssociatedObjectForKey(_ key: UnsafeRawPointer, inObject object: Any) -> T? { diff --git a/Sources/GroupBy.swift b/Sources/GroupBy.swift index 8c9c929..e65e3a9 100644 --- a/Sources/GroupBy.swift +++ b/Sources/GroupBy.swift @@ -2,7 +2,7 @@ // GroupBy.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/ICloudStore.swift b/Sources/ICloudStore.swift index edf42f5..b311db8 100644 --- a/Sources/ICloudStore.swift +++ b/Sources/ICloudStore.swift @@ -2,7 +2,7 @@ // ICloudStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,7 +27,7 @@ import Foundation import CoreData -#if os(iOS) || os(OSX) +#if os(iOS) || os(macOS) // MARK: - ICloudStore diff --git a/Sources/ICloudStoreObserver.swift b/Sources/ICloudStoreObserver.swift index c76cf54..ced2721 100644 --- a/Sources/ICloudStoreObserver.swift +++ b/Sources/ICloudStoreObserver.swift @@ -2,7 +2,7 @@ // ICloudStoreObserver.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -26,7 +26,7 @@ import Foundation -#if os(iOS) || os(OSX) +#if os(iOS) || os(macOS) // MARK: - ICloudStoreObserver diff --git a/Sources/ImportableAttributeType.swift b/Sources/ImportableAttributeType.swift index 6c78e15..87805bd 100644 --- a/Sources/ImportableAttributeType.swift +++ b/Sources/ImportableAttributeType.swift @@ -2,7 +2,7 @@ // ImportableAttributeType.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/ImportableObject.swift b/Sources/ImportableObject.swift index 2f7dd23..34ccbd3 100644 --- a/Sources/ImportableObject.swift +++ b/Sources/ImportableObject.swift @@ -2,7 +2,7 @@ // ImportableObject.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/ImportableUniqueObject.swift b/Sources/ImportableUniqueObject.swift index 7836b1f..0951d95 100644 --- a/Sources/ImportableUniqueObject.swift +++ b/Sources/ImportableUniqueObject.swift @@ -2,7 +2,7 @@ // ImportableUniqueObject.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -125,7 +125,7 @@ public extension ImportableUniqueObject where UniqueIDType.QueryableNativeType: get { return self.cs_toRaw().getValue( - forKvcKey: type(of: self).uniqueIDKeyPath, + forKvcKey: cs_dynamicType(of: self).uniqueIDKeyPath, didGetValue: { UniqueIDType.cs_fromQueryableNativeType($0 as! UniqueIDType.QueryableNativeType)! } ) } @@ -134,7 +134,7 @@ public extension ImportableUniqueObject where UniqueIDType.QueryableNativeType: self.cs_toRaw() .setValue( newValue, - forKvcKey: type(of: self).uniqueIDKeyPath, + forKvcKey: cs_dynamicType(of: self).uniqueIDKeyPath, willSetValue: { ($0.cs_toQueryableNativeType() as CoreDataNativeType) } ) } diff --git a/Sources/InMemoryStore.swift b/Sources/InMemoryStore.swift index fcb3b77..3b3a5f2 100644 --- a/Sources/InMemoryStore.swift +++ b/Sources/InMemoryStore.swift @@ -2,7 +2,7 @@ // InMemoryStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/InferredSchemaMappingProvider.swift b/Sources/InferredSchemaMappingProvider.swift index 588900a..ba3416b 100644 --- a/Sources/InferredSchemaMappingProvider.swift +++ b/Sources/InferredSchemaMappingProvider.swift @@ -2,7 +2,7 @@ // InferredSchemaMappingProvider.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Info.plist b/Sources/Info.plist index 8d3c0ff..bc8da3a 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.2.0 + 5.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/Into.swift b/Sources/Into.swift index f3c0d0a..0da98bc 100644 --- a/Sources/Into.swift +++ b/Sources/Into.swift @@ -2,7 +2,7 @@ // Into.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/KeyPath+Querying.swift b/Sources/KeyPath+Querying.swift index 6a38c4e..da83f42 100644 --- a/Sources/KeyPath+Querying.swift +++ b/Sources/KeyPath+Querying.swift @@ -2,7 +2,7 @@ // KeyPath+Querying.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/LegacySQLiteStore.swift b/Sources/LegacySQLiteStore.swift index 23daff9..ab7d800 100644 --- a/Sources/LegacySQLiteStore.swift +++ b/Sources/LegacySQLiteStore.swift @@ -2,7 +2,7 @@ // LegacySQLiteStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift index c7a4112..1c59125 100644 --- a/Sources/ListMonitor.swift +++ b/Sources/ListMonitor.swift @@ -2,7 +2,7 @@ // ListMonitor.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -66,7 +66,7 @@ import CoreData ``` In the example above, both `person1` and `person2` will contain the object at section=2, index=3. */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public final class ListMonitor: Hashable { // MARK: Public (Accessors) @@ -1169,7 +1169,7 @@ public final class ListMonitor: Hashable { // MARK: - ListMonitor where ListMonitor.ObjectType: NSManagedObject -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ListMonitor where ListMonitor.ObjectType: NSManagedObject { /** @@ -1212,7 +1212,7 @@ extension ListMonitor where ListMonitor.ObjectType: NSManagedObject { // MARK: - ListMonitor where ListMonitor.ObjectType: CoreStoreObject -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ListMonitor where ListMonitor.ObjectType: CoreStoreObject { /** @@ -1258,7 +1258,7 @@ extension ListMonitor where ListMonitor.ObjectType: CoreStoreObject { // MARK: - ListMonitor: FetchedResultsControllerHandler -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ListMonitor: FetchedResultsControllerHandler { // MARK: FetchedResultsControllerHandler @@ -1369,7 +1369,7 @@ extension ListMonitor: FetchedResultsControllerHandler { // MARK: - Notification Keys -@available(OSX 10.12, *) +@available(macOS 10.12, *) fileprivate extension Notification.Name { fileprivate static let listMonitorWillChangeList = Notification.Name(rawValue: "listMonitorWillChangeList") diff --git a/Sources/ListObserver.swift b/Sources/ListObserver.swift index dc445ce..1adf523 100644 --- a/Sources/ListObserver.swift +++ b/Sources/ListObserver.swift @@ -2,7 +2,7 @@ // ListObserver.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,7 +39,7 @@ import CoreData monitor.addObserver(self) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public protocol ListObserver: class { /** @@ -82,7 +82,7 @@ public protocol ListObserver: class { // MARK: - ListObserver (Default Implementations) -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension ListObserver { public func listMonitorWillChange(_ monitor: ListMonitor) { } @@ -103,7 +103,7 @@ public extension ListObserver { monitor.addObserver(self) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public protocol ListObjectObserver: ListObserver { /** @@ -151,7 +151,7 @@ public protocol ListObjectObserver: ListObserver { // MARK: - ListObjectObserver (Default Implementations) -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension ListObjectObserver { public func listMonitor(_ monitor: ListMonitor, didInsertObject object: ListEntityType, toIndexPath indexPath: IndexPath) { } @@ -177,7 +177,7 @@ public extension ListObjectObserver { monitor.addObserver(self) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public protocol ListSectionObserver: ListObjectObserver { /** @@ -204,7 +204,7 @@ public protocol ListSectionObserver: ListObjectObserver { // MARK: - ListSectionObserver (Default Implementations) -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension ListSectionObserver { public func listMonitor(_ monitor: ListMonitor, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) { } diff --git a/Sources/MigrationChain.swift b/Sources/MigrationChain.swift index c16e35b..0f0acc9 100644 --- a/Sources/MigrationChain.swift +++ b/Sources/MigrationChain.swift @@ -2,7 +2,7 @@ // MigrationChain.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/MigrationManager.swift b/Sources/MigrationManager.swift index 042f66b..e86b758 100644 --- a/Sources/MigrationManager.swift +++ b/Sources/MigrationManager.swift @@ -2,7 +2,7 @@ // MigrationManager.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/MigrationResult.swift b/Sources/MigrationResult.swift index bcaaca7..21cd58c 100644 --- a/Sources/MigrationResult.swift +++ b/Sources/MigrationResult.swift @@ -2,7 +2,7 @@ // MigrationResult.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/MigrationType.swift b/Sources/MigrationType.swift index 6b4d857..c8f474c 100644 --- a/Sources/MigrationType.swift +++ b/Sources/MigrationType.swift @@ -2,7 +2,7 @@ // MigrationType.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSEntityDescription+DynamicModel.swift b/Sources/NSEntityDescription+DynamicModel.swift index a2cbad6..1f3c518 100644 --- a/Sources/NSEntityDescription+DynamicModel.swift +++ b/Sources/NSEntityDescription+DynamicModel.swift @@ -2,7 +2,7 @@ // NSEntityDescription+DynamicModel.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSEntityDescription+Migration.swift b/Sources/NSEntityDescription+Migration.swift index 8918530..6d9705d 100644 --- a/Sources/NSEntityDescription+Migration.swift +++ b/Sources/NSEntityDescription+Migration.swift @@ -2,7 +2,7 @@ // NSEntityDescription+Migration.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSFetchedResultsController+Convenience.swift b/Sources/NSFetchedResultsController+Convenience.swift index 1bcb1fa..121e001 100644 --- a/Sources/NSFetchedResultsController+Convenience.swift +++ b/Sources/NSFetchedResultsController+Convenience.swift @@ -2,7 +2,7 @@ // NSManagedObject+Convenience.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - DataStack -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension DataStack { /** @@ -114,7 +114,7 @@ public extension DataStack { // MARK: - UnsafeDataTransaction -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension UnsafeDataTransaction { /** @@ -200,7 +200,7 @@ public extension UnsafeDataTransaction { // MARK: - Private -@available(OSX 10.12, *) +@available(macOS 10.12, *) fileprivate func createFRC(fromContext context: NSManagedObjectContext, from: From, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController { let controller = CoreStoreFetchedResultsController( diff --git a/Sources/NSFetchedResultsController+ObjectiveC.swift b/Sources/NSFetchedResultsController+ObjectiveC.swift index 5c8f6f8..4bf2ab1 100644 --- a/Sources/NSFetchedResultsController+ObjectiveC.swift +++ b/Sources/NSFetchedResultsController+ObjectiveC.swift @@ -2,7 +2,7 @@ // NSFetchedResultsController+ObjectiveC.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - CSDataStack -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension CSDataStack { @available(*, deprecated, message: "CoreStore will obsolete NSFetchedResultsController support in the future in favor of CSListMonitor") @@ -48,7 +48,7 @@ public extension CSDataStack { // MARK: - CSUnsafeDataTransaction -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension CSUnsafeDataTransaction { @available(*, deprecated, message: "CoreStore will obsolete NSFetchedResultsController support in the future in favor of CSListMonitor") @@ -67,7 +67,7 @@ public extension CSUnsafeDataTransaction { // MARK: - Private -@available(OSX 10.12, *) +@available(macOS 10.12, *) fileprivate func createFRC(fromContext context: NSManagedObjectContext, from: CSFrom, sectionBy: CSSectionBy?, fetchClauses: [CSFetchClause]) -> NSFetchedResultsController { let controller = CoreStoreFetchedResultsController( diff --git a/Sources/NSManagedObject+Convenience.swift b/Sources/NSManagedObject+Convenience.swift index 021bb82..5d8a66b 100644 --- a/Sources/NSManagedObject+Convenience.swift +++ b/Sources/NSManagedObject+Convenience.swift @@ -2,7 +2,7 @@ // NSManagedObject+Convenience.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObject+DynamicModel.swift b/Sources/NSManagedObject+DynamicModel.swift index c385b50..b2814bb 100644 --- a/Sources/NSManagedObject+DynamicModel.swift +++ b/Sources/NSManagedObject+DynamicModel.swift @@ -2,7 +2,7 @@ // NSManagedObject+DynamicModel.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObject+Logging.swift b/Sources/NSManagedObject+Logging.swift index 47847dd..b076b0c 100644 --- a/Sources/NSManagedObject+Logging.swift +++ b/Sources/NSManagedObject+Logging.swift @@ -2,7 +2,7 @@ // NSManagedObject+Logging.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObject+ObjectiveC.swift b/Sources/NSManagedObject+ObjectiveC.swift index 66301cd..f30eb3d 100644 --- a/Sources/NSManagedObject+ObjectiveC.swift +++ b/Sources/NSManagedObject+ObjectiveC.swift @@ -2,7 +2,7 @@ // NSManagedObject+ObjectiveC.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObject+Transaction.swift b/Sources/NSManagedObject+Transaction.swift index efd255c..6d67809 100644 --- a/Sources/NSManagedObject+Transaction.swift +++ b/Sources/NSManagedObject+Transaction.swift @@ -2,7 +2,7 @@ // NSManagedObject+Transaction.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift index 680bd3c..5ba5d44 100644 --- a/Sources/NSManagedObjectContext+CoreStore.swift +++ b/Sources/NSManagedObjectContext+CoreStore.swift @@ -2,7 +2,7 @@ // NSManagedObjectContext+CoreStore.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObjectContext+ObjectiveC.swift b/Sources/NSManagedObjectContext+ObjectiveC.swift index deef584..4b1b259 100644 --- a/Sources/NSManagedObjectContext+ObjectiveC.swift +++ b/Sources/NSManagedObjectContext+ObjectiveC.swift @@ -2,7 +2,7 @@ // NSManagedObjectContext+ObjectiveC.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSManagedObjectContext+Querying.swift b/Sources/NSManagedObjectContext+Querying.swift index ca2eb6c..6625833 100644 --- a/Sources/NSManagedObjectContext+Querying.swift +++ b/Sources/NSManagedObjectContext+Querying.swift @@ -2,7 +2,7 @@ // NSManagedObjectContext+Querying.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -62,7 +62,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource { return object } - return type(of: object).cs_fromRaw(object: existingRawObject) + return cs_dynamicType(of: object).cs_fromRaw(object: existingRawObject) } catch { diff --git a/Sources/NSManagedObjectContext+Setup.swift b/Sources/NSManagedObjectContext+Setup.swift index e02c421..751ddb3 100644 --- a/Sources/NSManagedObjectContext+Setup.swift +++ b/Sources/NSManagedObjectContext+Setup.swift @@ -2,7 +2,7 @@ // NSManagedObjectContext+Setup.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -69,7 +69,7 @@ internal extension NSManagedObjectContext { context.undoManager = nil context.setupForCoreStoreWithContextName("com.corestore.rootcontext") - #if os(iOS) || os(OSX) + #if os(iOS) || os(macOS) context.observerForDidImportUbiquitousContentChangesNotification = NotificationObserver( notificationName: NSNotification.Name.NSPersistentStoreDidImportUbiquitousContentChanges, diff --git a/Sources/NSManagedObjectContext+Transaction.swift b/Sources/NSManagedObjectContext+Transaction.swift index 7c76968..b3cb3bb 100644 --- a/Sources/NSManagedObjectContext+Transaction.swift +++ b/Sources/NSManagedObjectContext+Transaction.swift @@ -2,7 +2,7 @@ // NSManagedObjectContext+Transaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -230,7 +230,7 @@ internal extension NSManagedObjectContext { @nonobjc internal func refreshAndMergeAllObjects() { - if #available(iOS 8.3, OSX 10.11, *) { + if #available(iOS 8.3, macOS 10.11, *) { self.refreshAllObjects() } diff --git a/Sources/NSManagedObjectModel+Migration.swift b/Sources/NSManagedObjectModel+Migration.swift index f58914b..438ab2f 100644 --- a/Sources/NSManagedObjectModel+Migration.swift +++ b/Sources/NSManagedObjectModel+Migration.swift @@ -2,7 +2,7 @@ // NSManagedObjectModel+Migration.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSPersistentStore+Setup.swift b/Sources/NSPersistentStore+Setup.swift index 085455b..1ca94a2 100644 --- a/Sources/NSPersistentStore+Setup.swift +++ b/Sources/NSPersistentStore+Setup.swift @@ -2,7 +2,7 @@ // NSPersistentStore+Setup.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NSPersistentStoreCoordinator+Setup.swift b/Sources/NSPersistentStoreCoordinator+Setup.swift index 13aa538..c26e4c4 100644 --- a/Sources/NSPersistentStoreCoordinator+Setup.swift +++ b/Sources/NSPersistentStoreCoordinator+Setup.swift @@ -2,7 +2,7 @@ // NSPersistentStoreCoordinator+Setup.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia. All rights reserved. +// Copyright © 2018 John Rommel Estropia. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/NotificationObserver.swift b/Sources/NotificationObserver.swift index 38f362e..b341704 100644 --- a/Sources/NotificationObserver.swift +++ b/Sources/NotificationObserver.swift @@ -2,7 +2,7 @@ // NotificationObserver.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift index 79102c7..dd244d9 100644 --- a/Sources/ObjectMonitor.swift +++ b/Sources/ObjectMonitor.swift @@ -2,7 +2,7 @@ // ObjectMonitor.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,7 +39,7 @@ import CoreData Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles. */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public final class ObjectMonitor: Equatable { /** @@ -334,7 +334,7 @@ public final class ObjectMonitor: Equatable { // MARK: - ObjectMonitor: FetchedResultsControllerHandler -@available(OSX 10.12, *) +@available(macOS 10.12, *) extension ObjectMonitor: FetchedResultsControllerHandler { // MARK: FetchedResultsControllerHandler @@ -384,7 +384,7 @@ extension ObjectMonitor: FetchedResultsControllerHandler { // MARK: - Notification.Name -@available(OSX 10.12, *) +@available(macOS 10.12, *) fileprivate extension Notification.Name { fileprivate static let objectMonitorWillChangeObject = Notification.Name(rawValue: "objectMonitorWillChangeObject") diff --git a/Sources/ObjectObserver.swift b/Sources/ObjectObserver.swift index 5ace163..f3804df 100644 --- a/Sources/ObjectObserver.swift +++ b/Sources/ObjectObserver.swift @@ -2,7 +2,7 @@ // ObjectObserver.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -36,7 +36,7 @@ import CoreData monitor.addObserver(self) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public protocol ObjectObserver: class { /** @@ -76,7 +76,7 @@ public protocol ObjectObserver: class { // MARK: - ObjectObserver (Default Implementations) -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension ObjectObserver { public func objectMonitor(_ monitor: ObjectMonitor, willUpdateObject object: ObjectEntityType) { } diff --git a/Sources/OrderBy.swift b/Sources/OrderBy.swift index b34b8d4..2f95665 100644 --- a/Sources/OrderBy.swift +++ b/Sources/OrderBy.swift @@ -2,7 +2,7 @@ // OrderBy.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/PartialObject.swift b/Sources/PartialObject.swift index eaabcca..9d42664 100644 --- a/Sources/PartialObject.swift +++ b/Sources/PartialObject.swift @@ -2,7 +2,7 @@ // PartialObject.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Progress+Convenience.swift b/Sources/Progress+Convenience.swift index bf65903..8cb475f 100644 --- a/Sources/Progress+Convenience.swift +++ b/Sources/Progress+Convenience.swift @@ -2,7 +2,7 @@ // Progress+Convenience.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Progress+ObjectiveC.swift b/Sources/Progress+ObjectiveC.swift index 5b1fdfb..1156f1e 100644 --- a/Sources/Progress+ObjectiveC.swift +++ b/Sources/Progress+ObjectiveC.swift @@ -2,7 +2,7 @@ // Progress+ObjectiveC.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/QueryChainBuilder.swift b/Sources/QueryChainBuilder.swift index 00522c4..7c183bd 100644 --- a/Sources/QueryChainBuilder.swift +++ b/Sources/QueryChainBuilder.swift @@ -2,7 +2,7 @@ // QueryChainBuilder.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/QueryableAttributeType.swift b/Sources/QueryableAttributeType.swift index df427af..2c147df 100644 --- a/Sources/QueryableAttributeType.swift +++ b/Sources/QueryableAttributeType.swift @@ -2,7 +2,7 @@ // QueryableAttributeType.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -100,7 +100,7 @@ extension Bool: QueryableAttributeType { case let decimal as NSDecimalNumber: // iOS: NSDecimalNumber(string: "0.5").boolValue // true - // OSX: NSDecimalNumber(string: "0.5").boolValue // false + // macOS: NSDecimalNumber(string: "0.5").boolValue // false return decimal != NSDecimalNumber.zero default: diff --git a/Sources/QueryableSource.swift b/Sources/QueryableSource.swift index 292a530..6dc4650 100644 --- a/Sources/QueryableSource.swift +++ b/Sources/QueryableSource.swift @@ -2,7 +2,7 @@ // QueryableSource.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift index e066fd4..2fcc84c 100644 --- a/Sources/Relationship.swift +++ b/Sources/Relationship.swift @@ -2,7 +2,7 @@ // Relationship.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/RelationshipProtocol.swift b/Sources/RelationshipProtocol.swift index 7253728..41ba813 100644 --- a/Sources/RelationshipProtocol.swift +++ b/Sources/RelationshipProtocol.swift @@ -2,7 +2,7 @@ // RelationshipProtocol.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SQLiteStore.swift b/Sources/SQLiteStore.swift index e99c1ac..eabd563 100644 --- a/Sources/SQLiteStore.swift +++ b/Sources/SQLiteStore.swift @@ -2,7 +2,7 @@ // SQLiteStore.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -153,7 +153,7 @@ public final class SQLiteStore: LocalStorage { public let storeOptions: [AnyHashable: Any]? = autoreleasepool { var storeOptions: [AnyHashable: Any] = [NSSQLitePragmasOption: ["journal_mode": "WAL"]] - if #available(iOS 11.0, OSX 10.13, tvOSApplicationExtension 11.0, watchOSApplicationExtension 4.0, *) { + if #available(iOS 11.0, macOS 10.13, tvOSApplicationExtension 11.0, watchOSApplicationExtension 4.0, *) { storeOptions[NSBinaryStoreInsecureDecodingCompatibilityOption] = true } diff --git a/Sources/SaveResult.swift b/Sources/SaveResult.swift index 1702a01..4390e5c 100644 --- a/Sources/SaveResult.swift +++ b/Sources/SaveResult.swift @@ -2,7 +2,7 @@ // SaveResult.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SchemaHistory.swift b/Sources/SchemaHistory.swift index 5fda560..4773477 100644 --- a/Sources/SchemaHistory.swift +++ b/Sources/SchemaHistory.swift @@ -2,7 +2,7 @@ // SchemaHistory.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SchemaMappingProvider.swift b/Sources/SchemaMappingProvider.swift index 7af146f..37dbba4 100644 --- a/Sources/SchemaMappingProvider.swift +++ b/Sources/SchemaMappingProvider.swift @@ -2,7 +2,7 @@ // SchemaMappingProvider.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SectionBy.swift b/Sources/SectionBy.swift index 629fd2f..02700c8 100644 --- a/Sources/SectionBy.swift +++ b/Sources/SectionBy.swift @@ -2,7 +2,7 @@ // SectionBy.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -39,7 +39,7 @@ import CoreData ) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public struct SectionBy { /** @@ -72,7 +72,7 @@ public struct SectionBy { internal let sectionIndexTransformer: (_ sectionName: String?) -> String? } -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension SectionBy where D: NSManagedObject { /** @@ -98,7 +98,7 @@ public extension SectionBy where D: NSManagedObject { } } -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension SectionBy where D: CoreStoreObject { /** diff --git a/Sources/SectionMonitorBuilder.swift b/Sources/SectionMonitorBuilder.swift index 9530512..273e345 100644 --- a/Sources/SectionMonitorBuilder.swift +++ b/Sources/SectionMonitorBuilder.swift @@ -2,7 +2,7 @@ // SectionMonitorBuilder.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -40,7 +40,7 @@ import CoreData ) ``` */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public struct SectionMonitorChainBuilder: SectionMonitorBuilderType { // MARK: SectionMonitorBuilderType @@ -56,7 +56,7 @@ public struct SectionMonitorChainBuilder: SectionMonitorBuilde /** Utility protocol for `SectionMonitorChainBuilder`. Used in methods that support chained fetch builders. */ -@available(OSX 10.12, *) +@available(macOS 10.12, *) public protocol SectionMonitorBuilderType { /** diff --git a/Sources/Select.swift b/Sources/Select.swift index 98a9786..8a82621 100644 --- a/Sources/Select.swift +++ b/Sources/Select.swift @@ -2,7 +2,7 @@ // Select.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SetupResult.swift b/Sources/SetupResult.swift index 26be478..fb37aaa 100644 --- a/Sources/SetupResult.swift +++ b/Sources/SetupResult.swift @@ -2,7 +2,7 @@ // SetupResult.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/StorageInterface.swift b/Sources/StorageInterface.swift index 3ddaa0a..1ba80f1 100644 --- a/Sources/StorageInterface.swift +++ b/Sources/StorageInterface.swift @@ -2,7 +2,7 @@ // StorageInterface.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift index eed0e6b..4847838 100644 --- a/Sources/SynchronousDataTransaction.swift +++ b/Sources/SynchronousDataTransaction.swift @@ -2,7 +2,7 @@ // SynchronousDataTransaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Transformable.swift b/Sources/Transformable.swift index 0660d59..09607f6 100644 --- a/Sources/Transformable.swift +++ b/Sources/Transformable.swift @@ -2,7 +2,7 @@ // Transformable.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Tweak.swift b/Sources/Tweak.swift index 17e3b0a..1a63bd1 100644 --- a/Sources/Tweak.swift +++ b/Sources/Tweak.swift @@ -2,7 +2,7 @@ // Tweak.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/TypeErasedClauses.swift b/Sources/TypeErasedClauses.swift index 30154f8..07216e5 100644 --- a/Sources/TypeErasedClauses.swift +++ b/Sources/TypeErasedClauses.swift @@ -2,7 +2,7 @@ // TypeErasedClauses.swift // CoreStore // -// Copyright © 2014 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/UnsafeDataModelSchema.swift b/Sources/UnsafeDataModelSchema.swift index 6230495..f84ebb6 100644 --- a/Sources/UnsafeDataModelSchema.swift +++ b/Sources/UnsafeDataModelSchema.swift @@ -2,7 +2,7 @@ // UnsafeDataModelSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift index f8a2449..7287ed6 100644 --- a/Sources/UnsafeDataTransaction+Observing.swift +++ b/Sources/UnsafeDataTransaction+Observing.swift @@ -2,7 +2,7 @@ // UnsafeDataTransaction+Observing.swift // CoreStore // -// Copyright © 2016 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ import CoreData // MARK: - UnsafeDataTransaction -@available(OSX 10.12, *) +@available(macOS 10.12, *) public extension UnsafeDataTransaction { /** diff --git a/Sources/UnsafeDataTransaction.swift b/Sources/UnsafeDataTransaction.swift index 3d6c0ef..5228492 100644 --- a/Sources/UnsafeDataTransaction.swift +++ b/Sources/UnsafeDataTransaction.swift @@ -2,7 +2,7 @@ // UnsafeDataTransaction.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/UserInfo.swift b/Sources/UserInfo.swift index 389c7cf..b449771 100644 --- a/Sources/UserInfo.swift +++ b/Sources/UserInfo.swift @@ -2,7 +2,7 @@ // UserInfo.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Value.swift b/Sources/Value.swift index 63b06f6..c704f8c 100644 --- a/Sources/Value.swift +++ b/Sources/Value.swift @@ -2,7 +2,7 @@ // Value.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/VersionLock.swift b/Sources/VersionLock.swift index 4316004..7f7940f 100644 --- a/Sources/VersionLock.swift +++ b/Sources/VersionLock.swift @@ -2,7 +2,7 @@ // VersionLock.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/WeakObject.swift b/Sources/WeakObject.swift index 98233e6..e24609a 100644 --- a/Sources/WeakObject.swift +++ b/Sources/WeakObject.swift @@ -2,7 +2,7 @@ // WeakObject.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/Where.swift b/Sources/Where.swift index 3f53808..b345a92 100644 --- a/Sources/Where.swift +++ b/Sources/Where.swift @@ -2,7 +2,7 @@ // Where.swift // CoreStore // -// Copyright © 2015 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/WhereClauseType.swift b/Sources/WhereClauseType.swift index 0df78c7..8f08721 100644 --- a/Sources/WhereClauseType.swift +++ b/Sources/WhereClauseType.swift @@ -2,7 +2,7 @@ // WhereClauseType.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/XcodeDataModelSchema.swift b/Sources/XcodeDataModelSchema.swift index e4db7ff..2bcd90b 100644 --- a/Sources/XcodeDataModelSchema.swift +++ b/Sources/XcodeDataModelSchema.swift @@ -2,7 +2,7 @@ // XcodeDataModelSchema.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Sources/XcodeSchemaMappingProvider.swift b/Sources/XcodeSchemaMappingProvider.swift index 9b97988..512394c 100644 --- a/Sources/XcodeSchemaMappingProvider.swift +++ b/Sources/XcodeSchemaMappingProvider.swift @@ -2,7 +2,7 @@ // XcodeSchemaMappingProvider.swift // CoreStore // -// Copyright © 2017 John Rommel Estropia +// Copyright © 2018 John Rommel Estropia // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal