Migrate to Swift 4.2

justeat · Nov 30, 2018 · 3e55fbb · 3e55fbb
1 parent 359a05e
commit 3e55fbb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/Example/JustPersist.xcodeproj/project.pbxproj b/Example/JustPersist.xcodeproj/project.pbxproj
@@ -374,7 +374,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0910;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					4F35A5FA1DC1039C0043CF4A = {
@@ -720,12 +720,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -758,7 +760,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -774,12 +776,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -804,7 +808,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/Example/JustPersist.xcodeproj/xcshareddata/xcschemes/JustPersist-Example.xcscheme b/Example/JustPersist.xcodeproj/xcshareddata/xcschemes/JustPersist-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -42,7 +42,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "29BC2CC8CBA892AC775D7F0FC012AF00"
+               BlueprintIdentifier = "09E4B9A839C7C0FCF8593621696E8496"
                BuildableName = "JustPersist.framework"
                BlueprintName = "JustPersist"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
@@ -54,9 +54,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -85,7 +84,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Example/JustPersist/AppDelegate.swift b/Example/JustPersist/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/JustPersist/Classes/Core/Interface/DataStoreRequest.swift b/JustPersist/Classes/Core/Interface/DataStoreRequest.swift
@@ -11,7 +11,7 @@ import Foundation
 @objcMembers
 open class DataStoreRequest: NSObject {
 
-    open let itemType: DataStoreItem.Type
+    public let itemType: DataStoreItem.Type
     open var predicate: NSPredicate?
     open var sortDescriptors: [NSSortDescriptor]?
     open var offset: Int?

diff --git a/JustPersist/Classes/Wrappers/MagicalRecord/MagicalRecordDataStore.swift b/JustPersist/Classes/Wrappers/MagicalRecord/MagicalRecordDataStore.swift
@@ -24,7 +24,7 @@ open class MagicalRecordDataStore: NSObject {
     fileprivate var tearDownBlock: () -> Void
     fileprivate var isSetup = false
 
-    open static func stack(_ dataModelFileName: NSString, securityApplicationGroupIdentifier: NSString, errorHandler: DataStoreErrorHandler? = nil) -> MagicalRecordDataStore {
+    public static func stack(_ dataModelFileName: NSString, securityApplicationGroupIdentifier: NSString, errorHandler: DataStoreErrorHandler? = nil) -> MagicalRecordDataStore {
 
         return MagicalRecordDataStore(setupBlock: {
 
@@ -40,7 +40,7 @@ open class MagicalRecordDataStore: NSObject {
             }, errorHandler: errorHandler)
     }
 
-    open static func inMemoryStack(_ errorHandler: DataStoreErrorHandler? = nil) -> MagicalRecordDataStore {
+    public static func inMemoryStack(_ errorHandler: DataStoreErrorHandler? = nil) -> MagicalRecordDataStore {
 
         return MagicalRecordDataStore(setupBlock: {