diff --git a/.travis.yml b/.travis.yml index ba6f79b..08a049c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,19 @@ language: objective-c -osx_image: xcode7.3 xcode_workspace: ReactiveTask.xcworkspace -xcode_scheme: ReactiveTask git: submodules: false before_script: - git submodule update --init --recursive script: - set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty +matrix: + include: + - osx_image: xcode7.3 + xcode_scheme: ReactiveTask + env: JOB=Xcode7.3 + - osx_image: xcode8 + xcode_scheme: ReactiveTask + env: JOB=Xcode8 notifications: email: false slack: @@ -27,3 +33,4 @@ deploy: on: repo: Carthage/ReactiveTask tags: true + condition: $JOB = Xcode7.3 diff --git a/Cartfile b/Cartfile index fb56d4c..c46e125 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1 +github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2 diff --git a/Cartfile.private b/Cartfile.private index 83ded73..04cd91a 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "sharplet/Quick" "xcode-8" github "Quick/Nimble" "188caeb" -github "jspahrsummers/xcconfigs" ~> 0.9 +github "jspahrsummers/xcconfigs" "1ef9763" diff --git a/Cartfile.resolved b/Cartfile.resolved index c2f73e9..f7245d5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb" github "sharplet/Quick" "e2cfb86c8379417c9272bb853e9f0c407167d486" -github "antitypical/Result" "2.1.2" -github "jspahrsummers/xcconfigs" "0.9" -github "ReactiveCocoa/ReactiveCocoa" "v4.2.1" +github "antitypical/Result" "2.1.3" +github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1" +github "ReactiveCocoa/ReactiveCocoa" "v4.2.2" diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa index 6f52f8b..f214c9d 160000 --- a/Carthage/Checkouts/ReactiveCocoa +++ b/Carthage/Checkouts/ReactiveCocoa @@ -1 +1 @@ -Subproject commit 6f52f8bbdf1118431b3984a1e2858e6eecf444e6 +Subproject commit f214c9d508db77f751c3af5be967c4cb235fc0a1 diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index efa4c04..9b5e373 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit efa4c04a65ba0af37ca5320993875f73ecb1cfa0 +Subproject commit 9b5e373891dfe0de11ba2a8e9a5cafd570b858c4 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index d78854b..1ef9763 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit d78854b22b9567e7f30d748bdd4966c86bcc93a5 +Subproject commit 1ef97639ffbe041da0b1392b2114fa19b922a7a1 diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index 2d309bc..924127f 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -274,9 +274,11 @@ TargetAttributes = { D0BFEA571A2D1E5E00E23194 = { CreatedOnToolsVersion = 6.1.1; + LastSwiftMigration = 0800; }; D0BFEA621A2D1E5E00E23194 = { CreatedOnToolsVersion = 6.1.1; + LastSwiftMigration = 0800; }; }; }; @@ -354,6 +356,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + SWIFT_VERSION = 2.3; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -367,6 +370,7 @@ GCC_NO_COMMON_BLOCKS = YES; MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; + SWIFT_VERSION = 2.3; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -434,6 +438,7 @@ GCC_NO_COMMON_BLOCKS = YES; MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; + SWIFT_VERSION = 2.3; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -474,6 +479,7 @@ GCC_NO_COMMON_BLOCKS = YES; MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; + SWIFT_VERSION = 2.3; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; };