From 7cf11c25620e5c13659a7dcfc9124163269ec896 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Fri, 14 Jul 2017 00:03:58 +0900 Subject: [PATCH 1/2] ReactiveSwift 2.0.0-rc.3 --- .travis.yml | 2 +- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/ReactiveSwift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96acbc3..f5abf5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: 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: diff --git a/Cartfile b/Cartfile index 8ccf51f..6b778b3 100644 --- a/Cartfile +++ b/Cartfile @@ -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" diff --git a/Cartfile.resolved b/Cartfile.resolved index fd11505..8fb45c2 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -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" diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index cd4eb9e..c4ca098 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit cd4eb9e9a86bffdb807b7027c02b9fb154ee6ba8 +Subproject commit c4ca0982a23f5176e2a0b466aa3628647ead0b5c From 06d7365bb492d06e085c274e1c6dec35fdc7917c Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Fri, 14 Jul 2017 00:11:01 +0900 Subject: [PATCH 2/2] Add Xcode 9 job --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index f5abf5a..cad318f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,12 @@ 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: