Fix simulator build

Author: Matthew Benedict

.gitignore

@@ -2,6 +2,7 @@
 *.pbxuser
 *.perspective*
 *.pyc
+*.resolved
 .DS_Store
 .directory
 /CyberKitBuild/

CyberKitLibraries/CyberKitPrivateFrameworkStubs/iOS/13/InstallCoordination.framework/InstallCoordination.tbd

@@ -0,0 +1,8 @@
+--- !tapi-tbd-v3
+archs:           [ x86_64, arm64, arm64e ]
+install-name:    '/System/Library/PrivateFrameworks/InstallCoordination.framework/InstallCoordination'
+platform: ios
+exports:
+  - archs:           [ x86_64, arm64, arm64e ]
+    objc-classes:    [ IXAppInstallCoordinator, IXOpaqueDataPromise, IXOwnedDataPromise, IXPlaceholder, IXPlaceholderAttributes, IXPromisedInMemoryDictionary, IXPromisedOutOfBandTransfer, IXRestoringDemotedAppInstallCoordinator ]
+...

CyberKitLibraries/CyberKitPrivateFrameworkStubs/iOS/14/FrontBoardServices.framework/FrontBoardServices.tbd

@@ -0,0 +1,9 @@
+--- !tapi-tbd-v3
+archs:           [ x86_64, arm64, arm64e ]
+install-name:    '/System/Library/PrivateFrameworks/FrontBoardServices.framework/FrontBoardServices'
+objc-constraint: none
+platform: ios
+exports:
+  - archs:           [ x86_64, arm64, arm64e ]
+    symbols:         [ _FBSActivateForEventOptionTypeBackgroundContentFetching, _FBSOpenApplicationOptionKeyActivateForEvent, _FBSOpenApplicationOptionKeyPayloadOptions, _FBSOpenApplicationOptionKeyPayloadURL ]
+...

CyberKitLibraries/CyberKitPrivateFrameworkStubs/iOS/14/InstallCoordination.framework/InstallCoordination.tbd

@@ -0,0 +1,8 @@
+--- !tapi-tbd-v3
+archs:           [ x86_64, arm64, arm64e ]
+install-name:    '/System/Library/PrivateFrameworks/InstallCoordination.framework/InstallCoordination'
+platform: ios
+exports:
+  - archs:           [ x86_64, arm64, arm64e ]
+    objc-classes:    [ IXAppInstallCoordinator, IXOpaqueDataPromise, IXOwnedDataPromise, IXPlaceholder, IXPlaceholderAttributes, IXPromisedInMemoryDictionary, IXPromisedOutOfBandTransfer, IXRestoringDemotedAppInstallCoordinator ]
+...

CyberKitLibraries/CyberKitPrivateFrameworkStubs/iOS/15/FrontBoardServices.framework/FrontBoardServices.tbd

@@ -0,0 +1,9 @@
+--- !tapi-tbd-v3
+archs:           [ x86_64, arm64, arm64e ]
+install-name:    '/System/Library/PrivateFrameworks/FrontBoardServices.framework/FrontBoardServices'
+objc-constraint: none
+platform: ios
+exports:
+  - archs:           [ x86_64, arm64, arm64e ]
+    symbols:         [ _FBSActivateForEventOptionTypeBackgroundContentFetching, _FBSOpenApplicationOptionKeyActivateForEvent, _FBSOpenApplicationOptionKeyPayloadOptions, _FBSOpenApplicationOptionKeyPayloadURL ]
+...

Tools/Scripts/webkitdirs.pm

@@ -3045,13 +3045,14 @@ sub iosSimulatorRuntime()
 {
     my $xcodeSDKVersion = xcodeSDKVersion();
     $xcodeSDKVersion =~ s/\./-/;
-    my $runtime = "com.apple.CoreSimulator.SimRuntime.iOS-$xcodeSDKVersion";
-
+    my $runtime = "com.apple.CoreSimulator.SimRuntime.iOS-14-0";
+=for comment
     open(TEST, "-|", "xcrun --sdk iphonesimulator simctl list 2>&1") or die "Failed to run find simulator runtime";
     while ( my $line = <TEST> ) {
         $runtime = $1 if ($line =~ m/.+ - (com.apple.CoreSimulator.SimRuntime.iOS-\S+)/);
     }
     close(TEST);
+=cut
     return $runtime;
 }
 
@@ -3062,11 +3063,11 @@ sub findOrCreateSimulatorForIOSDevice($)
     my $simulatorDeviceType;
 
     if ($simulatorIdiom eq "iPad") {
-        $simulatorName = "iPad Pro " . $simulatorNameSuffix;
-        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPad-Pro--9-7-inch-";
+        $simulatorName = "iPad Air 2 " . $simulatorNameSuffix;
+        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPad-Air-2";
     } else {
-        $simulatorName = "iPhone 12 " . $simulatorNameSuffix;
-        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPhone-12";
+        $simulatorName = "iPhone 7 " . $simulatorNameSuffix;
+        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPhone-7";
     }
 
     my $simulatedDevice = iosSimulatorDeviceByName($simulatorName);

Tools/Scripts/webkitpy/port/ios_simulator.py

@@ -44,8 +44,9 @@ class IOSSimulatorPort(IOSPort):
     DEVICE_MANAGER = SimulatedDeviceManager
 
     DEFAULT_DEVICE_TYPES = [
+        DeviceType(hardware_family='iPhone', hardware_type='12'),
+        DeviceType(hardware_family='iPad', hardware_type='(9th generation)'),
         DeviceType(hardware_family='iPhone', hardware_type='7'),
-        DeviceType(hardware_family='iPad', hardware_type='Air 2'),
     ]
     SDK = apple_additions().get_sdk('iphonesimulator') if apple_additions() else 'iphonesimulator'
 
@@ -112,6 +113,7 @@ class IPhoneSimulatorPort(IOSSimulatorPort):
 
     DEVICE_TYPE = DeviceType(hardware_family='iPhone')
     DEFAULT_DEVICE_TYPES = [
+        DeviceType(hardware_family='iPhone', hardware_type='12'),
         DeviceType(hardware_family='iPhone', hardware_type='7'),
     ]
 
@@ -124,7 +126,7 @@ class IPadSimulatorPort(IOSSimulatorPort):
     port_name = 'ipad-simulator'
 
     DEVICE_TYPE = DeviceType(hardware_family='iPad')
-    DEFAULT_DEVICE_TYPES = [DeviceType(hardware_family='iPad', hardware_type='Air 2')]
+    DEFAULT_DEVICE_TYPES = [DeviceType(hardware_family='iPad', hardware_type='(9th generation)')]
 
     def __init__(self, *args, **kwargs):
         super(IPadSimulatorPort, self).__init__(*args, **kwargs)