From 1324119a42b9c8cedd328b6adfa5ef00243651f6 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 16 Feb 2016 09:19:50 -0500
Subject: Bump up travis to Xcode 7.2

- Update simulator versions used.
- Mark the iOS tests as flaky while trying to dig out the root cause.
---
 travis.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'travis.sh')

diff --git a/travis.sh b/travis.sh
index 5a77a2a8..13a109a6 100755
--- a/travis.sh
+++ b/travis.sh
@@ -195,9 +195,9 @@ build_objectivec_ios() {
     build-tests
   IOS_DESTINATIONS=(
     "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
-    "platform=iOS Simulator,name=iPhone 6,OS=9.1" # 64bit
+    "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit
     "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit
-    "platform=iOS Simulator,name=iPad Air,OS=9.1" # 64bit
+    "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit
   )
   for i in "${IOS_DESTINATIONS[@]}" ; do
     internal_xctool_debug_and_release \
-- 
cgit v1.2.3