From a25574a42c079117186ee1b068b1d2c3540848a4 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Thu, 12 Dec 2024 15:26:20 +0200 Subject: [PATCH 1/6] [google_maps_flutter_ios] Add Swift Package manager support --- .../ios/Assets/.gitkeep | 0 .../ios/google_maps_flutter_ios.podspec | 8 ++-- .../ios/google_maps_flutter_ios/Package.swift | 44 +++++++++++++++++++ .../FGMClusterManagersController.m | 0 .../FGMMarkerUserData.m | 0 .../FLTGoogleMapHeatmapController.m | 0 .../FLTGoogleMapJSONConversions.m | 0 .../FLTGoogleMapTileOverlayController.m | 0 .../FLTGoogleMapsPlugin.m | 0 .../GoogleMapCircleController.m | 0 .../GoogleMapController.m | 0 .../GoogleMapMarkerController.m | 0 .../GoogleMapPolygonController.m | 0 .../GoogleMapPolylineController.m | 0 .../Resources/PrivacyInfo.xcprivacy | 0 .../google_maps_flutter_ios-umbrella.h | 0 .../google_maps_flutter_ios.modulemap | 0 .../FGMClusterManagersController.h | 0 .../FGMMarkerUserData.h | 0 .../FLTGoogleMapHeatmapController.h | 0 .../FLTGoogleMapJSONConversions.h | 0 .../FLTGoogleMapTileOverlayController.h | 0 .../FLTGoogleMapsPlugin.h | 0 .../GoogleMapCircleController.h | 0 .../GoogleMapController.h | 0 .../GoogleMapController_Test.h | 0 .../GoogleMapMarkerController.h | 0 .../GoogleMapMarkerController_Test.h | 0 .../GoogleMapPolygonController.h | 0 .../GoogleMapPolylineController.h | 0 .../GoogleMapPolylineController_Test.h | 0 .../google_maps_flutter_ios}/messages.g.h | 0 .../google_maps_flutter_ios}/messages.g.m | 0 .../pigeons/messages.dart | 6 ++- 34 files changed, 52 insertions(+), 6 deletions(-) delete mode 100644 packages/google_maps_flutter/google_maps_flutter_ios/ios/Assets/.gitkeep create mode 100644 packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Package.swift rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FGMClusterManagersController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FGMMarkerUserData.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapHeatmapController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapJSONConversions.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapTileOverlayController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapsPlugin.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapCircleController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapMarkerController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapPolygonController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapPolylineController.m (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{ => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/Resources/PrivacyInfo.xcprivacy (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include}/google_maps_flutter_ios-umbrella.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include}/google_maps_flutter_ios.modulemap (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FGMClusterManagersController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FGMMarkerUserData.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FLTGoogleMapHeatmapController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FLTGoogleMapJSONConversions.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FLTGoogleMapTileOverlayController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/FLTGoogleMapsPlugin.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapCircleController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapController_Test.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapMarkerController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapMarkerController_Test.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapPolygonController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapPolylineController.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/GoogleMapPolylineController_Test.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios}/messages.g.h (100%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/messages.g.m (100%) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Assets/.gitkeep b/packages/google_maps_flutter/google_maps_flutter_ios/ios/Assets/.gitkeep deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec index f744daa68537..e98d4cd561c6 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec @@ -14,9 +14,9 @@ Downloaded by pub (not CocoaPods). s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter/ios' } s.documentation_url = 'https://pub.dev/packages/google_maps_flutter_ios' - s.source_files = 'Classes/**/*.{h,m}' - s.public_header_files = 'Classes/**/*.h' - s.module_map = 'Classes/google_maps_flutter_ios.modulemap' + s.source_files = 'google_maps_flutter_ios/Sources/google_maps_flutter_ios/**/*.{h,m}' + s.public_header_files = 'google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/**/*.h' + s.module_map = 'google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios.modulemap' s.dependency 'Flutter' # Allow any version up to the next breaking change after the latest version that # has been confirmed to be compatible via an example in examples/. See discussion @@ -37,5 +37,5 @@ Downloaded by pub (not CocoaPods). 'LIBRARY_SEARCH_PATHS' => '$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift', 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) /usr/lib/swift', } - s.resource_bundles = {'google_maps_flutter_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'google_maps_flutter_ios_privacy' => ['google_maps_flutter_ios/Sources/google_maps_flutter_ios/Resources/PrivacyInfo.xcprivacy']} end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Package.swift b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Package.swift new file mode 100644 index 000000000000..cb7393c55dcb --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Package.swift @@ -0,0 +1,44 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import PackageDescription + +let package = Package( + name: "google_maps_flutter_ios", + platforms: [ + .iOS(.v15), + ], + products: [ + .library(name: "google-maps-flutter-ios", type: .static, targets: ["google_maps_flutter_ios"]) + ], + dependencies: [ + .package(url: "https://github.com/googlemaps/ios-maps-sdk", .upToNextMajor(from: "9.0.0")), + .package(url: "https://github.com/googlemaps/google-maps-ios-utils", .upToNextMajor(from: "6.1.0")), + ], + targets: [ + .target( + name: "google_maps_flutter_ios", + dependencies: [ + .product( + name: "GoogleMapsUtils", + package: "google-maps-ios-utils" + ), + .product( + name: "GoogleMaps", + package: "ios-maps-sdk" + ), + ], + exclude: ["include/google_maps_flutter_ios-umbrella.h", "include/google_maps_flutter_ios.modulemap"], + resources: [ + .process("Resources") + ], + cSettings: [ + .headerSearchPath("include/google_maps_flutter_ios") + ] + ) + ] +) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapHeatmapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapCircleController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolygonController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Resources/PrivacyInfo.xcprivacy b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Resources/PrivacyInfo.xcprivacy rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/Resources/PrivacyInfo.xcprivacy diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios-umbrella.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios-umbrella.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios-umbrella.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios-umbrella.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios.modulemap b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios.modulemap similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/google_maps_flutter_ios.modulemap rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios.modulemap diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMClusterManagersController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerUserData.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FGMMarkerUserData.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMarkerUserData.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapHeatmapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapJSONConversions.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapTileOverlayController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/FLTGoogleMapsPlugin.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapCircleController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapCircleController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapCircleController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapController_Test.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapMarkerController_Test.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolygonController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolygonController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolygonController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController_Test.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapPolylineController_Test.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/GoogleMapPolylineController_Test.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/messages.g.h similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.h rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/messages.g.h diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/messages.g.m similarity index 100% rename from packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m rename to packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/messages.g.m diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart b/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart index 342bd9ea8019..74b7ca5e3bae 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart @@ -6,8 +6,10 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', - objcHeaderOut: 'ios/Classes/messages.g.h', - objcSourceOut: 'ios/Classes/messages.g.m', + objcHeaderOut: + 'ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/messages.g.h', + objcSourceOut: + 'ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/messages.g.m', objcOptions: ObjcOptions(prefix: 'FGM'), copyrightHeader: 'pigeons/copyright.txt', )) From 41ecdd786dc9a0f7db401c72ad6e9be7732dd73d Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Thu, 12 Dec 2024 19:57:26 +0200 Subject: [PATCH 2/6] fix: import GoogleMapsUtilsObjC instead of import GoogleMapsUtils --- .../google_maps_flutter_ios/FLTGoogleMapHeatmapController.m | 2 +- .../Sources/google_maps_flutter_ios/GoogleMapController.m | 2 +- .../google_maps_flutter_ios/FGMClusterManagersController.h | 2 +- .../google_maps_flutter_ios/FLTGoogleMapHeatmapController.h | 2 +- .../google_maps_flutter_ios/FLTGoogleMapJSONConversions.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m index e3f6aab0274b..9e532830a2cc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m @@ -3,8 +3,8 @@ // found in the LICENSE file. #import "FLTGoogleMapHeatmapController.h" +@import GoogleMapsUtilsObjC; #import "FLTGoogleMapJSONConversions.h" -@import GoogleMapsUtils; @interface FLTGoogleMapHeatmapController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m index 0108a3f72b2a..8700e19c1fc3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -@import GoogleMapsUtils; +@import GoogleMapsUtilsObjC; #import "GoogleMapController.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h index 346a1ab9f1c8..71d0c7fbced7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h @@ -4,7 +4,7 @@ #import #import -@import GoogleMapsUtils; +@import GoogleMapsUtilsObjC; #import "messages.g.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h index fb516ad99e73..3793aae5a2c9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h @@ -4,7 +4,7 @@ #import #import -@import GoogleMapsUtils; +@import GoogleMapsUtilsObjC; #import "messages.g.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h index 2d853e9bfe98..25838507d8c2 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h @@ -5,7 +5,7 @@ #import #import #import -@import GoogleMapsUtils; +@import GoogleMapsUtilsObjC; #import "messages.g.h" From c8778171e6b1364d61db07cf8d5ea8a128e82d10 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Fri, 13 Dec 2024 15:02:09 +0200 Subject: [PATCH 3/6] Fix GoogleMapsUtils imports for both SPM and CocoaPods --- .../ios/google_maps_flutter_ios.podspec | 1 + .../FLTGoogleMapHeatmapController.m | 8 ++++++++ .../Sources/google_maps_flutter_ios/GoogleMapController.m | 7 +++++++ .../FGMClusterManagersController.h | 8 ++++++++ .../FLTGoogleMapHeatmapController.h | 8 ++++++++ .../google_maps_flutter_ios/FLTGoogleMapJSONConversions.h | 8 ++++++++ 6 files changed, 40 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec index e98d4cd561c6..b36b9bf0d5c4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios.podspec @@ -36,6 +36,7 @@ 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', + 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) FGM_USING_COCOAPODS=1' } s.resource_bundles = {'google_maps_flutter_ios_privacy' => ['google_maps_flutter_ios/Sources/google_maps_flutter_ios/Resources/PrivacyInfo.xcprivacy']} end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m index 9e532830a2cc..95bd41410b7e 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m @@ -3,7 +3,15 @@ // found in the LICENSE file. #import "FLTGoogleMapHeatmapController.h" + +/// 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 #import "FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapHeatmapController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m index 8700e19c1fc3..2b52180970e4 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m @@ -2,7 +2,14 @@ // 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 #import "GoogleMapController.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h index 71d0c7fbced7..4194bdbf7ac3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMClusterManagersController.h @@ -4,7 +4,15 @@ #import #import + +/// 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 #import "messages.g.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h index 3793aae5a2c9..5c20db09c71a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h @@ -4,7 +4,15 @@ #import #import + +/// 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 #import "messages.g.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h index 25838507d8c2..c0debcd4a633 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h @@ -5,7 +5,15 @@ #import #import #import + +/// 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 #import "messages.g.h" From 072ebb11e8b06550b782ef30a6b19d6e9c8f5cb4 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Fri, 13 Dec 2024 15:20:04 +0200 Subject: [PATCH 4/6] Remove OCMock from cocoapods for iOS 15 --- .../example/ios15/ios/Podfile | 2 - .../ios/Runner.xcodeproj/project.pbxproj | 49 +++++++++++++------ 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile index 37d20e51d606..6649374d4c19 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Podfile @@ -33,8 +33,6 @@ target 'Runner' do flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do inherit! :search_paths - - pod 'OCMock', '~> 3.9.1' end end diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Runner.xcodeproj/project.pbxproj index cf3ec2ab9f0b..fa4a7fbdfd89 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/Runner.xcodeproj/project.pbxproj @@ -3,12 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 5276B9112D0C699A009C4BA0 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 5276B9102D0C699A009C4BA0 /* OCMock */; }; 5B5EF9A6C72A03092BDA553E /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28D4666EF03E57DB7D03E916 /* Pods_RunnerTests.framework */; }; 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; @@ -88,6 +89,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5276B9112D0C699A009C4BA0 /* OCMock in Frameworks */, 5B5EF9A6C72A03092BDA553E /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -198,6 +200,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */, + A89AF444D8C8FFBE1C95B3BF /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -219,7 +222,6 @@ F7151F0C265D7ED70028CB91 /* Sources */, F7151F0D265D7ED70028CB91 /* Frameworks */, F7151F0E265D7ED70028CB91 /* Resources */, - 7862D82E36C37F9B7558DA5E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -260,7 +262,8 @@ ); mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + 5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */, ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; @@ -329,38 +332,38 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 7862D82E36C37F9B7558DA5E /* [CP] Embed Pods Frameworks */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", ); - name = "[CP] Embed Pods Frameworks"; + name = "Run Script"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + A89AF444D8C8FFBE1C95B3BF /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", ); - name = "Run Script"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -685,13 +688,29 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { isa = XCLocalSwiftPackageReference; relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; }; /* End XCLocalSwiftPackageReference section */ +/* Begin XCRemoteSwiftPackageReference section */ + 5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "http://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = fe1661a3efed11831a6452f4b1a0c5e6ddc08c3d; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ + 5276B9102D0C699A009C4BA0 /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 5276B90F2D0C699A009C4BA0 /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { isa = XCSwiftPackageProductDependency; productName = FlutterGeneratedPluginSwiftPackage; From cbe0721cefbce8d6a9c2c243056c829a313603d0 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Fri, 13 Dec 2024 15:42:27 +0200 Subject: [PATCH 5/6] Update CHANGELOG --- .../google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md | 3 ++- .../google_maps_flutter/google_maps_flutter_ios/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md index b09f2f375b20..f0624d8cb454 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 2.14.0 +* Adds Swift Package Manager compatibility. * Updates minimum supported SDK version to Flutter 3.22/Dart 3.4. ## 2.13.2 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index 2020ec8940ef..08b76f1cb18f 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml @@ -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.13.2 +version: 2.14.0 environment: sdk: ^3.4.0 From 0718db3ed8b360ac098421646d095e5bd6701b1f Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Fri, 13 Dec 2024 15:44:49 +0200 Subject: [PATCH 6/6] fix: import ordering --- .../google_maps_flutter_ios/FLTGoogleMapHeatmapController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m index 95bd41410b7e..80011758050b 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m @@ -3,6 +3,7 @@ // found in the LICENSE file. #import "FLTGoogleMapHeatmapController.h" +#import "FLTGoogleMapJSONConversions.h" /// 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 @@ -12,7 +13,6 @@ #else @import GoogleMapsUtilsObjC; #endif -#import "FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapHeatmapController ()