Skip to content

Commit 83c2c4d

Browse files
stuartmorgan-gstuartmorgan-g
authored
[google_maps_flutter] Restore the arm64 workaround (flutter#5915)
Restores the workaround to exclude arm64 when building for simulator, which is still necessary for apps that support back to iOS 12. Also removes all the example-app-level workarounds that manually excluded arm64 simulator, which were masking the failure in the first place, so that we don't accidentally break this again. The exception is the exclusions for the unit test targets, which need them in order to match the Flutter-tool-generated exclusion to the Runner, otherwise the unit tests can't build. See flutter#94491
1 parent f2c1be0 commit 83c2c4d

File tree

11 files changed

+17
-22
lines changed

11 files changed

+17
-22
lines changed

‎packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.4.1
2+
3+
* Restores the workaround to exclude arm64 simulator builds, as it is still necessary for applications targeting iOS 12.
4+
15
## 2.4.0
26

37
* Adds support for arm64 simulators.

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/ios/Podfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,5 @@ end
3939
post_install do |installer|
4040
installer.pods_project.targets.each do |target|
4141
flutter_additional_ios_build_settings(target)
42-
target.build_configurations.each do |build_configuration|
43-
build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
44-
end
4542
end
4643
end

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios12/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
97C146E61CF9000F007C117D /* Project object */ = {
283283
isa = PBXProject;
284284
attributes = {
285-
LastUpgradeCheck = 1430;
285+
LastUpgradeCheck = 1510;
286286
ORGANIZATIONNAME = "The Flutter Authors";
287287
TargetAttributes = {
288288
97C146ED1CF9000F007C117D = {
@@ -620,7 +620,6 @@
620620
buildSettings = {
621621
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
622622
ENABLE_BITCODE = NO;
623-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
624623
FRAMEWORK_SEARCH_PATHS = (
625624
"$(inherited)",
626625
"$(PROJECT_DIR)/Flutter",
@@ -645,7 +644,6 @@
645644
buildSettings = {
646645
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
647646
ENABLE_BITCODE = NO;
648-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
649647
FRAMEWORK_SEARCH_PATHS = (
650648
"$(inherited)",
651649
"$(PROJECT_DIR)/Flutter",

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/ios/Podfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,5 @@ end
3939
post_install do |installer|
4040
installer.pods_project.targets.each do |target|
4141
flutter_additional_ios_build_settings(target)
42-
target.build_configurations.each do |build_configuration|
43-
build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
44-
end
4542
end
4643
end

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
97C146E61CF9000F007C117D /* Project object */ = {
233233
isa = PBXProject;
234234
attributes = {
235-
LastUpgradeCheck = 1430;
235+
LastUpgradeCheck = 1510;
236236
ORGANIZATIONNAME = "The Flutter Authors";
237237
TargetAttributes = {
238238
97C146ED1CF9000F007C117D = {
@@ -546,7 +546,6 @@
546546
CLANG_ENABLE_MODULES = YES;
547547
DEVELOPMENT_TEAM = "";
548548
ENABLE_BITCODE = NO;
549-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
550549
FRAMEWORK_SEARCH_PATHS = (
551550
"$(inherited)",
552551
"$(PROJECT_DIR)/Flutter",
@@ -573,7 +572,6 @@
573572
CLANG_ENABLE_MODULES = YES;
574573
DEVELOPMENT_TEAM = "";
575574
ENABLE_BITCODE = NO;
576-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
577575
FRAMEWORK_SEARCH_PATHS = (
578576
"$(inherited)",
579577
"$(PROJECT_DIR)/Flutter",

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios13/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Podfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,5 @@ end
3939
post_install do |installer|
4040
installer.pods_project.targets.each do |target|
4141
flutter_additional_ios_build_settings(target)
42-
target.build_configurations.each do |build_configuration|
43-
build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
44-
end
4542
end
4643
end

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
97C146E61CF9000F007C117D /* Project object */ = {
233233
isa = PBXProject;
234234
attributes = {
235-
LastUpgradeCheck = 1430;
235+
LastUpgradeCheck = 1510;
236236
ORGANIZATIONNAME = "The Flutter Authors";
237237
TargetAttributes = {
238238
97C146ED1CF9000F007C117D = {
@@ -545,7 +545,6 @@
545545
CLANG_ENABLE_MODULES = YES;
546546
DEVELOPMENT_TEAM = "";
547547
ENABLE_BITCODE = NO;
548-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
549548
FRAMEWORK_SEARCH_PATHS = (
550549
"$(inherited)",
551550
"$(PROJECT_DIR)/Flutter",
@@ -572,7 +571,6 @@
572571
CLANG_ENABLE_MODULES = YES;
573572
DEVELOPMENT_TEAM = "";
574573
ENABLE_BITCODE = NO;
575-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
576574
FRAMEWORK_SEARCH_PATHS = (
577575
"$(inherited)",
578576
"$(PROJECT_DIR)/Flutter",

‎packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ Downloaded by pub (not CocoaPods).
2424
s.dependency 'GoogleMaps', '< 9.0'
2525
s.static_framework = true
2626
s.platform = :ios, '12.0'
27-
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
27+
# GoogleMaps 6.x does not support arm64 simulators, but also doesn't declare
28+
# explicitly that it doesn't, so mark that here so that the Flutter tool knows
29+
# to build the Runner for x86_64 instead. See https://github.com/flutter/flutter/issues/94491
30+
# TODO(stuartmorgan): Remove EXCLUDED_ARCHS once this plugin requires iOS 13+,
31+
# at which point Cocoapods will resolve to a version of GoogleMaps that has
32+
# arm64 support.
33+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
2834
s.resource_bundles = {'google_maps_flutter_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
2935
end

‎packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter_ios
22
description: iOS implementation of the google_maps_flutter plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
5-
version: 2.4.0
5+
version: 2.4.1
66

77
environment:
88
sdk: ^3.2.3

0 commit comments

Comments
 (0)