Merge pull request #8 from intelygenz/feature/#7-many-initializers-ma…

…ny-parameters, this will resolve #7

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Release 0.8.1
+
+- [x] Deprecated some DispatchQueue methods and initializers.
+
 # Release 0.8.0
 
 - [x] Swift 4.0

Kommander.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Kommander'
-  s.version          = '0.8.0'
+  s.version          = '0.8.1'
   s.summary          = 'A command pattern implementation written in Swift 4'
 
   s.homepage         = 'https://github.com/intelygenz/Kommander-iOS'

Kommander.xcodeproj/project.pbxproj

@@ -980,7 +980,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 3VW789WSMP;
 				DYLIB_COMPATIBILITY_VERSION = 0.8.0;
-				DYLIB_CURRENT_VERSION = 0.8.0;
+				DYLIB_CURRENT_VERSION = 0.8.1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1052,7 +1052,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 3VW789WSMP;
 				DYLIB_COMPATIBILITY_VERSION = 0.8.0;
-				DYLIB_CURRENT_VERSION = 0.8.0;
+				DYLIB_CURRENT_VERSION = 0.8.1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

README.md

@@ -26,7 +26,6 @@ Inspired on the Java library [**Kommander**](https://github.com/Wokdsem/Kommande
 - [x] Main thread dispatcher
 - [x] Current thread dispatcher
 - [x] Custom OperationQueue dispatcher
-- [x] Custom DispatchQueue dispatcher
 - [x] Execute single or multiple Operation
 - [x] Execute sequential or concurrent blocks
 - [x] Execute DispatchWorkItem

Source/Dispatcher.swift

@@ -8,23 +8,13 @@
 
 import Foundation
 
-/// Queue priority
-private enum Priority {
-    /// Operation queue priority
-    case operation
-    /// Dispatch queue priority
-    case dispatch
-}
-
 /// Dispatcher
 open class Dispatcher {
 
     /// Dispatcher operation queue
     final var operationQueue = OperationQueue()
     /// Dispatcher dispatch queue
     final var dispatchQueue = DispatchQueue(label: UUID().uuidString)
-    /// Dispatcher queue priority
-    private final var priority = Priority.operation
 
     /// Main queue dispatcher
     open static var main: Dispatcher { return MainDispatcher() }
@@ -54,9 +44,9 @@ open class Dispatcher {
     }
 
     /// Dispatcher instance with custom DispatchQueue
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `Dispatcher.init(name:qos:maxConcurrentOperationCount:)` instead.")
     public init(label: String?, qos: DispatchQoS?, attributes: DispatchQueue.Attributes? = nil, autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency? = nil, target: DispatchQueue? = nil) {
         dispatchQueue = DispatchQueue(label: label ?? UUID().uuidString, qos: qos ?? .default, attributes: attributes ?? .concurrent, autoreleaseFrequency: autoreleaseFrequency ?? .inherit, target: target)
-        priority = .dispatch
     }
 
     /// Execute Operation instance in OperationQueue
@@ -71,14 +61,9 @@ open class Dispatcher {
 
     /// Execute block in priority queue
     @discardableResult open func execute(_ block: @escaping () -> Void) -> Any {
-        if priority == .dispatch {
-            return execute(qos: nil, flags: nil, block: block)
-        }
-        else {
-            let blockOperation = BlockOperation(block: block)
-            execute(blockOperation)
-            return blockOperation
-        }
+        let blockOperation = BlockOperation(block: block)
+        execute(blockOperation)
+        return blockOperation
     }
 
     /// Execute [block] collection in priority queue (if possible) concurrently or sequentially
@@ -105,6 +90,7 @@ open class Dispatcher {
     }
 
     /// Execute block in DispatchQueue using custom DispatchWorkItem instance after delay
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `execute(delay:work:)` instead.")
     open func execute(after delay: DispatchTimeInterval, qos: DispatchQoS?, flags: DispatchWorkItemFlags?, block: @escaping @convention(block) () -> ()) {
         guard delay != .never else {
             return
@@ -122,6 +108,7 @@ open class Dispatcher {
     }
 
     /// Execute block in DispatchQueue using custom DispatchWorkItem instance
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `execute(work:)` instead.")
     @discardableResult open func execute(qos: DispatchQoS?, flags: DispatchWorkItemFlags?, block: @escaping @convention(block) () -> ()) -> DispatchWorkItem {
         let work = DispatchWorkItem(qos: qos ?? .default, flags: flags ?? .assignCurrentContext, block: block)
         execute(work)

Source/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.0</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Source/Kommander.swift

@@ -42,6 +42,7 @@ open class Kommander {
     }
 
     /// Kommander instance with your deliverer and default Dispatcher executor
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `Kommander.init(deliverer:executor:)` instead.")
     public convenience init(deliverer: Dispatcher) {
         self.init(deliverer: deliverer, executor: nil)
     }
@@ -58,6 +59,7 @@ open class Kommander {
     }
 
     /// Kommander instance with CurrentDispatcher deliverer and custom DispatchQueue executor
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `Kommander.init(name:qos:maxConcurrentOperationCount:)` instead.")
     public convenience init(name: String?, qos: DispatchQoS?, attributes: DispatchQueue.Attributes?, autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency?, target: DispatchQueue?) {
         self.init(deliverer: nil, name: name, qos: qos, attributes: attributes, autoreleaseFrequency: autoreleaseFrequency, target: target)
     }
@@ -69,6 +71,7 @@ open class Kommander {
     }
 
     /// Kommander instance with your deliverer and custom DispatchQueue executor
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `Kommander.init(deliverer:name:qos:maxConcurrentOperationCount:)` instead.")
     public init(deliverer: Dispatcher?, name: String?, qos: DispatchQoS?, attributes: DispatchQueue.Attributes?, autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency?, target: DispatchQueue?) {
         self.deliverer = deliverer ?? CurrentDispatcher()
         executor = Dispatcher(label: name, qos: qos, attributes: attributes, autoreleaseFrequency: autoreleaseFrequency, target: target)

Source/MainDispatcher.swift

@@ -25,6 +25,7 @@ open class MainDispatcher: Dispatcher {
     }
 
     /// - Warning: You can't use this initializer!
+    @available(*, deprecated, message: "This will be removed in Kommander 0.9. Use `MainDispatcher.init()` instead.")
     private override convenience init(label: String?, qos: DispatchQoS?, attributes: DispatchQueue.Attributes?, autoreleaseFrequency: DispatchQueue.AutoreleaseFrequency?, target: DispatchQueue?) {
         self.init()
         assertionFailure("You can't use this initializer for a \(String(describing: type(of: self))).")