diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 13:54:05 -0700 |
| commit | 8d8177c75701014dfe27fec4cdd2b1647aefcb67 (patch) | |
| tree | fdc5d0d0f2fd57f2ca641069c20b34ddf90ec919 /objectivec/DevTools/full_mac_build.sh | |
| parent | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (diff) | |
| parent | cccf6fed7e2fad1240bb48ba0c47f3978ff7433d (diff) | |
| download | protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.tar.gz protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.tar.bz2 protobuf-8d8177c75701014dfe27fec4cdd2b1647aefcb67.zip | |
Merge remote-tracking branch 'origin/master' into fix-author
Diffstat (limited to 'objectivec/DevTools/full_mac_build.sh')
| -rwxr-xr-x | objectivec/DevTools/full_mac_build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 2192b760..c38fce7c 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -202,9 +202,9 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then # Don't need to worry about form factors or retina/non retina; # just pick a mix of OS Versions and 32/64 bit. -destination "platform=iOS Simulator,name=iPhone 4s,OS=7.1" # 32bit - -destination "platform=iOS Simulator,name=iPhone 6,OS=8.3" # 64bit + -destination "platform=iOS Simulator,name=iPhone 6,OS=8.4" # 64bit -destination "platform=iOS Simulator,name=iPad 2,OS=7.1" # 32bit - -destination "platform=iOS Simulator,name=iPad Air,OS=8.3" # 64bit + -destination "platform=iOS Simulator,name=iPad Air,OS=8.4" # 64bit ) header "Doing Xcode iOS build/tests - Debug" "${XCODEBUILD_TEST_BASE_IOS[@]}" -configuration Debug test |