From 65bc23c834591fbd6f880d0cff4e99b7e95dd73e Mon Sep 17 00:00:00 2001 From: Alexander Troshkov <20989940+aednlaxer@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:20:35 +0200 Subject: [PATCH 1/4] Use relative import paths --- .../FGMClusterManagersController.m | 4 ++-- .../google_maps_flutter_ios/FGMMarkerUserData.m | 2 +- .../FLTGoogleMapHeatmapController.m | 4 ++-- .../FLTGoogleMapJSONConversions.m | 4 ++-- .../FLTGoogleMapTileOverlayController.m | 4 ++-- .../google_maps_flutter_ios/FLTGoogleMapsPlugin.m | 2 +- .../GoogleMapCircleController.m | 4 ++-- .../google_maps_flutter_ios/GoogleMapController.m | 12 ++++++------ .../GoogleMapMarkerController.m | 4 ++-- .../GoogleMapPolygonController.m | 4 ++-- .../GoogleMapPolylineController.m | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m index 26db81693bde..0e066bc9b928 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m @@ -4,8 +4,8 @@ #import "FGMClusterManagersController.h" -#import "FGMMarkerUserData.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FGMClusterManagersController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m index 4e8e365c1ec0..333a781cbfd3 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.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 "FGMMarkerUserData.h" +#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" @implementation FGMMarkerUserData 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 80011758050b..c873a8a8729f 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 @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h" +#import "./include/google_maps_flutter_ios/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 diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m index 25504291192e..ee519cf85131 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapJSONConversions.h" -#import "FGMMarkerUserData.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" /// Returns dict[key], or nil if dict[key] is NSNull. id FGMGetValueOrNilFromDict(NSDictionary *dict, NSString *key) { diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m index 37b2f8b6311e..0eee51015a5c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTGoogleMapTileOverlayController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapTileOverlayController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m index 70bde9022a0d..bcf39b6977dd 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.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 "FLTGoogleMapsPlugin.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapsPlugin.h" #pragma mark - GoogleMaps plugin implementation diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m index 683538a67eea..0c7d3d9e3880 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapCircleController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/GoogleMapCircleController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapCircleController () 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 2b52180970e4..72d7d198c470 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 @@ -11,13 +11,13 @@ @import GoogleMapsUtilsObjC; #endif -#import "GoogleMapController.h" +#import "./include/google_maps_flutter_ios/GoogleMapController.h" -#import "FGMMarkerUserData.h" -#import "FLTGoogleMapHeatmapController.h" -#import "FLTGoogleMapJSONConversions.h" -#import "FLTGoogleMapTileOverlayController.h" -#import "messages.g.h" +#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.h" +#import "./include/google_maps_flutter_ios/messages.g.h" #pragma mark - Conversion of JSON-like values sent via platform channels. Forward declarations. diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m index cfbc9392159f..760f5497d897 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m @@ -4,8 +4,8 @@ #import "GoogleMapMarkerController.h" -#import "FGMMarkerUserData.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapMarkerController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m index 46d7234c085d..021edc6887f9 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolygonController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/GoogleMapPolygonController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapPolygonController () diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m index 16643b5e7e49..d1a039674c08 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapPolylineController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/GoogleMapPolylineController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapPolylineController () From e4df7de93ffaa9a9bba38703935da8284a5f337a Mon Sep 17 00:00:00 2001 From: Alexander Troshkov <20989940+aednlaxer@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:21:10 +0200 Subject: [PATCH 2/4] Add conditional imports --- .../example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m | 2 ++ .../ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m | 2 ++ .../RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m | 2 ++ .../ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m | 2 ++ .../example/ios14/ios/RunnerTests/GoogleMapsTests.m | 2 ++ .../example/ios15/ios/RunnerTests/GoogleMapsTests.m | 2 ++ 6 files changed, 12 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m index 811f09d49b45..9a76c9d1b74c 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; #import #import diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m index 8d435eb4941c..b3a55d2d915d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; @import GoogleMaps; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m index cb7c63a72768..34d3dc204a2a 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; @import GoogleMaps; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m index edb0ed03096d..87d4a5d2f3cc 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; @import GoogleMaps; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m index c175550dd2cf..cbbbf57e5eff 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; @import GoogleMaps; diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m index c175550dd2cf..cbbbf57e5eff 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m @@ -3,7 +3,9 @@ // found in the LICENSE file. @import google_maps_flutter_ios; +#if __has_include() @import google_maps_flutter_ios.Test; +#endif @import XCTest; @import GoogleMaps; From be7c5b76533d1740d8a4a589b4e9948672300e62 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Tue, 4 Feb 2025 11:23:47 +0200 Subject: [PATCH 3/4] Add missing buildPhase to ios14 example app --- .../ios/Runner.xcodeproj/project.pbxproj | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj index b59580322983..bd75585b51c7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj @@ -242,6 +242,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */, + 65FA8ABC2DB1E3267F397BFC /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -386,6 +387,24 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 65FA8ABC2DB1E3267F397BFC /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 74BF216DF17B0C7F983459BD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; From 8d64236d53ac12b37972896f05ac584e66fddc52 Mon Sep 17 00:00:00 2001 From: Joonas Kerttula Date: Mon, 17 Feb 2025 13:56:19 +0200 Subject: [PATCH 4/4] Use relative imports on all header imports --- .../google_maps_flutter_ios/FGMClusterManagersController.m | 3 +-- .../Sources/google_maps_flutter_ios/GoogleMapController.m | 1 - .../google_maps_flutter_ios/GoogleMapMarkerController.m | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m index 0e066bc9b928..b212623654df 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FGMClusterManagersController.h" - +#import "./include/google_maps_flutter_ios/FGMClusterManagersController.h" #import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" #import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" 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 72d7d198c470..a616d2e17076 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 @@ -12,7 +12,6 @@ #endif #import "./include/google_maps_flutter_ios/GoogleMapController.h" - #import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" #import "./include/google_maps_flutter_ios/FLTGoogleMapHeatmapController.h" #import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m index 760f5497d897..c02bac9f43f7 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapMarkerController.h" - +#import "./include/google_maps_flutter_ios/GoogleMapMarkerController.h" #import "./include/google_maps_flutter_ios/FGMMarkerUserData.h" #import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h"