From 84fe09513e1bcc4251823a509b47bbdc628d37e0 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 11 Dec 2015 11:40:03 -0800 Subject: [PATCH 1/2] Specify destination when building starter projects. --- Rakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 95db5ae33..3e6700516 100644 --- a/Rakefile +++ b/Rakefile @@ -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 @@ -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 From 89bacb0fe9ad1ab065f74414f8e0214b086a293c Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 11 Dec 2015 11:01:59 -0800 Subject: [PATCH 2/2] Use Xcode 7.2 for Travis-CI. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48ab7243d..3f12cb553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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