diff --git a/.slather.yml b/.slather.yml index 1584fdff4..8c2b69fb0 100644 --- a/.slather.yml +++ b/.slather.yml @@ -1,4 +1,8 @@ service: travis_ci coverage_service: coveralls xcodeproj: Bolts.xcodeproj -source_directory: Bolts +build_directory: build +ignore: + - BoltsTestUI/* + - BoltsTests/* + \ 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; diff --git a/Readme.md b/Readme.md index a781ed340..b9d7690ad 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,7 @@ Bolts ============ [![Build Status](http://img.shields.io/travis/BoltsFramework/Bolts-iOS/master.svg?style=flat)](https://travis-ci.org/BoltsFramework/Bolts-iOS) -[![Coverage Status](https://coveralls.io/repos/boltsframework/bolts-ios/badge.svg)](https://coveralls.io/r/BoltsFramework/Bolts-iOS) +[![Coverage Status](https://coveralls.io/repos/BoltsFramework/Bolts-iOS/badge.svg)](https://coveralls.io/r/BoltsFramework/Bolts-iOS) [![Pod Version](http://img.shields.io/cocoapods/v/Bolts.svg?style=flat)](http://cocoadocs.org/docsets/Bolts/) [![Pod Platform](http://img.shields.io/cocoapods/p/Bolts.svg?style=flat)](http://cocoadocs.org/docsets/Bolts/) [![Pod License](http://img.shields.io/cocoapods/l/Bolts.svg?style=flat)](https://github.com/BoltsFramework/Bolts-iOS/blob/master/LICENSE)