Swift 3 migration

intelygenz · Oct 5, 2016 · ee67182 · ee67182
1 parent d9439a3
commit ee67182
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 34 deletions.
diff --git a/Example/Kommander.xcodeproj/project.pbxproj b/Example/Kommander.xcodeproj/project.pbxproj
@@ -133,6 +133,7 @@
 				TargetAttributes = {
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
+						LastSwiftMigration = 0800;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -323,6 +324,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -338,6 +340,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Tests/Tests.swift b/Example/Tests/Tests.swift
@@ -21,7 +21,7 @@ class Tests: XCTestCase {
 
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
             // Put the code you want to measure the time of here.
         }
     }

diff --git a/Kommander/Classes/GCDKommandExecutor.swift b/Kommander/Classes/GCDKommandExecutor.swift
@@ -8,15 +8,14 @@
 
 import Foundation
 
-public class GCDKommandExecutor: KommandExecutor {
+open class GCDKommandExecutor: KommandExecutor {
 
     public init(){
     }
 
-    public func execute(block: () -> Void) {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0)) {
-
+    public func execute(_ block: @escaping () -> Void) {
+        DispatchQueue.global(qos: .userInitiated).async {
             block()
         }
     }
-}
+}
diff --git a/Kommander/Classes/Kommand.swift b/Kommander/Classes/Kommand.swift
@@ -8,47 +8,47 @@
 
 import Foundation
 
-public class Kommand<T> {
+open class Kommand<T> {
 
     public typealias ActionBlock = () throws -> T
-    public typealias SuccessBlock = (result: T) -> Void
-    public typealias ErrorBlock = (error: ErrorType) -> Void
+    public typealias SuccessBlock = (_ result: T) -> Void
+    public typealias ErrorBlock = (_ error: Error) -> Void
 
-    private let action: ActionBlock
-    private var successBlock: SuccessBlock?
-    private var errorBlock: ErrorBlock?
+    fileprivate let action: ActionBlock
+    fileprivate var successBlock: SuccessBlock?
+    fileprivate var errorBlock: ErrorBlock?
 
-    private let executor: KommandExecutor
-    private let deliverer: KommandDeliverer
+    fileprivate let executor: KommandExecutor
+    fileprivate let deliverer: KommandDeliverer
 
-    internal init(action: ActionBlock, executor: KommandExecutor, deliverer: KommandDeliverer) {
+    internal init(action: @escaping ActionBlock, executor: KommandExecutor, deliverer: KommandDeliverer) {
         self.action = action
         self.executor = executor
         self.deliverer = deliverer
     }
 
-    public func onSuccess(onSuccess: SuccessBlock) -> Self {
+    open func onSuccess(_ onSuccess: @escaping SuccessBlock) -> Self {
         self.successBlock = onSuccess
         return self
     }
 
-    public func onError(onError: ErrorBlock) -> Self {
+    open func onError(_ onError: @escaping ErrorBlock) -> Self {
         self.errorBlock = onError
         return self
     }
 
-    public func execute() {        
+    open func execute() {        
         executor.execute { 
             do {
                 let result = try self.action()
                 self.deliverer.deliver {
-                    self.successBlock?(result: result)
+                    self.successBlock?(result)
                 }
             } catch let error {
                 self.deliverer.deliver {
-                    self.errorBlock?(error: error)
+                    self.errorBlock?(error)
                 }
             }
         }
     }
-}
+}
diff --git a/Kommander/Classes/KommandDeliverer.swift b/Kommander/Classes/KommandDeliverer.swift
@@ -10,5 +10,5 @@ import Foundation
 
 public protocol KommandDeliverer {
 
-    func deliver(block: () -> Void)
-}
+    func deliver(_ block: @escaping () -> Void)
+}
diff --git a/Kommander/Classes/KommandExecutor.swift b/Kommander/Classes/KommandExecutor.swift
@@ -10,5 +10,5 @@ import Foundation
 
 public protocol KommandExecutor {
 
-    func execute(block: () -> Void)
-}
+    func execute(_ block: @escaping() -> Void)
+}
diff --git a/Kommander/Classes/Kommander.swift b/Kommander/Classes/Kommander.swift
@@ -8,18 +8,18 @@
 
 import Foundation
 
-public class Kommander {
+open class Kommander {
 
-    private let executor: KommandExecutor
-    private let deliverer: KommandDeliverer
+    fileprivate let executor: KommandExecutor
+    fileprivate let deliverer: KommandDeliverer
 
     public init(executor: KommandExecutor, deliverer: KommandDeliverer) {
 
         self.executor = executor
         self.deliverer = deliverer
     }
 
-    public func makeKommand<T>(action: () throws -> T) -> Kommand<T> {
+    open func makeKommand<T>(_ action: @escaping () throws -> T) -> Kommand<T> {
         return Kommand<T>(action: action, executor: executor, deliverer: deliverer)
     }
-}
+}
diff --git a/Kommander/Classes/MainQueueKommandDeliverer.swift b/Kommander/Classes/MainQueueKommandDeliverer.swift
@@ -8,14 +8,14 @@
 
 import Foundation
 
-public class MainQueueKommandDeliverer: KommandDeliverer {
+open class MainQueueKommandDeliverer: KommandDeliverer {
 
     public init(){
     }
 
-    public func deliver(block: () -> Void) {
-        dispatch_async(dispatch_get_main_queue()) {
+    public func deliver(_ block: @escaping () -> Void) {
+        DispatchQueue.main.async {
             block()
         }
     }
-}
+}