diff --git a/.travis.yml b/.travis.yml index 198918031..a15d29916 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,10 @@ language: objective-c -osx_image: xcode8.1 +osx_image: xcode9 before_install: true install: true -git: - submodules: false branches: only: - master -before_script: - - git submodule update --init --recursive script: - script/build xcode_workspace: ReactiveObjC.xcworkspace diff --git a/Cartfile.private b/Cartfile.private index 36e1c8b92..d3790f5a7 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "3d9d996" -github "Quick/Quick" ~> 0.10 -github "Quick/Nimble" ~> 5.0 +github "Quick/Quick" ~> 1.2 +github "Quick/Nimble" ~> 7.0.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1cc264dcc..e51e1869a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "Quick/Nimble" "v5.0.0" -github "Quick/Quick" "v0.10.0" +github "Quick/Nimble" "v7.0.2" +github "Quick/Quick" "v1.2.0" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 020941966..38c9ab084 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 0209419661b6acceff45cd63984596f2e9eea517 +Subproject commit 38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index b441ba9d4..0ff81f2c6 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit b441ba9d4abdc87fc153c55de947834b737bbe04 +Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f diff --git a/ReactiveObjCTests/NSObjectRACLiftingSpec.m b/ReactiveObjCTests/NSObjectRACLiftingSpec.m index d422ad42d..120d6b94a 100644 --- a/ReactiveObjCTests/NSObjectRACLiftingSpec.m +++ b/ReactiveObjCTests/NSObjectRACLiftingSpec.m @@ -366,7 +366,7 @@ }]; [subject sendNext:testBlock]; - expect(result).notTo(beNil()); + expect((id)result).notTo(beNil()); result(); expect(@(blockInvoked)).to(beTruthy());