diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2017-08-08 09:19:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 09:19:17 -0400 |
| commit | 80e984e0076ea029cf5431f15dfdf94c5b73b83f (patch) | |
| tree | 975e53d1cda1977203fba8547fa5114c311fd0fb | |
| parent | fae381693f029da1456f6e90f91fe995723163f3 (diff) | |
| parent | fe68821e027fd04e346b304d8940c6c35847b256 (diff) | |
| download | protobuf-80e984e0076ea029cf5431f15dfdf94c5b73b83f.tar.gz protobuf-80e984e0076ea029cf5431f15dfdf94c5b73b83f.tar.bz2 protobuf-80e984e0076ea029cf5431f15dfdf94c5b73b83f.zip | |
Merge pull request #3467 from thomasvl/bump_xcode_version
Xcode 8.3.x cleanups and use on travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d49e0a71..e7853ebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: cpp os: - osx # The Objective C build needs Xcode 7.0 or later. -osx_image: xcode8.1 +osx_image: xcode8.3 script: - ./tests.sh $CONFIG env: diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index c3cc8e68..9ac24bb3 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -276,9 +276,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then 8.3* ) XCODEBUILD_TEST_BASE_IOS+=( -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=iPad 2,OS=8.1" # 32bit - -destination "platform=iOS Simulator,name=iPad Pro (9.7 inch),OS=10.3" # 64bit + -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit ) ;; * ) |