diff --git a/.travis.yml b/.travis.yml index ae2b8c9..342d338 100644 --- a/.travis.yml +++ b/.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 diff --git a/Cartfile b/Cartfile index 229fab6..ecb3846 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveSwift" ~> 2.0 +github "ReactiveCocoa/ReactiveSwift" ~> 3.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 7731d9d..2cadce2 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index b9d5b35..2ec944c 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit b9d5b350a446b85704396ce332a1f9e4960cfc6b +Subproject commit 2ec944c43ef9cf6b1380629e3ea483f62a7afaef 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 aac20b3..27d4768 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git", "state": { "branch": null, - "revision": "b9d5b350a446b85704396ce332a1f9e4960cfc6b", - "version": "2.0.1" + "revision": "2ec944c43ef9cf6b1380629e3ea483f62a7afaef", + "version": "3.0.0" } }, { diff --git a/Package.swift b/Package.swift index dd2bfb2..9c55b47 100644 --- a/Package.swift +++ b/Package.swift @@ -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"]),