diff --git a/bin/internal/ideviceinstaller.version b/bin/internal/ideviceinstaller.version deleted file mode 100644 index fdcaee8e021..00000000000 --- a/bin/internal/ideviceinstaller.version +++ /dev/null @@ -1 +0,0 @@ -73b9c81e02f83060aa44bece963a62827908de68 diff --git a/bin/internal/libimobiledevice.version b/bin/internal/libimobiledevice.version index 043a9e80d18..4714ffa1421 100644 --- a/bin/internal/libimobiledevice.version +++ b/bin/internal/libimobiledevice.version @@ -1 +1 @@ -6150fcd888a0ee8a69dd47328509ee608c2e02dc +569016da35ccea9d9b7c81954342fabb98149fb5 diff --git a/bin/internal/libplist.version b/bin/internal/libplist.version index 4a3c05c15bc..8619a4b85a6 100644 --- a/bin/internal/libplist.version +++ b/bin/internal/libplist.version @@ -1 +1 @@ -28812e5bed8621bd637b4129ab15a9c1abb9f57d +20a2f8dbddcf1a96ad4c720b9afd1d0876d17ffc diff --git a/bin/internal/openssl.version b/bin/internal/openssl.version index a69b8be5c57..6d2eb55065c 100644 --- a/bin/internal/openssl.version +++ b/bin/internal/openssl.version @@ -1 +1 @@ -2ef3f4c83bce209247479e707eebd5a84f606e28 +e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 diff --git a/bin/internal/usbmuxd.version b/bin/internal/usbmuxd.version index 6252dfc5ba3..7ab900a20c0 100644 --- a/bin/internal/usbmuxd.version +++ b/bin/internal/usbmuxd.version @@ -1 +1 @@ -eb45fd21469fa35e9bbc3b0a15a962460b8d23a2 +ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index c613c745dc4..e07445b2d96 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -513,7 +513,7 @@ class IOSDevice extends Device { @override Future takeScreenshot(File outputFile) async { - await _iMobileDevice.takeScreenshot(outputFile); + await _iMobileDevice.takeScreenshot(outputFile, id); } @override @@ -835,8 +835,8 @@ class IOSDevicePortForwarder extends DevicePortForwarder { process = await _processUtils.start( [ _iproxyPath, - hostPort.toString(), - devicePort.toString(), + '$hostPort:$devicePort', + '--udid', _id, ], environment: Map.fromEntries( diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index f2f088d188e..f8a5cbb9426 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -66,11 +66,13 @@ class IMobileDevice { } /// Captures a screenshot to the specified outputFile. - Future takeScreenshot(File outputFile) { + Future takeScreenshot(File outputFile, String deviceID) { return _processUtils.run( [ _idevicescreenshotPath, outputFile.path, + '--udid', + deviceID, ], throwOnError: true, environment: Map.fromEntries( diff --git a/packages/flutter_tools/test/general.shard/ios/ios_device_port_forwarder_test.dart b/packages/flutter_tools/test/general.shard/ios/ios_device_port_forwarder_test.dart index e7ae055e37f..28ebc35a96e 100644 --- a/packages/flutter_tools/test/general.shard/ios/ios_device_port_forwarder_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/ios_device_port_forwarder_test.dart @@ -22,14 +22,14 @@ void main() { const int devicePort = 456; final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand( - command: ['iproxy', '49154', '456', '1234'], + command: ['iproxy', '49154:456', '--udid', '1234'], // iproxy does not exit with 0 when it cannot forward. exitCode: 0, stdout: null, // no stdout indicates failure. environment: kDyLdLibEntry, ), const FakeCommand( - command: ['iproxy', '49155', '456', '1234'], + command: ['iproxy', '49155:456', '--udid', '1234'], exitCode: 0, stdout: 'not empty', environment: kDyLdLibEntry, diff --git a/packages/flutter_tools/test/general.shard/ios/mac_test.dart b/packages/flutter_tools/test/general.shard/ios/mac_test.dart index bba41fbfd13..b0db2bb3e05 100644 --- a/packages/flutter_tools/test/general.shard/ios/mac_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/mac_test.dart @@ -85,7 +85,7 @@ void main() { logger: logger, ); - expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile), throwsA(anything)); + expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile, '1234'), throwsA(anything)); }); testWithoutContext('idevicescreenshot captures and returns screenshot', () async { @@ -100,8 +100,8 @@ void main() { logger: logger, ); - await iMobileDevice.takeScreenshot(mockOutputFile); - verify(mockProcessManager.run([idevicescreenshotPath, outputPath], + await iMobileDevice.takeScreenshot(mockOutputFile, '1234'); + verify(mockProcessManager.run([idevicescreenshotPath, outputPath, '--udid', '1234'], environment: {'DYLD_LIBRARY_PATH': libimobiledevicePath}, workingDirectory: null, ));