Merge pull request #22 from skylab-inc/master

Updated for Swift 4

Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "PromiseKit",
+        "repositoryURL": "https://github.com/mxcl/PromiseKit.git",
+        "state": {
+          "branch": null,
+          "revision": "61f796319b16f0d4f3a8cd939d8e7f9a74963038",
+          "version": "4.3.2"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -1,3 +1,5 @@
+// swift-tools-version:4.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
 /*
  * AwaitKit
  *
@@ -28,7 +30,22 @@ import PackageDescription
 
 let package = Package(
   name: "AwaitKit",
+  products: [
+    .library(
+      name: "AwaitKit",
+      targets: ["AwaitKit"]),
+  ],
   dependencies: [
-    .Package(url: "https://github.com/mxcl/PromiseKit.git", majorVersion: 4, minor: 3)
+    .package(url: "https://github.com/mxcl/PromiseKit.git", from: "4.3.0")
+  ],
+  targets: [
+    .target(
+      name: "AwaitKit",
+      dependencies: [
+        "PromiseKit",
+      ]),
+    .testTarget(
+      name: "AwaitKitTests",
+      dependencies: ["AwaitKit"]),
   ]
 )

Sources/AwaitKit.swift → Sources/AwaitKit/AwaitKit.swift

@@ -26,6 +26,7 @@
 
 import Foundation
 import PromiseKit
+import Dispatch
 
 /// Convenience struct to make the background job.
 public struct Queue {

Sources/AwaitKitExtension.swift → Sources/AwaitKit/AwaitKitExtension.swift

@@ -25,6 +25,7 @@
  */
 
 import Foundation
+import Dispatch
 
 /// The generic object to add an `ak` category. Here the base will be the DispatchQueue.
 public final class Extension<Base> {

Sources/DispatchQueue+Async.swift → Sources/AwaitKit/DispatchQueue+Async.swift

@@ -26,6 +26,7 @@
 
 import Foundation
 import PromiseKit
+import Dispatch
 
 extension Extension where Base: DispatchQueue {
   /**

Sources/DispatchQueue+Await.swift → Sources/AwaitKit/DispatchQueue+Await.swift

@@ -26,6 +26,7 @@
 
 import Foundation
 import PromiseKit
+import Dispatch
 
 extension Extension where Base: DispatchQueue {
   /**

Tests/AwaitKitAwaitTests.swift → Tests/AwaitKitTests/AwaitKitAwaitTests.swift

@@ -60,7 +60,7 @@ class AwaitKitAwaitTests: XCTestCase {
 
   func testNoValueAwaitPromise() {
     let promise: Promise<Void> = Promise { resolve, reject in
-      resolve()
+      resolve(())
     }
 
     XCTAssertNotNil(promise.value)

Tests/AwaitKitTests.swift → Tests/AwaitKitTests/AwaitKitTests.swift

@@ -30,8 +30,8 @@ import XCTest
 
 class AwaitKitTests: XCTestCase {
   func testExcludeSameQueue() {
-    let promise = Promise { resolve, reject in
-      resolve()
+    let promise = Promise<Void> { resolve, reject in
+      resolve(())
     }
 
     XCTAssertThrowsError(try DispatchQueue.main.ak.await(promise))
@@ -40,8 +40,8 @@ class AwaitKitTests: XCTestCase {
   func testAsyncAndAwaitOnDifferentQueue() {
     let expect = expectation(description: "Async should fulfill")
 
-    let promise = Promise { resolve, reject in
-      resolve()
+    let promise = Promise<Void> { resolve, reject in
+      resolve(())
     }
 
     let result: Promise<Void> = async {
@@ -58,8 +58,8 @@ class AwaitKitTests: XCTestCase {
   func testImbricationQueue() {
     let expect = expectation(description: "Async should fulfill")
 
-    let promise = Promise { resolve, reject in
-      resolve()
+    let promise = Promise<Void> { resolve, reject in
+      resolve(())
     }
 
     let result: Promise<Void> = async {