Merge pull request #3467 from thomasvl/bump_xcode_version

Xcode 8.3.x cleanups and use on travis
pull/3480/head
Thomas Van Lenten 7 years ago committed by GitHub
commit 80e984e007
  1. 2
      .travis.yml
  2. 4
      objectivec/DevTools/full_mac_build.sh

@ -8,7 +8,7 @@ language: cpp
os: os:
- osx - osx
# The Objective C build needs Xcode 7.0 or later. # The Objective C build needs Xcode 7.0 or later.
osx_image: xcode8.1 osx_image: xcode8.3
script: script:
- ./tests.sh $CONFIG - ./tests.sh $CONFIG
env: env:

@ -276,9 +276,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
8.3* ) 8.3* )
XCODEBUILD_TEST_BASE_IOS+=( XCODEBUILD_TEST_BASE_IOS+=(
-destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
-destination "platform=iOS Simulator,name=iPhone 7,OS=10.3" # 64bit -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
-destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit
-destination "platform=iOS Simulator,name=iPad Pro (9.7 inch),OS=10.3" # 64bit
) )
;; ;;
* ) * )

Loading…
Cancel
Save