@@ -483,17 +483,6 @@ class IOSDevice extends Device {
483483 throwToolExit ('Cannot start app on wirelessly tethered iOS device. Try running again with the --publish-port flag' );
484484 }
485485
486- // TODO(vashworth): Remove after Xcode 15 and iOS 17 are in CI (https://github.com/flutter/flutter/issues/132128)
487- // XcodeDebug workflow is used for CoreDevices (iOS 17+ and Xcode 15+).
488- // Force the use of XcodeDebug workflow in CI to test from older versions
489- // since devicelab has not yet been updated to iOS 17 and Xcode 15.
490- bool forceXcodeDebugWorkflow = false ;
491- if (debuggingOptions.usingCISystem &&
492- debuggingOptions.debuggingEnabled &&
493- _platform.environment['FORCE_XCODE_DEBUG' ]? .toLowerCase () == 'true' ) {
494- forceXcodeDebugWorkflow = true ;
495- }
496-
497486 if (! prebuiltApplication) {
498487 _logger.printTrace ('Building ${package .name } for $id ' );
499488
@@ -551,7 +540,7 @@ class IOSDevice extends Device {
551540 );
552541 }
553542
554- if (isCoreDevice || forceXcodeDebugWorkflow ) {
543+ if (isCoreDevice) {
555544 installationResult = await _startAppOnCoreDevice (
556545 debuggingOptions: debuggingOptions,
557546 package: package,
@@ -585,7 +574,7 @@ class IOSDevice extends Device {
585574 _logger.printTrace ('Application launched on the device. Waiting for Dart VM Service url.' );
586575
587576 final int defaultTimeout;
588- if (( isCoreDevice || forceXcodeDebugWorkflow) && debuggingOptions.debuggingEnabled) {
577+ if (isCoreDevice && debuggingOptions.debuggingEnabled) {
589578 // Core devices with debugging enabled takes longer because this
590579 // includes time to install and launch the app on the device.
591580 defaultTimeout = isWirelesslyConnected ? 75 : 60 ;
@@ -620,7 +609,7 @@ class IOSDevice extends Device {
620609 });
621610
622611 Uri ? localUri;
623- if (isCoreDevice || forceXcodeDebugWorkflow ) {
612+ if (isCoreDevice) {
624613 localUri = await _discoverDartVMForCoreDevice (
625614 debuggingOptions: debuggingOptions,
626615 packageId: packageId,
@@ -706,7 +695,7 @@ class IOSDevice extends Device {
706695 } finally {
707696 startAppStatus.stop ();
708697
709- if (( isCoreDevice || forceXcodeDebugWorkflow) && debuggingOptions.debuggingEnabled && package is BuildableIOSApp ) {
698+ if (isCoreDevice && debuggingOptions.debuggingEnabled && package is BuildableIOSApp ) {
710699 // When debugging via Xcode, after the app launches, reset the Generated
711700 // settings to not include the custom configuration build directory.
712701 // This is to prevent confusion if the project is later ran via Xcode
@@ -1138,15 +1127,13 @@ class IOSDeviceLogReader extends DeviceLogReader {
11381127 this ._isWirelesslyConnected,
11391128 this ._isCoreDevice,
11401129 String appName,
1141- bool usingCISystem, {
1142- bool forceXcodeDebug = false ,
1143- }) : // Match for lines for the runner in syslog.
1130+ bool usingCISystem,
1131+ ) : // Match for lines for the runner in syslog.
11441132 //
11451133 // iOS 9 format: Runner[297] <Notice>:
11461134 // iOS 10 format: Runner(Flutter)[297] <Notice>:
11471135 _runnerLineRegex = RegExp (appName + r'(\(Flutter\))?\[[\d]+\] <[A-Za-z]+>: ' ),
1148- _usingCISystem = usingCISystem,
1149- _forceXcodeDebug = forceXcodeDebug;
1136+ _usingCISystem = usingCISystem;
11501137
11511138 /// Create a new [IOSDeviceLogReader] .
11521139factory IOSDeviceLogReader .create ({
@@ -1165,7 +1152,6 @@ class IOSDeviceLogReader extends DeviceLogReader {
11651152 device.isCoreDevice,
11661153 appName,
11671154 usingCISystem,
1168- forceXcodeDebug: device._platform.environment['FORCE_XCODE_DEBUG' ]? .toLowerCase () == 'true' ,
11691155 );
11701156 }
11711157
@@ -1192,10 +1178,6 @@ class IOSDeviceLogReader extends DeviceLogReader {
11921178 final IMobileDevice _iMobileDevice;
11931179 final bool _usingCISystem;
11941180
1195- // TODO(vashworth): Remove after Xcode 15 and iOS 17 are in CI (https://github.com/flutter/flutter/issues/132128)
1196- /// Whether XcodeDebug workflow is being forced.
1197- final bool _forceXcodeDebug;
1198-
11991181 // Matches a syslog line from the runner.
12001182 RegExp _runnerLineRegex;
12011183
@@ -1309,7 +1291,7 @@ class IOSDeviceLogReader extends DeviceLogReader {
13091291 // However, `idevicesyslog` is sometimes unreliable so use Dart VM as a fallback.
13101292 // Also, `idevicesyslog` does not work with iOS 17 wireless devices, so use the
13111293 // Dart VM for wireless devices.
1312- if (_isCoreDevice || _forceXcodeDebug ) {
1294+ if (_isCoreDevice) {
13131295 if (_isWirelesslyConnected) {
13141296 return _IOSDeviceLogSources (
13151297 primarySource: IOSDeviceLogSource .unifiedLogging,
0 commit comments