From e960d773eeecb211e23318796bdb9f81cc4d4c48 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 24 Aug 2020 17:48:05 -0700 Subject: [PATCH] Change iOS plugin simulator archs from allow list to deny list (#64504) --- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 2 ++ .../templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl | 4 ++-- .../templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index e8152581de1..d9693f3bb20 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -45,6 +45,7 @@ Future main() async { 'lint', objcPodspecPath, '--allow-warnings', + '--verbose', ], environment: { 'LANG': 'en_US.UTF-8', @@ -63,6 +64,7 @@ Future main() async { objcPodspecPath, '--allow-warnings', '--use-libraries', + '--verbose', ], environment: { 'LANG': 'en_US.UTF-8', diff --git a/packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl b/packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl index faecbe5972c..67c0111f836 100644 --- a/packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl +++ b/packages/flutter_tools/templates/plugin/ios-objc.tmpl/projectName.podspec.tmpl @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.dependency 'Flutter' s.platform = :ios, '8.0' - # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported. - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } + # Flutter.framework does not contain a i386 slice. + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } end diff --git a/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl index 1a60d143b7b..df2a8bd2aae 100644 --- a/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl +++ b/packages/flutter_tools/templates/plugin/ios-swift.tmpl/projectName.podspec.tmpl @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.dependency 'Flutter' s.platform = :ios, '8.0' - # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported. - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } + # Flutter.framework does not contain a i386 slice. + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } s.swift_version = '5.0' end