Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit a8e91c1

Browse files
committed
[google_maps_flutter] Mark iOS arm64 simulators as unsupported
1 parent 97fa266 commit a8e91c1

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.1.0
2+
3+
* Mark iOS arm64 simulators as unsupported.
4+
15
## 2.0.7
26

37
* Add iOS unit and UI integration test targets.

packages/google_maps_flutter/google_maps_flutter/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<string>arm64</string>
2626
</array>
2727
<key>MinimumOSVersion</key>
28-
<string>8.0</string>
28+
<string>9.0</string>
2929
</dict>
3030
</plist>

packages/google_maps_flutter/google_maps_flutter/example/ios/Podfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,5 @@ end
3737
post_install do |installer|
3838
installer.pods_project.targets.each do |target|
3939
flutter_additional_ios_build_settings(target)
40-
target.build_configurations.each do |build_configuration|
41-
build_configuration.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64 i386'
42-
end
4340
end
4441
end

packages/google_maps_flutter/google_maps_flutter/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@
535535
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
536536
GCC_WARN_UNUSED_FUNCTION = YES;
537537
GCC_WARN_UNUSED_VARIABLE = YES;
538-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
538+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
539539
MTL_ENABLE_DEBUG_INFO = YES;
540540
ONLY_ACTIVE_ARCH = YES;
541541
SDKROOT = iphoneos;
@@ -585,7 +585,7 @@
585585
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
586586
GCC_WARN_UNUSED_FUNCTION = YES;
587587
GCC_WARN_UNUSED_VARIABLE = YES;
588-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
588+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
589589
MTL_ENABLE_DEBUG_INFO = NO;
590590
SDKROOT = iphoneos;
591591
TARGETED_DEVICE_FAMILY = "1,2";
@@ -599,7 +599,6 @@
599599
buildSettings = {
600600
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
601601
ENABLE_BITCODE = NO;
602-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
603602
FRAMEWORK_SEARCH_PATHS = (
604603
"$(inherited)",
605604
"$(PROJECT_DIR)/Flutter",
@@ -621,7 +620,6 @@
621620
buildSettings = {
622621
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
623622
ENABLE_BITCODE = NO;
624-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
625623
FRAMEWORK_SEARCH_PATHS = (
626624
"$(inherited)",
627625
"$(PROJECT_DIR)/Flutter",

packages/google_maps_flutter/google_maps_flutter/ios/google_maps_flutter.podspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ Downloaded by pub (not CocoaPods).
2020
s.dependency 'GoogleMaps'
2121
s.static_framework = true
2222
s.platform = :ios, '8.0'
23-
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
23+
# GoogleMaps does not support arm64 simulators.
24+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
2425
end

packages/google_maps_flutter/google_maps_flutter/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: google_maps_flutter
22
description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
33
repository: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter/google_maps_flutter
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
5-
version: 2.0.7
5+
version: 2.1.0
66

77
environment:
88
sdk: '>=2.12.0 <3.0.0'

0 commit comments

Comments
 (0)