aboutsummaryrefslogtreecommitdiff
path: root/objectivec/DevTools
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2017-01-04 15:03:42 -0500
committerThomas Van Lenten <thomasvl@google.com>2017-01-05 09:15:40 -0500
commit988ffe0a78ebda0410e61ce31a3bd689c774f59e (patch)
treef5e92cdc634e4eef2ef2b891de95ad23bec3fba4 /objectivec/DevTools
parent4cb113a91b180559f0eedbca0244ef1181a7204c (diff)
downloadprotobuf-988ffe0a78ebda0410e61ce31a3bd689c774f59e.tar.gz
protobuf-988ffe0a78ebda0410e61ce31a3bd689c774f59e.tar.bz2
protobuf-988ffe0a78ebda0410e61ce31a3bd689c774f59e.zip
Minor fix for autocreated object repeated fields and maps.
- If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list.
Diffstat (limited to 'objectivec/DevTools')
-rwxr-xr-xobjectivec/DevTools/full_mac_build.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh
index ef8fb740..ea9fd273 100755
--- a/objectivec/DevTools/full_mac_build.sh
+++ b/objectivec/DevTools/full_mac_build.sh
@@ -265,6 +265,14 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-destination "platform=iOS Simulator,name=iPad Pro (9.7 inch),OS=10.1" # 64bit
)
;;
+ 8.2* )
+ XCODEBUILD_TEST_BASE_IOS+=(
+ -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
+ -destination "platform=iOS Simulator,name=iPhone 7,OS=10.2" # 64bit
+ -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit
+ -destination "platform=iOS Simulator,name=iPad Pro (9.7 inch),OS=10.2" # 64bit
+ )
+ ;;
* )
echo "Time to update the simulator targets for Xcode ${XCODE_VERSION}"
exit 2