Skip to content

[google_maps_flutter] Fix A2A iOS builds #11290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stuartmorgan-g wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −22
Open

[google_maps_flutter] Fix A2A iOS builds #11290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0066b77
[google_maps_flutter] Fix A2A iOS builds
stuartmorgan-g Mar 18, 2026
c6800bb
Mark the file as unshared
stuartmorgan-g Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.18.1

* Removes conditional header logic that broke add-to-app builds.

## 2.18.0

* Adds support for advanced markers.
Expand Down
2 changes: 0 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ Downloaded by pub (not CocoaPods).
s.xcconfig = {
'LIBRARY_SEARCH_PATHS' => '$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift',
'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) /usr/lib/swift',
# To handle the difference in framework names between CocoaPods and Swift Package Manager in shared code.
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) FGM_USING_COCOAPODS=1',
}
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.resource_bundles = {'google_maps_flutter_ios_privacy' => ['google_maps_flutter_ios/Sources/google_maps_flutter_ios/Resources/PrivacyInfo.xcprivacy']}
Expand Down
7 changes: 0 additions & 7 deletions ...urces/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapsUtilsTrampoline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// If Swift Package Manager is in use, Objective-C headers are available under the
// GoogleMapsUtilsObjC package. When using CocoaPods, the headers are provided by the
// GoogleMapsUtils package.
#ifdef FGM_USING_COCOAPODS
@import GoogleMapsUtils;
#else
@import GoogleMapsUtilsObjC;
#endif
Copy link
Contributor

@vashworth vashworth Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also remove the FGM_USING_COCOAPODS check from the sdk versions but use GoogleMapsUtilsObjC instead?

https://github.com/stuartmorgan-g/packages/blob/c6800bb7a3b736d8aaa2f4f69e61f474f80516db/packages/google_maps_flutter/google_maps_flutter_ios_sdk9/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapsUtilsTrampoline.h
https://github.com/stuartmorgan-g/packages/blob/c6800bb7a3b736d8aaa2f4f69e61f474f80516db/packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapsUtilsTrampoline.h

Copy link
Collaborator Author

@stuartmorgan-g stuartmorgan-g Mar 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, because they support CoocaPods too. In retrospect maybe that was a mistake, but it's probably not worth a breaking change in them to remove it just for this.

Copy link
Collaborator Author

@stuartmorgan-g stuartmorgan-g Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(If/when we migrate this code to Swift for the sdk versions though, we can change it to use the Swift module check.)

2 changes: 1 addition & 1 deletion packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_maps_flutter_ios
description: iOS implementation of the google_maps_flutter plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
version: 2.18.0
version: 2.18.1

environment:
sdk: ^3.10.0
Expand Down
2 changes: 2 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios/tool/unshared_source_files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ const intentionallyUnsharedSourceFiles = <String>[
'test/package_specific_test_import.dart',
// Each package will have its own list.
'tool/unshared_source_files.dart',
// Unshared due to https://github.com/flutter/flutter/issues/183441.
'ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapsUtilsTrampoline.h',
];
2 changes: 2 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios_sdk10/tool/unshared_source_files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ const intentionallyUnsharedSourceFiles = <String>[
'test/package_specific_test_import.dart',
// Each package will have its own list.
'tool/unshared_source_files.dart',
// Unshared due to https://github.com/flutter/flutter/issues/183441.
'ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/google_maps_flutter_ios_sdk10/GoogleMapsUtilsTrampoline.h',
];
2 changes: 2 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_ios_sdk9/tool/unshared_source_files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ const intentionallyUnsharedSourceFiles = <String>[
'test/package_specific_test_import.dart',
// Each package will have its own list.
'tool/unshared_source_files.dart',
// Unshared due to https://github.com/flutter/flutter/issues/183441.
'ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/google_maps_flutter_ios_sdk9/GoogleMapsUtilsTrampoline.h',
];
12 changes: 0 additions & 12 deletions ...urces/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapsUtilsTrampoline.h
View file
Open in desktop

This file was deleted.

Loading