Skip to content

Commit

Permalink
Merge pull request #648 from ParsePlatform/nlutsenko.xcode72
Browse files Browse the repository at this point in the history
Use Xcode 7.2 for Travis-CI.
  • Loading branch information
nlutsenko committed Dec 11, 2015
2 parents 7446f89 + 89bacb0 commit 9b084d8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branches:
- master
language: objective-c
os: osx
osx_image: xcode7.1
osx_image: xcode7.2
env:
global:
- LC_CTYPE=en_US.UTF-8
Expand All @@ -26,7 +26,7 @@ install:
script:
- bundle exec rake test:$TEST_TYPE
after_success:
- |
- |
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then
bash <(curl -s https://codecov.io/bash)
fi
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ namespace :test do
t.scheme = scheme
t.configuration = 'Debug'
t.sdk = 'iphonesimulator'
t.destinations = ['"platform=iOS Simulator,name=iPhone 6s"']

t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD]
t.formatter = XCTask::BuildFormatter::XCPRETTY
Expand Down Expand Up @@ -371,7 +372,7 @@ namespace :test do

t.scheme = scheme
t.configuration = 'Debug'
t.destinations = ["\"platform=iOS Simulator,OS=9.1,name=iPhone 6s\"",]
t.destinations = ["\"platform=iOS Simulator,name=iPhone 6s\"",]

t.actions = [XCTask::BuildAction::CLEAN, XCTask::BuildAction::BUILD]
t.formatter = XCTask::BuildFormatter::XCPRETTY
Expand Down

0 comments on commit 9b084d8

Please sign in to comment.