From 470518a10f51f17bd45eb6eb418a9c6938fc4bf6 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 23 Oct 2015 13:24:48 -0700 Subject: [PATCH 1/2] Recursively initialize submodules when running on Travis-CI. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 92b525889..48ab7243d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ env: - TEST_TYPE=deployment - TEST_TYPE=starters - TEST_TYPE=podspecs +git: + submodules: false +before_install: + - git submodule update --init --recursive install: - | if [ -n "$TEST_TYPE" ]; then From 00f89e40d6e09ef98d559549261fa37f040d225f Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Thu, 22 Oct 2015 19:41:50 -0700 Subject: [PATCH 2/2] Update Bolts to 1.4.0. --- Parse.podspec | 2 +- Vendor/Bolts-ObjC | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Parse.podspec b/Parse.podspec index af3c14a3c..40e8c7e3d 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -47,5 +47,5 @@ Pod::Spec.new do |s| s.libraries = 'z', 'sqlite3' - s.dependency 'Bolts/Tasks', '>= 1.3.0' + s.dependency 'Bolts/Tasks', '>= 1.4.0' end diff --git a/Vendor/Bolts-ObjC b/Vendor/Bolts-ObjC index 0456a8e53..b7f141f8e 160000 --- a/Vendor/Bolts-ObjC +++ b/Vendor/Bolts-ObjC @@ -1 +1 @@ -Subproject commit 0456a8e53b3b74b60eb325c9124026c37fb24daf +Subproject commit b7f141f8ef2419cfd15703f318977dcac6804135