Update lib versions of iOS usb dependencies that get archived. Unblocks https://github.com/flutter/flutter/pull/59512, part of fixing https://github.com/flutter/flutter/issues/59506 and fixes https://github.com/flutter/flutter/issues/50299. Bug: https://github.com/flutter/flutter/issues/59506 Change-Id: I23da6ba184af4eb6000949f18b9e6aefd1d5e950 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/3820 Reviewed-by: Godofredo Contreras <godofredoc@google.com> Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/recipes/ios-usb-dependencies.expected/ideviceinstaller-flutter.json b/recipes/ios-usb-dependencies.expected/ideviceinstaller-flutter.json deleted file mode 100644 index a05ec1e..0000000 --- a/recipes/ios-usb-dependencies.expected/ideviceinstaller-flutter.json +++ /dev/null
@@ -1,167 +0,0 @@ -[ - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/homebrew" - ], - "infra_step": true, - "name": "mkdir homebrew" - }, - { - "cmd": [ - "curl", - "-L", - "https://github.com/Homebrew/brew/tarball/master", - "-o", - "[START_DIR]/homebrew.tar.gz" - ], - "name": "get homebrew" - }, - { - "cmd": [ - "tar", - "zxf", - "[START_DIR]/homebrew.tar.gz", - "--strip", - "1", - "-C", - "[START_DIR]/homebrew" - ], - "name": "open tarball" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/output" - ], - "infra_step": true, - "name": "mkdir output" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/zips" - ], - "infra_step": true, - "name": "mkdir zips" - }, - { - "cmd": [ - "[START_DIR]/homebrew/bin/brew", - "tap", - "flutter/homebrew-flutter", - "https://flutter-mirrors.googlesource.com/homebrew-flutter" - ], - "name": "tap custom formulae" - }, - { - "cmd": [ - "[START_DIR]/homebrew/bin/brew", - "install", - "flutter/homebrew-flutter/ideviceinstaller-flutter", - "--HEAD" - ], - "name": "installing ideviceinstaller-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/output/ideviceinstaller-flutter" - ], - "infra_step": true, - "name": "mkdir package [START_DIR]/output/ideviceinstaller-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/homebrew/opt/ideviceinstaller-flutter/bin/ideviceinstaller", - "[START_DIR]/output/ideviceinstaller-flutter" - ], - "infra_step": true, - "name": "copying bin/ideviceinstaller from package ideviceinstaller-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/homebrew/opt/ideviceinstaller-flutter/COPYING", - "[START_DIR]/output/ideviceinstaller-flutter" - ], - "infra_step": true, - "name": "copying COPYING from package ideviceinstaller-flutter" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[flutter::zip]/resources/zip.py" - ], - "name": "zipping ideviceinstaller-flutter.zip", - "stdin": "{\"entries\": [{\"path\": \"[START_DIR]/output/ideviceinstaller-flutter\", \"type\": \"dir\"}], \"output\": \"[START_DIR]/zips/ideviceinstaller-flutter.zip\", \"root\": \"[START_DIR]/output/ideviceinstaller-flutter\"}" - }, - { - "cmd": [ - "echo", - "ios-usb-dependencies/unsigned/ideviceinstaller/2d72510e447ab60a9728aeea2362d8be2cbd7789/ideviceinstaller.zip" - ], - "name": "cloud path" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", - "--", - "RECIPE_REPO[depot_tools]/gsutil.py", - "----", - "cp", - "[START_DIR]/zips/ideviceinstaller-flutter.zip", - "gs://flutter_infra/ios-usb-dependencies/unsigned/ideviceinstaller/2d72510e447ab60a9728aeea2362d8be2cbd7789/ideviceinstaller.zip" - ], - "infra_step": true, - "name": "gsutil upload of ideviceinstaller-flutter.zip", - "~followup_annotations": [ - "@@@STEP_LINK@ideviceinstaller-flutter.zip@https://storage.cloud.google.com/flutter_infra/ios-usb-dependencies/unsigned/ideviceinstaller/2d72510e447ab60a9728aeea2362d8be2cbd7789/ideviceinstaller.zip@@@" - ] - }, - { - "name": "$result" - } -] \ No newline at end of file
diff --git a/recipes/ios-usb-dependencies.expected/libimobiledevice-flutter.json b/recipes/ios-usb-dependencies.expected/libimobiledevice-flutter.json index 60a06c5..d7545f5 100644 --- a/recipes/ios-usb-dependencies.expected/libimobiledevice-flutter.json +++ b/recipes/ios-usb-dependencies.expected/libimobiledevice-flutter.json
@@ -163,48 +163,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/libimobiledevice-flutter/bin/idevice_id", - "[START_DIR]/output/libimobiledevice-flutter" - ], - "infra_step": true, - "name": "copying bin/idevice_id from package libimobiledevice-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/homebrew/opt/libimobiledevice-flutter/bin/ideviceinfo", - "[START_DIR]/output/libimobiledevice-flutter" - ], - "infra_step": true, - "name": "copying bin/ideviceinfo from package libimobiledevice-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/homebrew/opt/libimobiledevice-flutter/bin/idevicename", - "[START_DIR]/output/libimobiledevice-flutter" - ], - "infra_step": true, - "name": "copying bin/idevicename from package libimobiledevice-flutter" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[START_DIR]/homebrew/opt/libimobiledevice-flutter/bin/idevicescreenshot", "[START_DIR]/output/libimobiledevice-flutter" ], @@ -233,11 +191,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/libimobiledevice-flutter/lib/libimobiledevice.6.dylib", + "[START_DIR]/homebrew/opt/libimobiledevice-flutter/lib/libimobiledevice-1.0.6.dylib", "[START_DIR]/output/libimobiledevice-flutter" ], "infra_step": true, - "name": "copying lib/libimobiledevice.6.dylib from package libimobiledevice-flutter" + "name": "copying lib/libimobiledevice-1.0.6.dylib from package libimobiledevice-flutter" }, { "cmd": [
diff --git a/recipes/ios-usb-dependencies.expected/libplist-flutter.json b/recipes/ios-usb-dependencies.expected/libplist-flutter.json index 3adc583..32d5472 100644 --- a/recipes/ios-usb-dependencies.expected/libplist-flutter.json +++ b/recipes/ios-usb-dependencies.expected/libplist-flutter.json
@@ -107,11 +107,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/libplist-flutter/lib/libplist.3.dylib", + "[START_DIR]/homebrew/opt/libplist-flutter/lib/libplist-2.0.3.dylib", "[START_DIR]/output/libplist-flutter" ], "infra_step": true, - "name": "copying lib/libplist.3.dylib from package libplist-flutter" + "name": "copying lib/libplist-2.0.3.dylib from package libplist-flutter" }, { "cmd": [
diff --git a/recipes/ios-usb-dependencies.expected/openssl-flutter.json b/recipes/ios-usb-dependencies.expected/openssl-flutter.json index 54fba96..818a1c3 100644 --- a/recipes/ios-usb-dependencies.expected/openssl-flutter.json +++ b/recipes/ios-usb-dependencies.expected/openssl-flutter.json
@@ -107,11 +107,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/openssl-flutter/lib/libssl.1.0.0.dylib", + "[START_DIR]/homebrew/opt/openssl-flutter/lib/libssl.1.1.dylib", "[START_DIR]/output/openssl-flutter" ], "infra_step": true, - "name": "copying lib/libssl.1.0.0.dylib from package openssl-flutter" + "name": "copying lib/libssl.1.1.dylib from package openssl-flutter" }, { "cmd": [ @@ -121,11 +121,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/openssl-flutter/lib/libcrypto.1.0.0.dylib", + "[START_DIR]/homebrew/opt/openssl-flutter/lib/libcrypto.1.1.dylib", "[START_DIR]/output/openssl-flutter" ], "infra_step": true, - "name": "copying lib/libcrypto.1.0.0.dylib from package openssl-flutter" + "name": "copying lib/libcrypto.1.1.dylib from package openssl-flutter" }, { "cmd": [
diff --git a/recipes/ios-usb-dependencies.expected/usbmuxd-flutter.json b/recipes/ios-usb-dependencies.expected/usbmuxd-flutter.json index 3504db4..2043b58 100644 --- a/recipes/ios-usb-dependencies.expected/usbmuxd-flutter.json +++ b/recipes/ios-usb-dependencies.expected/usbmuxd-flutter.json
@@ -107,11 +107,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/homebrew/opt/usbmuxd-flutter/lib/libusbmuxd.4.dylib", + "[START_DIR]/homebrew/opt/usbmuxd-flutter/lib/libusbmuxd-2.0.6.dylib", "[START_DIR]/output/usbmuxd-flutter" ], "infra_step": true, - "name": "copying lib/libusbmuxd.4.dylib from package usbmuxd-flutter" + "name": "copying lib/libusbmuxd-2.0.6.dylib from package usbmuxd-flutter" }, { "cmd": [
diff --git a/recipes/ios-usb-dependencies.py b/recipes/ios-usb-dependencies.py index e89d7c9..1f4e38c 100644 --- a/recipes/ios-usb-dependencies.py +++ b/recipes/ios-usb-dependencies.py
@@ -25,24 +25,17 @@ MIRROR_URL_PREFIX = 'https://flutter-mirrors.googlesource.com' INSTALL_PKGS = { - 'ideviceinstaller-flutter': { - 'install_flags': ['--HEAD'], - 'deliverables': [ - 'bin/ideviceinstaller', - 'COPYING', - ], - }, 'libplist-flutter': { 'install_flags': ['--HEAD'], 'deliverables': [ - 'lib/libplist.3.dylib', + 'lib/libplist-2.0.3.dylib', 'COPYING', ], }, 'usbmuxd-flutter': { 'install_flags': ['--HEAD'], 'deliverables': [ - 'lib/libusbmuxd.4.dylib', + 'lib/libusbmuxd-2.0.6.dylib', 'bin/iproxy', 'COPYING', ], @@ -50,8 +43,8 @@ 'openssl-flutter': { 'install_flags': ['--HEAD'], 'deliverables': [ - 'lib/libssl.1.0.0.dylib', - 'lib/libcrypto.1.0.0.dylib', + 'lib/libssl.1.1.dylib', + 'lib/libcrypto.1.1.dylib', 'LICENSE', ], }, @@ -62,12 +55,9 @@ 'COPYING.LESSER', 'libtasn1-LICENSE', 'libtasn1-AUTHORS', - 'bin/idevice_id', - 'bin/ideviceinfo', - 'bin/idevicename', 'bin/idevicescreenshot', 'bin/idevicesyslog', - 'lib/libimobiledevice.6.dylib', + 'lib/libimobiledevice-1.0.6.dylib', ], }, 'ios-deploy-flutter': { @@ -78,7 +68,7 @@ 'LICENSE2', ], }, - } + } def InstallHomebrew(api, homebrew_dir): homebrew_tar = api.path['start_dir'].join('homebrew.tar.gz')