From 09cca73aee6ed6bf41ef86a2cfdfe49931fd9c3f Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Mon, 29 Jun 2020 13:44:38 -0700 Subject: [PATCH] Revert "[flutter_tools] update libimobiledevice (#59512)" (#60551) This reverts commit 32000db52e29345edf3651d1d7c2f62f26a8e70f. --- bin/internal/ideviceinstaller.version | 1 + bin/internal/libimobiledevice.version | 2 +- bin/internal/libplist.version | 2 +- bin/internal/openssl.version | 2 +- bin/internal/usbmuxd.version | 2 +- packages/flutter_tools/lib/src/ios/devices.dart | 6 +++--- packages/flutter_tools/lib/src/ios/mac.dart | 4 +--- .../general.shard/ios/ios_device_port_forwarder_test.dart | 4 ++-- packages/flutter_tools/test/general.shard/ios/mac_test.dart | 6 +++--- 9 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 bin/internal/ideviceinstaller.version diff --git a/bin/internal/ideviceinstaller.version b/bin/internal/ideviceinstaller.version new file mode 100644 index 00000000000..fdcaee8e021 --- /dev/null +++ b/bin/internal/ideviceinstaller.version @@ -0,0 +1 @@ +73b9c81e02f83060aa44bece963a62827908de68 diff --git a/bin/internal/libimobiledevice.version b/bin/internal/libimobiledevice.version index 4714ffa1421..043a9e80d18 100644 --- a/bin/internal/libimobiledevice.version +++ b/bin/internal/libimobiledevice.version @@ -1 +1 @@ -569016da35ccea9d9b7c81954342fabb98149fb5 +6150fcd888a0ee8a69dd47328509ee608c2e02dc diff --git a/bin/internal/libplist.version b/bin/internal/libplist.version index 8619a4b85a6..4a3c05c15bc 100644 --- a/bin/internal/libplist.version +++ b/bin/internal/libplist.version @@ -1 +1 @@ -20a2f8dbddcf1a96ad4c720b9afd1d0876d17ffc +28812e5bed8621bd637b4129ab15a9c1abb9f57d diff --git a/bin/internal/openssl.version b/bin/internal/openssl.version index 6d2eb55065c..a69b8be5c57 100644 --- a/bin/internal/openssl.version +++ b/bin/internal/openssl.version @@ -1 +1 @@ -e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 +2ef3f4c83bce209247479e707eebd5a84f606e28 diff --git a/bin/internal/usbmuxd.version b/bin/internal/usbmuxd.version index 7ab900a20c0..6252dfc5ba3 100644 --- a/bin/internal/usbmuxd.version +++ b/bin/internal/usbmuxd.version @@ -1 +1 @@ -ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af +eb45fd21469fa35e9bbc3b0a15a962460b8d23a2 diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 30d1c18205d..4bf17f2f934 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -510,7 +510,7 @@ class IOSDevice extends Device { @override Future takeScreenshot(File outputFile) async { - await _iMobileDevice.takeScreenshot(outputFile, id); + await _iMobileDevice.takeScreenshot(outputFile); } @override @@ -832,8 +832,8 @@ class IOSDevicePortForwarder extends DevicePortForwarder { process = await _processUtils.start( [ _iproxyPath, - '$hostPort:$devicePort', - '--udid', + hostPort.toString(), + devicePort.toString(), _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 f8a5cbb9426..f2f088d188e 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -66,13 +66,11 @@ class IMobileDevice { } /// Captures a screenshot to the specified outputFile. - Future takeScreenshot(File outputFile, String deviceID) { + Future takeScreenshot(File outputFile) { 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 28ebc35a96e..e7ae055e37f 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', '--udid', '1234'], + command: ['iproxy', '49154', '456', '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', '--udid', '1234'], + command: ['iproxy', '49155', '456', '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 b0db2bb3e05..bba41fbfd13 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, '1234'), throwsA(anything)); + expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile), throwsA(anything)); }); testWithoutContext('idevicescreenshot captures and returns screenshot', () async { @@ -100,8 +100,8 @@ void main() { logger: logger, ); - await iMobileDevice.takeScreenshot(mockOutputFile, '1234'); - verify(mockProcessManager.run([idevicescreenshotPath, outputPath, '--udid', '1234'], + await iMobileDevice.takeScreenshot(mockOutputFile); + verify(mockProcessManager.run([idevicescreenshotPath, outputPath], environment: {'DYLD_LIBRARY_PATH': libimobiledevicePath}, workingDirectory: null, ));