Merge branch 'release/1.3.0'

duemunk · Jul 11, 2015 · 3800ef8 · 3800ef8
2 parents 7536a4d + 99d540b
commit 3800ef8
Show file tree

Hide file tree

Showing 4 changed files with 942 additions and 746 deletions.
diff --git a/Async.podspec b/Async.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name        = "Async"
-  s.version     = "1.2.1"
+  s.version     = "1.3.0"
   s.summary     = "Syntactic sugar in Swift for asynchronous dispatches in Grand Central Dispatch"
   s.homepage    = "https://github.com/duemunk/Async"
   s.license     = { :type => "MIT" }
   s.authors     = { "Tobias Due Munk" => "[email protected]" }
 
   s.osx.deployment_target = "10.10"
   s.ios.deployment_target = "8.0"
-  s.source   = { :git => "https://github.com/duemunk/Async.git", :tag => "1.2.1"}
+  s.source   = { :git => "https://github.com/duemunk/Async.git", :tag => "1.3.0"}
   s.source_files = "Async.{h,swift}"
   s.requires_arc = true
 end
diff --git a/Async.swift b/Async.swift
@@ -130,7 +130,7 @@ public extension Async { // Static methods
 	static func background(#after: Double, block: dispatch_block_t) -> Async {
 		return Async.after(after, block: block, inQueue: GCD.backgroundQueue())
 	}
-	static func customQueue(#after: Double, queue: dispatch_queue_t, block: dispatch_block_t) -> Async {
+	static func customQueue(queue: dispatch_queue_t, after: Double, block: dispatch_block_t) -> Async {
 		return Async.after(after, block: block, inQueue: queue)
 	}
 }
@@ -208,7 +208,7 @@ public extension Async {
 	func background(#after: Double, block: dispatch_block_t) -> Async {
 		return self.after(after, block: block, runInQueue: GCD.backgroundQueue())
 	}
-	func customQueue(#after: Double, queue: dispatch_queue_t, block: dispatch_block_t) -> Async {
+	func customQueue(queue: dispatch_queue_t, after: Double, block: dispatch_block_t) -> Async {
 		return self.after(after, block: block, runInQueue: queue)
 	}