Update to swift 4.2

e-marchand · e-marchand · commit e30d2aa81cd2 · 2018-09-17T09:52:19.000+02:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/CallbackURLKit.podspec b/CallbackURLKit.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   s.name         = "CallbackURLKit"
-  s.version      = "2.0.0"
+  s.version      = "2.1.0"
   s.summary      = "Implemenation of x-callback-url in swift"
   s.homepage     = "https://github.com/phimage/CallbackURLKit"
 
diff --git a/CallbackURLKit.xcodeproj/project.pbxproj b/CallbackURLKit.xcodeproj/project.pbxproj
@@ -257,10 +257,11 @@
 					};
 					C4A8D50F1C37D84A00DB3306 = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 					C4E32D551C398AE1005CD033 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 1000;
 					};
 				};
 			};
@@ -527,8 +528,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -548,8 +548,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -568,8 +567,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -588,8 +586,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/Sources/Manager.swift b/Sources/Manager.swift
@@ -32,7 +32,7 @@ import Foundation
 open class Manager {
 
     /// Singletong shared instance
-    open static let shared = Manager()
+    public static let shared = Manager()
 
     /// List of action/action closure
     var actions: [Action: ActionHandler] = [:]
@@ -151,7 +151,7 @@ open class Manager {
     }
 
     /// Handle url with manager shared instance
-    open static func handleOpen(url: URL) -> Bool {
+    public static func handleOpen(url: URL) -> Bool {
         return self.shared.handleOpen(url: url)
     }
     
@@ -173,13 +173,13 @@ open class Manager {
         try client.perform(action: action, parameters: parameters, onSuccess: onSuccess, onFailure: onFailure, onCancel: onCancel)
     }
 
-    open static func perform(action: Action, urlScheme: String, parameters: Parameters = [:],
+    public static func perform(action: Action, urlScheme: String, parameters: Parameters = [:],
         onSuccess: SuccessCallback? = nil, onFailure: FailureCallback? = nil, onCancel: CancelCallback? = nil) throws {
         try Manager.shared.perform(action: action, urlScheme: urlScheme, parameters: parameters, onSuccess: onSuccess, onFailure: onFailure, onCancel: onCancel)
     }
     
     /// Utility function to get URL schemes from Info.plist
-    open static var urlSchemes: [String]? {
+    public static var urlSchemes: [String]? {
         guard let urlTypes = Bundle.main.infoDictionary?["CFBundleURLTypes"] as? [[String: AnyObject]] else {
             return nil
         }
@@ -246,7 +246,7 @@ open class Manager {
         return result
     }
 
-    open static func open(url: Foundation.URL) {
+    public static func open(url: Foundation.URL) {
         Manager.shared.open(url: url)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import Foundation`
`32`	`32`	`open class Manager {`
`33`	`33`
`34`	`34`	`/// Singletong shared instance`
`35`		`- open static let shared = Manager()`
	`35`	`+ public static let shared = Manager()`
`36`	`36`
`37`	`37`	`/// List of action/action closure`
`38`	`38`	`var actions: [Action: ActionHandler] = [:]`
`@@ -151,7 +151,7 @@ open class Manager {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`/// Handle url with manager shared instance`
`154`		`- open static func handleOpen(url: URL) -> Bool {`
	`154`	`+ public static func handleOpen(url: URL) -> Bool {`
`155`	`155`	`return self.shared.handleOpen(url: url)`
`156`	`156`	`}`
`157`	`157`
`@@ -173,13 +173,13 @@ open class Manager {`
`173`	`173`	`try client.perform(action: action, parameters: parameters, onSuccess: onSuccess, onFailure: onFailure, onCancel: onCancel)`
`174`	`174`	`}`
`175`	`175`
`176`		`- open static func perform(action: Action, urlScheme: String, parameters: Parameters = [:],`
	`176`	`+ public static func perform(action: Action, urlScheme: String, parameters: Parameters = [:],`
`177`	`177`	`onSuccess: SuccessCallback? = nil, onFailure: FailureCallback? = nil, onCancel: CancelCallback? = nil) throws {`
`178`	`178`	`try Manager.shared.perform(action: action, urlScheme: urlScheme, parameters: parameters, onSuccess: onSuccess, onFailure: onFailure, onCancel: onCancel)`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`/// Utility function to get URL schemes from Info.plist`
`182`		`- open static var urlSchemes: [String]? {`
	`182`	`+ public static var urlSchemes: [String]? {`
`183`	`183`	`guard let urlTypes = Bundle.main.infoDictionary?["CFBundleURLTypes"] as? [[String: AnyObject]] else {`
`184`	`184`	`return nil`
`185`	`185`	`}`
`@@ -246,7 +246,7 @@ open class Manager {`
`246`	`246`	`return result`
`247`	`247`	`}`
`248`	`248`
`249`		`- open static func open(url: Foundation.URL) {`
	`249`	`+ public static func open(url: Foundation.URL) {`
`250`	`250`	`Manager.shared.open(url: url)`
`251`	`251`	`}`
`252`	`252`