Merge pull request #13 from inamiy/update-dependencies

Update dependencies & disable SPM build on Linux

.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,17 +49,28 @@ matrix:
       language: generic
       script:
         - swift build
+        #- SWIFTPM_TEST=YES swift test  # macOS not supported yet
       env:
         - JOB=swiftpm-mac
 
-    - os: linux
-      language: generic
-      sudo: required
-      dist: trusty
-      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
-      env: JOB=swiftpm-linux
+    # 2017/04/16 Temporary Comment-Out:
+    # `swift build` doesn't work on Linux (Swift 3.1).
+    # See https://travis-ci.org/inamiy/RxAutomaton/jobs/222546274
+    #
+    # ```
+    # /home/travis/build/inamiy/RxAutomaton/.build/checkouts/RxSwift.git-77973592786467360/Sources/RxCocoa/URLSession+Rx.swift:144:76: error: 'Error' is not convertible to 'NSError'; did you mean to use 'as!' to force downcast?
+    #                 print(convertResponseToString(response, error.map { $0 as NSError }, interval))
+    #                                                                     ~~~^~~~~~~~~~
+    #                                                                       as!
+    # ```
+
+    #- os: linux
+    #  language: generic
+    #  sudo: required
+    #  dist: trusty
+    #  before_install:
+    #    - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/#raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    #  script:
+    #    - swift build
+    #    - SWIFTPM_TEST=YES swift test
+    #  env: JOB=swiftpm-linux

Cartfile.private

@@ -1,4 +1,4 @@
-github "Quick/Quick"
-github "Quick/Nimble"
+github "Quick/Quick" ~> 1.0
+github "Quick/Nimble" ~> 6.0
 github "mrackwitz/xcconfigs"
-github "shu223/Pulsator"
+github "shu223/Pulsator" ~> 0.3

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v5.1.0"
-github "shu223/Pulsator" "0.2.0"
-github "Quick/Quick" "v0.10.0"
-github "ReactiveX/RxSwift" "3.0.0"
+github "Quick/Nimble" "v6.1.0"
+github "shu223/Pulsator" "0.3.0"
+github "Quick/Quick" "v1.1.0"
+github "ReactiveX/RxSwift" "3.4.0"
 github "mrackwitz/xcconfigs" "3.0"

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
+    }()
 )