diff --git a/CoreStore.sketch b/CoreStore.sketch index d82850b..ece9425 100644 Binary files a/CoreStore.sketch and b/CoreStore.sketch differ diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 64d9aa9..33a860f 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -1778,7 +1778,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "John Rommel Estropia"; TargetAttributes = { 2F03A52F19C5C6DA005002A5 = { @@ -1815,6 +1815,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -2676,6 +2677,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2731,7 +2733,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 10.0; VERSIONING_SYSTEM = "apple-generic"; @@ -2745,6 +2747,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2793,7 +2796,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 10.0; VALIDATE_PRODUCT = YES; diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme index 636aef6..5ec36d7 100644 --- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme +++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { return true } diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift index 875be32..239649a 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/FetchingResultsViewController.swift @@ -30,7 +30,7 @@ class FetchingResultsViewController: UITableViewController { super.viewDidLoad() self.tableView.estimatedRowHeight = 60 - self.tableView.rowHeight = UITableViewAutomaticDimension + self.tableView.rowHeight = UITableView.automaticDimension } diff --git a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift index 66d8227..1375122 100644 --- a/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/Fetching and Querying Demo/QueryingResultsViewController.swift @@ -49,7 +49,7 @@ class QueryingResultsViewController: UITableViewController { super.viewDidLoad() self.tableView.estimatedRowHeight = 60 - self.tableView.rowHeight = UITableViewAutomaticDimension + self.tableView.rowHeight = UITableView.automaticDimension } diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json index e627b09..3092627 100644 --- a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -90,8 +90,9 @@ "scale" : "2x" }, { - "idiom" : "ios-marketing", "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Mask + Oval 1 + Oval 1 + Oval 1.png", "scale" : "1x" }, { diff --git a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png new file mode 100644 index 0000000..dfdb62a Binary files /dev/null and b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask + Oval 1 + Oval 1 + Oval 1.png differ diff --git a/CoreStoreDemo/CoreStoreDemo/Info.plist b/CoreStoreDemo/CoreStoreDemo/Info.plist index d5ce77e..26be92f 100644 --- a/CoreStoreDemo/CoreStoreDemo/Info.plist +++ b/CoreStoreDemo/CoreStoreDemo/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 6.0.0 + 6.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift index 154919b..6838694 100644 --- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift @@ -187,7 +187,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver ) } - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) { + override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { switch editingStyle { diff --git a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift index 088225d..fd7aa76 100644 --- a/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift +++ b/CoreStoreDemo/CoreStoreDemo/MIgrations Demo/MigrationsDemoViewController.swift @@ -360,7 +360,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD if let dataStack = dataStack, let model = model { self.segmentedControl?.selectedSegmentIndex = self.models - .index( + .firstIndex( where: { (arg) -> Bool in let (_, _, schemaHistory) = arg @@ -386,7 +386,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD } else { - self.segmentedControl?.selectedSegmentIndex = UISegmentedControlNoSegment + self.segmentedControl?.selectedSegmentIndex = UISegmentedControl.noSegment self._listMonitor = nil self._dataStack = nil } diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift index f810495..42ba499 100644 --- a/Sources/CoreStore+CustomDebugStringConvertible.swift +++ b/Sources/CoreStore+CustomDebugStringConvertible.swift @@ -1015,7 +1015,7 @@ extension VersionLock: CustomStringConvertible, CustomDebugStringConvertible, Co let data = keyValue.value let count = data.count - let bytes = data.withUnsafeBytes { (pointer: UnsafePointer) in + let bytes = data.withUnsafeBytes { (pointer) in return (0 ..< (count / MemoryLayout.size)) .map({ "\("0x\(String(pointer[$0], radix: 16, uppercase: false))")" }) diff --git a/Sources/DynamicSchema+Convenience.swift b/Sources/DynamicSchema+Convenience.swift index f331bfa..ada393b 100644 --- a/Sources/DynamicSchema+Convenience.swift +++ b/Sources/DynamicSchema+Convenience.swift @@ -154,7 +154,7 @@ extension DynamicSchema { if let defaultValue = (attribute.defaultValue as! Data.QueryableNativeType?).flatMap(Data.cs_fromQueryableNativeType) { let count = defaultValue.count - let bytes = defaultValue.withUnsafeBytes { (pointer: UnsafePointer) in + let bytes = defaultValue.withUnsafeBytes { (pointer) in return (0 ..< (count / MemoryLayout.size)) .map({ "\("0x\(String(pointer[$0], radix: 16, uppercase: false))")" }) diff --git a/Sources/FetchedResultsControllerDelegate.swift b/Sources/FetchedResultsControllerDelegate.swift index 6d29988..00c2ea4 100644 --- a/Sources/FetchedResultsControllerDelegate.swift +++ b/Sources/FetchedResultsControllerDelegate.swift @@ -87,7 +87,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult return } - if #available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *) {} + if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {} else { self.deletedSections = [] @@ -120,7 +120,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult return } - if #available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *) { + if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) { self.handler?.controller( controller, @@ -227,7 +227,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult return } - if #available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *) {} + if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {} else { switch type { @@ -237,7 +237,7 @@ internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResult default: break } } - + self.handler?.controller( controller, didChangeSection: sectionInfo, diff --git a/Sources/Info.plist b/Sources/Info.plist index 2010b7f..72b84bf 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 6.2.1 + 6.3.0 CFBundleSignature ???? CFBundleVersion