Merge pull request #39 from ReactiveCocoa/update-quick-and-nimble

Update Quick and Nimble
ReactiveCocoa · Oct 6, 2017 · c5f9822 · c5f9822
2 parents 0531db2 + 74d2dc4
commit c5f9822
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,10 @@
 language: objective-c
-osx_image: xcode8.3
+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: ReactiveObjCBridge.xcworkspace

diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "3d9d996"
-github "Quick/Quick" ~> 1.1
-github "Quick/Nimble" ~> 7.0.1
+github "Quick/Quick" ~> 1.2
+github "Quick/Nimble" ~> 7.0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v7.0.1"
-github "Quick/Quick" "v1.1.0"
+github "Quick/Nimble" "v7.0.2"
+github "Quick/Quick" "v1.2.0"
 github "ReactiveCocoa/ReactiveObjC" "3.0.0"
 github "ReactiveCocoa/ReactiveSwift" "2.0.1"
 github "antitypical/Result" "3.2.3"

diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick