Skip to content

SPM: address PR comments #17

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
wants to merge 4 commits into
base: feat/google-maps-flutter-add-swift-package-manager-support
Choose a base branch
from
Open

SPM: address PR comments #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65bc23c
Use relative import paths
aednlaxer Jan 29, 2025
e4df7de
Add conditional imports
aednlaxer Jan 29, 2025
be7c5b7
Add missing buildPhase to ios14 example app
jokerttu Feb 4, 2025
8d64236
Use relative imports on all header imports
jokerttu Feb 17, 2025
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
19 changes: 19 additions & 0 deletions ...e_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
BB6BD9A1101E970BEF85B6D2 /* [CP] Copy Pods Resources */,
65FA8ABC2DB1E3267F397BFC /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ..._flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/ExtractIconFromDataTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
#import <OCMock/OCMock.h>
#import <google_maps_flutter_ios/GoogleMapMarkerController_Test.h>
Expand Down
2 changes: 2 additions & 0 deletions ...google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
@import GoogleMaps;

Expand Down
2 changes: 2 additions & 0 deletions ...ps_flutter_ios/example/ios14/ios/RunnerTests/FLTGoogleMapJSONConversionsConversionTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
@import GoogleMaps;

Expand Down
2 changes: 2 additions & 0 deletions ...oogle_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsPolylinesControllerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
@import GoogleMaps;

Expand Down
2 changes: 2 additions & 0 deletions ...ogle_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/GoogleMapsTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
@import GoogleMaps;

Expand Down
2 changes: 2 additions & 0 deletions ...ogle_maps_flutter/google_maps_flutter_ios/example/ios15/ios/RunnerTests/GoogleMapsTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// found in the LICENSE file.

@import google_maps_flutter_ios;
#if __has_include(<google_maps_flutter_ios/google_maps_flutter_ios-umbrella.h>)
@import google_maps_flutter_ios.Test;
#endif
@import XCTest;
@import GoogleMaps;

Expand Down
7 changes: 3 additions & 4 deletions ...os/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMClusterManagersController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#import "FGMClusterManagersController.h"

#import "FGMMarkerUserData.h"
#import "FLTGoogleMapJSONConversions.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"

@interface FGMClusterManagersController ()

Expand Down
2 changes: 1 addition & 1 deletion ...utter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FGMMarkerUserData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...s/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapHeatmapController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapJSONConversions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ...ogle_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down
2 changes: 1 addition & 1 deletion ...ter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/FLTGoogleMapsPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...s/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapCircleController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down
13 changes: 6 additions & 7 deletions ...ter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
@import GoogleMapsUtilsObjC;
#endif

#import "GoogleMapController.h"

#import "FGMMarkerUserData.h"
#import "FLTGoogleMapHeatmapController.h"
#import "FLTGoogleMapJSONConversions.h"
#import "FLTGoogleMapTileOverlayController.h"
#import "messages.g.h"
#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"
#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.

Expand Down
7 changes: 3 additions & 4 deletions ...s/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapMarkerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#import "GoogleMapMarkerController.h"

#import "FGMMarkerUserData.h"
#import "FLTGoogleMapJSONConversions.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"

@interface FLTGoogleMapMarkerController ()

Expand Down
4 changes: 2 additions & 2 deletions .../ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolygonController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down
4 changes: 2 additions & 2 deletions ...ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/GoogleMapPolylineController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()

Expand Down