From 79c7cc70a5cb01a07fecb0a8782fe4d86cf3b65e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 27 Aug 2021 13:44:14 -0700 Subject: [PATCH] Stop excluding arm64 from simulator iOS add-to-app host app archs (#891) --- .../fullscreen/flutter_module/pubspec.lock | 14 +++++++------- .../IOSFullScreen.xcodeproj/project.pbxproj | 1 - .../fullscreen/ios_fullscreen/Podfile.lock | 13 +++---------- .../flutter_module_using_plugin/pubspec.lock | 8 ++++---- .../IOSUsingPlugin.xcodeproj/project.pbxproj | 1 - add_to_app/plugin/ios_using_plugin/Podfile.lock | 17 ++++++++++++----- .../project.pbxproj | 1 - 7 files changed, 26 insertions(+), 29 deletions(-) diff --git a/add_to_app/fullscreen/flutter_module/pubspec.lock b/add_to_app/fullscreen/flutter_module/pubspec.lock index 5ed302002..6b5db563f 100644 --- a/add_to_app/fullscreen/flutter_module/pubspec.lock +++ b/add_to_app/fullscreen/flutter_module/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" flutter: dependency: "direct main" description: flutter @@ -125,7 +125,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -153,7 +153,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.3" provider: dependency: "direct main" description: @@ -214,7 +214,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: @@ -235,7 +235,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.2.0" + version: "7.1.1" webdriver: dependency: transitive description: diff --git a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen.xcodeproj/project.pbxproj b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen.xcodeproj/project.pbxproj index d33a41358..c6c8cf44a 100644 --- a/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen.xcodeproj/project.pbxproj +++ b/add_to_app/fullscreen/ios_fullscreen/IOSFullScreen.xcodeproj/project.pbxproj @@ -492,7 +492,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; diff --git a/add_to_app/fullscreen/ios_fullscreen/Podfile.lock b/add_to_app/fullscreen/ios_fullscreen/Podfile.lock index 66b1b42fb..053545660 100644 --- a/add_to_app/fullscreen/ios_fullscreen/Podfile.lock +++ b/add_to_app/fullscreen/ios_fullscreen/Podfile.lock @@ -1,22 +1,16 @@ PODS: - - espresso (0.0.1): - - Flutter - Flutter (1.0.0) - flutter_module (0.0.1): - Flutter - FlutterPluginRegistrant (0.0.1): - - espresso - Flutter DEPENDENCIES: - - espresso (from `../flutter_module/.ios/Flutter/.symlinks/espresso/ios`) - Flutter (from `../flutter_module/.ios/Flutter/engine`) - flutter_module (from `../flutter_module/.ios/Flutter`) - FlutterPluginRegistrant (from `../flutter_module/.ios/Flutter/FlutterPluginRegistrant`) EXTERNAL SOURCES: - espresso: - :path: "../flutter_module/.ios/Flutter/.symlinks/espresso/ios" Flutter: :path: "../flutter_module/.ios/Flutter/engine" flutter_module: @@ -25,11 +19,10 @@ EXTERNAL SOURCES: :path: "../flutter_module/.ios/Flutter/FlutterPluginRegistrant" SPEC CHECKSUMS: - espresso: f754d95a407073c29489b0d82c4119de517b3f2f - Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + Flutter: bdfa2e8fe0e2880a2c6a58a0b1a8675c262a07af flutter_module: d1e1ff44505640bd9aa37f23f63380c646272be4 - FlutterPluginRegistrant: 1a0bd13c92b7db07c180b8d2f1eb5749b7cf1b6d + FlutterPluginRegistrant: 2afd5ea46d3a949472c9b7da6462d8fbf7d8b16e PODFILE CHECKSUM: 1f9809794b37c933b7cb40791d64724dc2376c54 -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.0 diff --git a/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock b/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock index 259fc4996..4a7c640f2 100644 --- a/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock +++ b/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -99,7 +99,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -181,7 +181,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin.xcodeproj/project.pbxproj b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin.xcodeproj/project.pbxproj index b3bb62be1..ec626191f 100644 --- a/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin.xcodeproj/project.pbxproj +++ b/add_to_app/plugin/ios_using_plugin/IOSUsingPlugin.xcodeproj/project.pbxproj @@ -492,7 +492,6 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; diff --git a/add_to_app/plugin/ios_using_plugin/Podfile.lock b/add_to_app/plugin/ios_using_plugin/Podfile.lock index a845bf8f8..66eeafd9d 100644 --- a/add_to_app/plugin/ios_using_plugin/Podfile.lock +++ b/add_to_app/plugin/ios_using_plugin/Podfile.lock @@ -4,7 +4,10 @@ PODS: - Flutter - FlutterPluginRegistrant (0.0.1): - Flutter + - sensors - url_launcher + - sensors (0.0.1): + - Flutter - url_launcher (0.0.1): - Flutter @@ -12,7 +15,8 @@ DEPENDENCIES: - Flutter (from `../flutter_module_using_plugin/.ios/Flutter/engine`) - flutter_module_using_plugin (from `../flutter_module_using_plugin/.ios/Flutter`) - FlutterPluginRegistrant (from `../flutter_module_using_plugin/.ios/Flutter/FlutterPluginRegistrant`) - - url_launcher (from `../flutter_module_using_plugin/.ios/Flutter/.symlinks/url_launcher/ios`) + - sensors (from `../flutter_module_using_plugin/.ios/.symlinks/plugins/sensors/ios`) + - url_launcher (from `../flutter_module_using_plugin/.ios/.symlinks/plugins/url_launcher/ios`) EXTERNAL SOURCES: Flutter: @@ -21,15 +25,18 @@ EXTERNAL SOURCES: :path: "../flutter_module_using_plugin/.ios/Flutter" FlutterPluginRegistrant: :path: "../flutter_module_using_plugin/.ios/Flutter/FlutterPluginRegistrant" + sensors: + :path: "../flutter_module_using_plugin/.ios/.symlinks/plugins/sensors/ios" url_launcher: - :path: "../flutter_module_using_plugin/.ios/Flutter/.symlinks/url_launcher/ios" + :path: "../flutter_module_using_plugin/.ios/.symlinks/plugins/url_launcher/ios" SPEC CHECKSUMS: - Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + Flutter: bdfa2e8fe0e2880a2c6a58a0b1a8675c262a07af flutter_module_using_plugin: 3c6ddd2296edc03cbe09c33f12a2c522ccc36e5b - FlutterPluginRegistrant: d0de10c7c4fc31cc6b676a5965b96100f7c035f7 + FlutterPluginRegistrant: 0b50fd1ba3828e7cda5bb7ebe2c7b90149023083 + sensors: 84eb7a30e47a649e4172b71d6e81be614c280336 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef PODFILE CHECKSUM: 357b6c94e1edb8289fba0dbdd79daa105ab9d88c -COCOAPODS: 1.8.4 +COCOAPODS: 1.10.0 diff --git a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule.xcodeproj/project.pbxproj b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule.xcodeproj/project.pbxproj index df0e16070..d7e598b49 100644 --- a/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule.xcodeproj/project.pbxproj +++ b/add_to_app/prebuilt_module/ios_using_prebuilt_module/IOSUsingPrebuiltModule.xcodeproj/project.pbxproj @@ -319,7 +319,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter/$(CONFIGURATION)",