Merge pull request #93 from mdiep/reactiveswift-3.0

Update ReactiveSwift to 3.0

Author: mdiep

.travis.yml

@@ -1,10 +1,8 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.1
 branches:
   only:
     - master
-before_script:
-  - git submodule update --init --recursive
 script: script/cibuild "$TRAVIS_XCODE_WORKSPACE" "$TRAVIS_XCODE_SCHEME" "$XCODE_ACTION"
 xcode_workspace: Tentacle.xcworkspace
 matrix:
@@ -15,7 +13,8 @@ matrix:
       env: XCODE_ACTION="build-for-testing test-without-building"
     - xcode_scheme: update-test-fixtures
       env: XCODE_ACTION=build
-    - before_script: true
+    - git:
+        submodules: false
       script:
         - swift build
         - swift test

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveSwift" ~> 2.0
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "ReactiveCocoa/ReactiveSwift" "2.0.1"
-github "antitypical/Result" "3.2.3"
+github "ReactiveCocoa/ReactiveSwift" "3.0.0"
+github "antitypical/Result" "3.2.4"

Carthage/Checkouts/ReactiveSwift

@@ -7,7 +7,7 @@ let package = Package(
         .library(name: "Tentacle", targets: ["Tentacle"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.0"),
+        .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
     ],
     targets: [
         .target(name: "Tentacle", dependencies: ["ReactiveSwift"]),