Merge pull request #224 from ParsePlatform/nlutsenko.xcode7

Use Xcode 7 only for Travis-CI.

Author: nlutsenko

.travis.yml

@@ -3,54 +3,24 @@ branches:
     - master
 language: objective-c
 os: osx
-matrix:
-  include:
-    - osx_image: xcode6.4
-      env: 
-        - TEST_TYPE=ios
-        - SDK_VERSION=8.4
-    - osx_image: xcode6.4
-      env: 
-        - TEST_TYPE=osx
-        - SDK_VERSION=10.10
-    - osx_image: xcode6.4
-      env: TEST_TYPE=deployment
-    - osx_image: xcode6.4
-      env: TEST_TYPE=starters
-    - osx_image: xcode6.4
-      env: TEST_TYPE=podspecs
-    - osx_image: xcode7
-      env: 
-        - TEST_TYPE=ios
-        - SDK_VERSION=9.0
-    - osx_image: xcode7
-      env: 
-        - TEST_TYPE=osx
-        - SDK_VERSION=10.11
-    - osx_image: xcode7
-      env: TEST_TYPE=deployment
-    - osx_image: xcode7
-      env: TEST_TYPE=starters
-    - osx_image: xcode7
-      env: TEST_TYPE=podspecs
+osx_image: xcode7
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
+  matrix:
+    - TEST_TYPE=ios
+    - TEST_TYPE=osx
+    - TEST_TYPE=deployment
+    - TEST_TYPE=starters
+    - TEST_TYPE=podspecs
 install:
 - |
   if [ -n "$TEST_TYPE" ]; then
     bundle install
   fi
 script:
-- |
-  if [ -n "$TEST_TYPE" ]; then
-    if [ -n "$SDK_VERSION" ]; then
-      bundle exec rake test:$TEST_TYPE[$SDK_VERSION]
-    else
-      bundle exec rake test:$TEST_TYPE
-    fi
-  fi
+- bundle exec rake test:$TEST_TYPE
 after_success:
 - | 
   if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then

Rakefile

@@ -200,16 +200,15 @@ end
 
 namespace :test do
   desc 'Run iOS Tests'
-  task :ios, :sdk_version do |_, args|
-    sdk_version = args[:sdk_version] || '8.4'
+  task :ios do |_, args|
     task = XCTask::BuildTask.new do |t|
       t.directory = script_folder
       t.workspace = 'Parse.xcworkspace'
 
       t.scheme = 'Parse-iOS'
-      t.sdk = "iphonesimulator#{sdk_version}"
-      t.destinations = ["\"platform=iOS Simulator,OS=#{sdk_version},name=iPhone 4s\"",
-                        "\"platform=iOS Simulator,OS=#{sdk_version},name=iPhone 6 Plus\"",]
+      t.sdk = 'iphonesimulator'
+      t.destinations = ["\"platform=iOS Simulator,OS=9.0,name=iPhone 4s\"",
+                        "\"platform=iOS Simulator,OS=9.0,name=iPhone 6 Plus\"",]
       t.configuration = 'Test'
 
       t.actions = [XCTask::BuildAction::TEST]
@@ -224,14 +223,13 @@ namespace :test do
   end
 
   desc 'Run OS X Tests'
-  task :osx, :sdk_version do |_, args|
-    sdk_version = args[:sdk_version] || '10.10'
+  task :osx do |_, args|
     task = XCTask::BuildTask.new do |t|
       t.directory = script_folder
       t.workspace = 'Parse.xcworkspace'
 
       t.scheme = 'Parse-OSX'
-      t.sdk = "macosx#{sdk_version}"
+      t.sdk = 'macosx'
       t.destinations = ['arch=x86_64']
       t.configuration = 'Test'