Commit 692baf0a authored by Lindsay Pasricha's avatar Lindsay Pasricha Committed by Commit Bot

Roll to xcode10 beta 3

ios12-beta-simulator
ios12-sdk-device
ios12-sdk-simulator

Bug: 895976
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I48d0050afbe589bf5b2a9d02a4987f7bc244eb15
Reviewed-on: https://chromium-review.googlesource.com/c/1284732Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600403}
parent 780b38ee
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6 Plus", "device type": "iPhone 6 Plus",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPad Pro", "device type": "iPad Pro",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 6 Plus", "device type": "iPhone 6 Plus",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air", "device type": "iPad Air",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Build is performed with gn+ninja.", "Build is performed with gn+ninja.",
"If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too." "If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
], ],
"xcode build version": "10o35n", "xcode build version": "10o45e",
"gn_args": [ "gn_args": [
"additional_target_cpus=[ \"arm64\" ]", "additional_target_cpus=[ \"arm64\" ]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.", "on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
"Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'." "Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
], ],
"xcode build version": "10o35n", "xcode build version": "10o45e",
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "10.3", "os": "10.3",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.1", "os": "12.1",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
"xcode build version": "10o35n", "xcode build version": "10o45e",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment