Skip to content

Commit

Permalink
Merge pull request #98 from Carthage/ras2-rc3
Browse files Browse the repository at this point in the history
ReactiveSwift 2.0.0-rc.3
  • Loading branch information
mdiep authored Jul 14, 2017
2 parents 5a08308 + 06d7365 commit e457822
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@ matrix:
script:
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
env: JOB=Xcode8
- os: osx
osx_image: xcode9
xcode_scheme: ReactiveTask
script:
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
env: JOB=Xcode9
- os: osx
osx_image: xcode8.3
script:
- swift package fetch
- swift package edit ReactiveSwift --revision 2.0.0-rc.2
- swift package edit ReactiveSwift --revision 2.0.0-rc.3
- swift build
- SWIFTPM_TEST_ReactiveTask=YES swift test
git:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "antitypical/Result" ~> 3.2.1
github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.2"
github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "v7.0.1"
github "Quick/Quick" "v1.1.0"
github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.2"
github "ReactiveCocoa/ReactiveSwift" "2.0.0-rc.3"
github "antitypical/Result" "3.2.3"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

0 comments on commit e457822

Please sign in to comment.