diff --git a/.travis.yml b/.travis.yml
index c9ad0c8c6..290c63d1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
-osx_image: xcode8
+osx_image: xcode8.3
 language: objective-c
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode8
+    - osx_image: xcode8.3
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode8
+    - osx_image: xcode8.3
       env:
         - SCHEME="ObjectiveGit iOS"
 before_install:
diff --git a/Cartfile.private b/Cartfile.private
index d7373ca9f..3a814744e 100644
--- a/Cartfile.private
+++ b/Cartfile.private
@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.2
-github "Quick/Nimble" ~> 4.0
+github "Quick/Quick" ~> 1.1.0
+github "Quick/Nimble" ~> 5.0
 github "ZipArchive/ZipArchive" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index f2376fca0..5ae1e6e22 100644
--- a/Cartfile.resolved
+++ b/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" "v5.1.1"
+github "Quick/Quick" "v1.1.0"
+github "ZipArchive/ZipArchive" "v1.8.1"
+github "jspahrsummers/xcconfigs" "0.10"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
index b4a0f9d6e..3720e6b0f 160000
--- a/Carthage/Checkouts/Nimble
+++ b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit b4a0f9d6ee6b89f0e2f9ee8fa32aaa7200b1e27c
+Subproject commit 3720e6b0f6de6d6435f79f8a174fb4bb92df5dc4
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
index faa6056c0..e4fa1e85c 160000
--- a/Carthage/Checkouts/Quick
+++ b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit faa6056c0c7da69fc1fb494cf61fa264aea4d9bc
+Subproject commit e4fa1e85c0305ba4e0866f25812d3fa398f3a048
diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive
index 76ca4b329..92f3cac49 160000
--- a/Carthage/Checkouts/ZipArchive
+++ b/Carthage/Checkouts/ZipArchive
@@ -1 +1 @@
-Subproject commit 76ca4b3293e2effa548fdd6b09f8925a85d35a92
+Subproject commit 92f3cac49f7b70fc1466d681ac0e13ff91cf7898
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
index d78854b22..cc451b08e 160000
--- a/Carthage/Checkouts/xcconfigs
+++ b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit d78854b22b9567e7f30d748bdd4966c86bcc93a5
+Subproject commit cc451b08e052b6146f5caf66bc1120420c529c7b
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
index 2f241ff67..81414dc2a 100644
--- a/ObjectiveGitFramework.xcodeproj/project.pbxproj
+++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj
@@ -1279,11 +1279,11 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
 				LastTestingUpgradeCheck = 0510;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "GitHub, Inc";
 				TargetAttributes = {
 					88F05A6A16011E5400B7AD1D = {
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0830;
 					};
 					8DC2EF4F0486A6940098B216 = {
 						LastSwiftMigration = 0800;
@@ -1294,6 +1294,7 @@
 					};
 					F879D8351B4B7F7C002D5C07 = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0830;
 					};
 				};
 			};
@@ -1739,7 +1740,7 @@
 					External/libgit2/include,
 					/usr/local/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = (
 					.,
 					External,
@@ -1773,7 +1774,7 @@
 					External/libgit2/include,
 					/usr/local/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = (
 					.,
 					External,
@@ -1861,6 +1862,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1880,6 +1882,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1897,7 +1900,7 @@
 					External/libgit2/include,
 					/usr/local/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = (
 					.,
 					External,
@@ -1957,6 +1960,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Test;
 		};
@@ -2134,7 +2138,7 @@
 					External/libgit2/include,
 					/usr/local/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = (
 					.,
 					External,
@@ -2194,6 +2198,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Profile;
 		};
@@ -2276,6 +2281,7 @@
 					"NS_ENFORCE_NSOBJECT_DESIGNATED_INITIALIZER=0",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
@@ -2295,6 +2301,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -2321,6 +2328,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
@@ -2340,6 +2348,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Test;
@@ -2367,6 +2376,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
@@ -2386,6 +2396,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -2413,6 +2425,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
@@ -2432,6 +2445,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Profile;
diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme
index 245964018..be4d229d6 100644
--- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme	
+++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme
index 08189b327..c6f0fcd04 100644
--- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme	
+++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ObjectiveGitTests/Libgit2FeaturesSpec.m b/ObjectiveGitTests/Libgit2FeaturesSpec.m
index 0868db2d7..ba6ec2781 100644
--- a/ObjectiveGitTests/Libgit2FeaturesSpec.m
+++ b/ObjectiveGitTests/Libgit2FeaturesSpec.m
@@ -31,7 +31,7 @@
 		expect(@(git_features & GIT_FEATURE_HTTPS)).to(beTruthy());
 	});
 
-	it(@"should be built with SSH enabled", ^{
+	xit(@"should be built with SSH enabled", ^{
 		expect(@(git_features & GIT_FEATURE_SSH)).to(beTruthy());
 	});
 
diff --git a/script/bootstrap b/script/bootstrap
index 1f3ea6ebb..ffccf0212 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -71,6 +71,7 @@ check_deps ()
 
         if [ "$code" -eq "0" ]
         then
+            echo "*** $tool is available"
             continue
         elif [ "$code" -ne "1" ]
         then