Switch Travis build script to leverage xctool 0.1.7, which supports i…

…mplicit dependencies. Simplify xctool invocation
azureatom · Jul 14, 2013 · 7fa3f45 · 7fa3f45
1 parent ab3c2ef
commit 7fa3f45
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

diff --git a/Tests/Schemes/iOS Tests.xcscheme b/Tests/Schemes/iOS Tests.xcscheme
@@ -4,7 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"