Update Package.swift

.swift-version

@@ -1 +1 @@
-3.0
+3.1

.travis.yml

@@ -3,7 +3,7 @@ env:
     - LC_CTYPE=en_US.UTF-8
     - XCPROJ="-workspace RxAutomaton.xcworkspace -scheme RxAutomaton"
 
-osx_image: xcode8.2
+osx_image: xcode8.3
 
 matrix:
   include:
@@ -35,7 +35,7 @@ matrix:
       language: objective-c
       script:
         - set -o pipefail
-        - xcodebuild build -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm' $XCPROJ | xcpretty
+        - xcodebuild build -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm,OS=2.2' $XCPROJ | xcpretty
       env:
         - JOB=xcodebuild-watchOS
 
@@ -49,6 +49,7 @@ matrix:
       language: generic
       script:
         - swift build
+        #- SWIFTPM_TEST=YES swift test  # macOS not supported yet
       env:
         - JOB=swiftpm-mac
 
@@ -59,7 +60,6 @@ matrix:
       before_install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
       script:
-        - mv .Package.test.swift Package.swift
         - swift build
-        - swift test
+        - SWIFTPM_TEST=YES swift test
       env: JOB=swiftpm-linux

Package.swift

@@ -1,8 +1,20 @@
+import Foundation
 import PackageDescription
 
+let isSwiftPackageManagerTest = ProcessInfo.processInfo.environment["SWIFTPM_TEST"] == "YES"
+
 let package = Package(
     name: "RxAutomaton",
-    dependencies: [
-        .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
-    ]
+    dependencies: {
+        var deps: [Package.Dependency] = [
+            .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3)
+        ]
+        if isSwiftPackageManagerTest {
+            deps += [
+                .Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
+                .Package(url: "https://github.com/Quick/Nimble", majorVersion: 6)
+            ]
+        }
+        return deps
+    }()
 )