Revert "[flutter_tools] update libimobiledevice (flutter#59512)" (flutter#60551)

christopherfujino · web-flow · commit 09cca73aee6e · 2020-06-29T13:44:38.000-07:00
This reverts commit 32000db.
diff --git a/bin/internal/ideviceinstaller.version b/bin/internal/ideviceinstaller.version
@@ -0,0 +1 @@
+73b9c81e02f83060aa44bece963a62827908de68
diff --git 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
@@ -1 +1 @@
-20a2f8dbddcf1a96ad4c720b9afd1d0876d17ffc
+28812e5bed8621bd637b4129ab15a9c1abb9f57d
diff --git 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
@@ -1 +1 @@
-ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af
+eb45fd21469fa35e9bbc3b0a15a962460b8d23a2
diff --git 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<void> 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(
         <String>[
           _iproxyPath,
-          '$hostPort:$devicePort',
-          '--udid',
+          hostPort.toString(),
+          devicePort.toString(),
           _id,
         ],
         environment: Map<String, String>.fromEntries(
diff --git 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<void> takeScreenshot(File outputFile, String deviceID) {
+  Future<void> takeScreenshot(File outputFile) {
     return _processUtils.run(
       <String>[
         _idevicescreenshotPath,
         outputFile.path,
-        '--udid',
-        deviceID,
       ],
       throwOnError: true,
       environment: Map<String, String>.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
@@ -22,14 +22,14 @@ void main() {
     const int devicePort = 456;
     final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
       const FakeCommand(
-        command: <String>['iproxy', '49154:456', '--udid', '1234'],
+        command: <String>['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: <String>['iproxy', '49155:456', '--udid', '1234'],
+        command: <String>['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
@@ -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(<String>[idevicescreenshotPath, outputPath, '--udid', '1234'],
+        await iMobileDevice.takeScreenshot(mockOutputFile);
+        verify(mockProcessManager.run(<String>[idevicescreenshotPath, outputPath],
             environment: <String, String>{'DYLD_LIBRARY_PATH': libimobiledevicePath},
             workingDirectory: null,
         ));

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+73b9c81e02f83060aa44bece963a62827908de68`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-569016da35ccea9d9b7c81954342fabb98149fb5`
	`1`	`+6150fcd888a0ee8a69dd47328509ee608c2e02dc`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-20a2f8dbddcf1a96ad4c720b9afd1d0876d17ffc`
	`1`	`+28812e5bed8621bd637b4129ab15a9c1abb9f57d`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72`
	`1`	`+2ef3f4c83bce209247479e707eebd5a84f606e28`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af`
	`1`	`+eb45fd21469fa35e9bbc3b0a15a962460b8d23a2`