From 8071938f16af0034be2500c08f54f017fa782db4 Mon Sep 17 00:00:00 2001
From: Nikita Lutsenko <nlutsenko@fb.com>
Date: Fri, 22 May 2015 11:50:04 -0700
Subject: [PATCH] Update travis, slather configuration to try include all the
 relevant information.

---
 .slather.yml                    |  2 +-
 .travis.yml                     | 14 +++++++++-----
 Bolts.xcodeproj/project.pbxproj |  4 ----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.slather.yml b/.slather.yml
index 1584fdff4..52f92f112 100644
--- a/.slather.yml
+++ b/.slather.yml
@@ -1,4 +1,4 @@
 service: travis_ci
 coverage_service: coveralls
 xcodeproj: Bolts.xcodeproj
-source_directory: Bolts
+build_directory: build
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 88e680c8c..84c7de386 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,19 @@
 language: objective-c
+osx_image: beta-xcode6.3
+cache: 
+  - bundler
+  - cocoapods
 before_install:
-  - gem install xcpretty -N
-  - gem install cocoapods --pre --quiet
-  - gem install slather
+  - gem install xcpretty -N --no-ri --no-rdoc
+  - gem install cocoapods --pre --quiet --no-ri --no-rdoc
+  - gem install slather --no-ri --no-rdoc
   - pod setup --silent
   - pod repo update --silent
 script:
   - pod lib lint Bolts.podspec
   - pod lib lint --use-libraries Bolts.podspec
   - set -o pipefail
-  - xcodebuild -project Bolts.xcodeproj -sdk iphonesimulator -scheme Bolts test | xcpretty -c
-  - xcodebuild -project Bolts.xcodeproj -sdk macosx -scheme MacBolts test | xcpretty -c
+  - xcodebuild test -project Bolts.xcodeproj -sdk macosx -scheme MacBolts -configuration Debug OBJROOT="$PWD/build" SYMROOT="$PWD/build" ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
+  - xcodebuild test -project Bolts.xcodeproj -sdk iphonesimulator -scheme Bolts -configuration Debug OBJROOT="$PWD/build" SYMROOT="$PWD/build" ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
 after_success:
   - slather
diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
index 47e487fef..9a3b2ad03 100644
--- a/Bolts.xcodeproj/project.pbxproj
+++ b/Bolts.xcodeproj/project.pbxproj
@@ -891,8 +891,6 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -931,8 +929,6 @@
 				CODE_SIGNING_REQUIRED = NO;
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_GENERATE_TEST_COVERAGE_FILES = NO;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;