From d4a2be06271c6baa91abbe828c8fe53648866968 Mon Sep 17 00:00:00 2001
From: Sho Ikeda <suicaicoca@gmail.com>
Date: Wed, 25 Oct 2017 14:12:36 +0900
Subject: [PATCH] [SwiftPM] Use V4 PackageDescription

---
 .travis.yml               |  3 ++-
 Cartfile                  |  2 +-
 Cartfile.resolved         |  2 +-
 Carthage/Checkouts/Result |  2 +-
 Package.resolved          | 18 ++++++++++++++++++
 Package.swift             | 33 +++++++++++++++------------------
 6 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 989b0eb..c123a9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,9 @@ matrix:
     - os: osx
       osx_image: xcode9
       script:
+        - swift --version
         - swift build
-        - SWIFTPM_TEST_ReactiveTask=YES swift test
+        - swift test
       git:
         submodules: false
       env: JOB=SWIFTPM_DARWIN
diff --git a/Cartfile b/Cartfile
index 22b7809..293fe45 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
 github "antitypical/Result" ~> 3.2.1
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0
+github "ReactiveCocoa/ReactiveSwift" ~> 2.0.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index f903356..fd3587b 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v7.0.2"
 github "Quick/Quick" "v1.2.0"
 github "ReactiveCocoa/ReactiveSwift" "2.0.1"
-github "antitypical/Result" "3.2.3"
+github "antitypical/Result" "3.2.4"
 github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
index c844618..7477584 160000
--- a/Carthage/Checkouts/Result
+++ b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit c8446185238659a2b27c0261f64ff1254291d07d
+Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11
diff --git a/Package.resolved b/Package.resolved
index 9a5289e..30ce885 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,6 +1,24 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble.git",
+        "state": {
+          "branch": null,
+          "revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4",
+          "version": "7.0.2"
+        }
+      },
+      {
+        "package": "Quick",
+        "repositoryURL": "https://github.com/Quick/Quick.git",
+        "state": {
+          "branch": null,
+          "revision": "0ff81f2c665b4381f526bd656f8708dd52a9ea2f",
+          "version": "1.2.0"
+        }
+      },
       {
         "package": "ReactiveSwift",
         "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
diff --git a/Package.swift b/Package.swift
index ce615c4..75c6e47 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,23 +1,20 @@
-import Foundation
+// swift-tools-version:4.0
 import PackageDescription
 
-var isSwiftPackagerManagerTest: Bool {
-    return ProcessInfo.processInfo.environment["SWIFTPM_TEST_ReactiveTask"] == "YES"
-}
-
 let package = Package(
     name: "ReactiveTask",
-    dependencies: {
-        var deps: [Package.Dependency] = [
-            .Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
-            .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", majorVersion: 2),
-        ]
-        if isSwiftPackagerManagerTest {
-            deps += [
-                .Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 2),
-                .Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 7),
-            ]
-        }
-        return deps
-    }()
+    products: [
+        .library(name: "ReactiveTask", targets: ["ReactiveTask"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/antitypical/Result.git", from: "3.2.1"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.1"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "1.2.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "7.0.2"),
+    ],
+    targets: [
+        .target(name: "ReactiveTask", dependencies: ["Result", "ReactiveSwift"], path: "Sources"),
+        .testTarget(name: "ReactiveTaskTests", dependencies: ["ReactiveTask", "Quick", "Nimble"]),
+    ],
+    swiftLanguageVersions: [3]
 )