Skip to content

Commit

Permalink
Merge d88f174 into 721a881
Browse files Browse the repository at this point in the history
  • Loading branch information
nlutsenko committed May 22, 2015
2 parents 721a881 + d88f174 commit 8c12707
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ xcuserdata
*.xcuserdatad
*.xccheckout
*.swp
*.gcov
4 changes: 4 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
service: travis_ci
coverage_service: coveralls
xcodeproj: Bolts.xcodeproj
source_directory: Bolts
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
language: objective-c
before_install:
- brew update
- brew reinstall xctool
- gem install xcpretty -N
- gem install cocoapods --pre --quiet
- gem install slather
- pod setup --silent
- pod repo update --silent
script:
- pod lib lint Bolts.podspec
- pod lib lint --use-libraries Bolts.podspec
- xctool -project Bolts.xcodeproj -sdk iphonesimulator -scheme Bolts -configuration Debug test
- xctool -project Bolts.xcodeproj -sdk macosx -scheme MacBolts test
- 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
after_success:
- slather
4 changes: 4 additions & 0 deletions Bolts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,8 @@
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",
Expand Down Expand Up @@ -929,6 +931,8 @@
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;
Expand Down
1 change: 1 addition & 0 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +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)
[![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)
Expand Down

0 comments on commit 8c12707

Please sign in to comment.