[ios] Roll Xcode 10 from beta 3 to beta 4.

CIPD packages:
  infra_internal/ios/xcode/mac  10l213o
  infra_internal/ios/xcode/ios  10l213o

TBR: hinoka@chromium.org
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I66bf9c3544bee0d3d67634b17fdbcf49a92058ac
Reviewed-on: https://chromium-review.googlesource.com/1140836
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575904}

infra/config/global/cr-buildbucket.cfg

@@ -380,9 +380,9 @@ builder_mixins {
 builder_mixins {
   name: "xcode-10-caches"
   caches: {
-    # Cache for Xcode 10.0 beta 3 (build version 10L201y) needed for iOS builds.
-    name: "xcode_ios_10l201y"
-    path: "xcode_ios_10l201y.app"
+    # Cache for Xcode 10.0 beta 4 (build version 10l213o) needed for iOS builds.
+    name: "xcode_ios_10l213o"
+    path: "xcode_ios_10l213o.app"
   }
 }
 

ios/build/bots/chromium.fyi/ios12-beta-simulator.json

@@ -20,91 +20,91 @@
       "include": "common_tests.json",
       "device type": "iPhone X",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone X",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone 6 Plus",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone 5s",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPad Pro",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPhone X",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPhone 6 Plus",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPad Air",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPhone 5s",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPhone 6s Plus",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPhone X",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPhone 5s",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPad Air 2",
       "os": "12.0",
-      "xcode build version": "10L201y",
+      "xcode build version": "10l213o",
       "host os": "Mac-10.13.5"
     }
   ]

ios/build/bots/chromium.fyi/ios12-sdk-device.json

@@ -4,7 +4,7 @@
     "Build is performed with gn+ninja.",
     "If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
   ],
-  "xcode build version": "10L201y",
+  "xcode build version": "10l213o",
   "gn_args": [
     "additional_target_cpus=[ \"arm64\" ]",
     "goma_dir=\"$(goma_dir)\"",

ios/build/bots/chromium.fyi/ios12-sdk-simulator.json

 {
   "comments": [
-    "Runs tests on 64-bit iOS 10.3 and 11.2 and 12.0 tests",
+    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.0 tests",
     "on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
     "Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
   ],
-  "xcode build version": "10L201y",
+  "xcode build version": "10l213o",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "goma_dir=\"$(goma_dir)\"",
@@ -54,13 +54,13 @@
     {
       "include": "eg_tests.json",
       "device type": "iPhone 7",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPad Air 2",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -72,7 +72,7 @@
     {
       "include": "eg_tests.json",
       "device type": "iPhone X",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -84,7 +84,7 @@
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone X",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -108,7 +108,7 @@
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPad Air 2",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -120,7 +120,7 @@
     {
       "include": "common_tests.json",
       "device type": "iPhone 6s",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -132,7 +132,7 @@
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone 6s",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     }
   ]

ios/build/bots/chromium.fyi/ios12-sdk-xcode-clang.json

@@ -3,7 +3,7 @@
     "Tests for super-fat iOS 12.0.",
     "Build is performed with gn+ninja."
   ],
-  "xcode build version": "10L201y",
+  "xcode build version": "10l213o",
   "use xcode build version": true,
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",

ios/build/bots/chromium.mac/ios12-sdk-simulator.json

 {
   "comments": [
-    "Runs tests on 64-bit iOS 10.3 and 11.2 and 12.0 tests",
+    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.0 tests",
     "on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
     "Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
   ],
-  "xcode build version": "10L201y",
+  "xcode build version": "10l213o",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "goma_dir=\"$(goma_dir)\"",
@@ -21,42 +21,6 @@
   "configuration": "Debug",
   "sdk": "iphonesimulator12.0",
   "tests": [
-    {
-      "include": "common_tests.json",
-      "device type": "iPhone 6s",
-      "os": "11.2",
-      "host os": "Mac-10.13.5"
-    },
-    {
-      "include": "screen_size_dependent_tests.json",
-      "device type": "iPhone 6s Plus",
-      "os": "12.0",
-      "host os": "Mac-10.13.5"
-    },
-    {
-      "include": "screen_size_dependent_tests.json",
-      "device type": "iPhone 6s",
-      "os": "12.0",
-      "host os": "Mac-10.13.5"
-    },
-    {
-      "include": "screen_size_dependent_tests.json",
-      "device type": "iPad Air 2",
-      "os": "12.0",
-      "host os": "Mac-10.13.5"
-    },
-    {
-      "include": "screen_size_dependent_tests.json",
-      "device type": "iPad Air 2",
-      "os": "11.2",
-      "host os": "Mac-10.13.5"
-    },
-    {
-      "include": "screen_size_dependent_tests.json",
-      "device type": "iPad Air 2",
-      "os": "10.3",
-      "host os": "Mac-10.13.5"
-    },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone X",
@@ -90,13 +54,13 @@
     {
       "include": "eg_tests.json",
       "device type": "iPhone 7",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
       "include": "eg_tests.json",
       "device type": "iPad Air 2",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -108,7 +72,7 @@
     {
       "include": "eg_tests.json",
       "device type": "iPhone X",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -120,7 +84,43 @@
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone X",
-      "os": "11.2",
+      "os": "11.4",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPhone 6s Plus",
+      "os": "12.0",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPhone 6s",
+      "os": "12.0",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPad Air 2",
+      "os": "12.0",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPad Air 2",
+      "os": "11.4",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPad Air 2",
+      "os": "10.3",
+      "host os": "Mac-10.13.5"
+    },
+    {
+      "include": "common_tests.json",
+      "device type": "iPhone 6s",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     },
     {
@@ -132,7 +132,7 @@
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone 6s",
-      "os": "11.2",
+      "os": "11.4",
       "host os": "Mac-10.13.5"
     }
   ]