From 7fa3f45bf2ebdbe561266ee30bd1eb25c7589221 Mon Sep 17 00:00:00 2001 From: Blake Watters Date: Sun, 14 Jul 2013 13:40:20 -0400 Subject: [PATCH] Switch Travis build script to leverage xctool 0.1.7, which supports implicit dependencies. Simplify xctool invocation --- .travis.yml | 2 +- Rakefile | 4 ++-- Tests/Schemes/OS X Tests.xcscheme | 2 +- Tests/Schemes/iOS Tests.xcscheme | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1c137b..d0250d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c before_install: - brew update - - brew install xctool --HEAD + - brew uninstall xctool && brew install https://raw.github.com/fpotter/homebrew/246a1439dab49542d4531ad7e1bac7048151f601/Library/Formula/xctool.rb - gem install cocoapods -v 0.22.2 - cd Tests && pod install && cd $TRAVIS_BUILD_DIR script: rake test diff --git a/Rakefile b/Rakefile index d929896..f0489d2 100644 --- a/Rakefile +++ b/Rakefile @@ -5,12 +5,12 @@ namespace :test do desc "Run the AFNetworking Tests for iOS" task :ios => :prepare do - $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release build build-tests run-tests -test-sdk iphonesimulator") + $ios_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'iOS Tests' -sdk iphonesimulator -configuration Release test -test-sdk iphonesimulator") end desc "Run the AFNetworking Tests for Mac OS X" task :osx => :prepare do - $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release build build-tests run-tests -test-sdk macosx") + $osx_success = system("xctool -workspace AFNetworking.xcworkspace -scheme 'OS X Tests' -sdk macosx -configuration Release test -test-sdk macosx") end end diff --git a/Tests/Schemes/OS X Tests.xcscheme b/Tests/Schemes/OS X Tests.xcscheme index dcb2079..57a00f4 100644 --- a/Tests/Schemes/OS X Tests.xcscheme +++ b/Tests/Schemes/OS X Tests.xcscheme @@ -4,7 +4,7 @@ version = "1.3"> + buildImplicitDependencies = "YES"> + buildImplicitDependencies = "YES">