Merge branch 'master' into conflict_marked_file

Author: tiennou

.travis.yml

@@ -1,18 +1,30 @@
-osx_image: xcode8
+#
+# .travis.yml
+# Objective-Git
+#
+# https://docs.travis-ci.com/user/reference/osx/
+# https://docs.travis-ci.com/user/build-stages/matrix-expansion/
+#
+---
+os: osx
+osx_image: xcode9.3
 language: objective-c
+
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode8
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode8
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit iOS"
+
 before_install:
   - gem install xcpretty
   - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
+
 notifications:
   email: false

Cartfile.private

@@ -1,4 +1,4 @@
-github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.2
-github "Quick/Nimble" ~> 4.0
-github "ZipArchive/ZipArchive" ~> 1.1
+github "jspahrsummers/xcconfigs" "master"
+github "Quick/Quick" ~> 1.2.0
+github "Quick/Nimble" ~> 7.1.0
+github "ZipArchive/ZipArchive" ~> 2.1.2

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v4.1.0"
-github "Quick/Quick" "v0.9.3"
-github "ZipArchive/ZipArchive" "v1.6.2"
-github "jspahrsummers/xcconfigs" "0.9"
+github "Quick/Nimble" "v7.1.0"
+github "Quick/Quick" "v1.2.0"
+github "ZipArchive/ZipArchive" "v2.1.2"
+github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"

Carthage/Checkouts/Nimble

@@ -88,7 +88,7 @@
     _Pragma("clang diagnostic pop")
 
 /*** implementation details follow ***/
-typedef void (^gt_ext_cleanupBlock_t)();
+typedef void (^gt_ext_cleanupBlock_t)(void);
 
 void gt_ext_executeCleanupBlock (__strong gt_ext_cleanupBlock_t *block);