From 5daebd2be1c8e8ada6a59b50d2bbf2e936a8fc5e Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Thu, 2 May 2024 15:56:21 -0500 Subject: [PATCH 1/6] Convert google_maps_flutter_ios into a Swift Package --- .../example/ios14/ios/Podfile | 2 - .../ios/Runner.xcodeproj/project.pbxproj | 29 ++++++++++++- .../xcshareddata/swiftpm/Package.resolved | 22 ++++++++++ .../xcshareddata/swiftpm/Package.resolved | 22 ++++++++++ .../ios/Assets/.gitkeep | 0 .../ios/google_maps_flutter_ios.podspec | 8 ++-- .../ios/google_maps_flutter_ios/Package.swift | 41 +++++++++++++++++++ .../FLTGoogleMapJSONConversions.m | 2 +- .../FLTGoogleMapTileOverlayController.m | 4 +- .../FLTGoogleMapsPlugin.m | 2 +- .../GoogleMapCircleController.m | 4 +- .../GoogleMapController.m | 6 +-- .../GoogleMapMarkerController.m | 4 +- .../GoogleMapPolygonController.m | 4 +- .../GoogleMapPolylineController.m | 4 +- .../Resources/PrivacyInfo.xcprivacy | 0 .../google_maps_flutter_ios-umbrella.h | 0 .../google_maps_flutter_ios.modulemap | 0 .../FLTGoogleMapJSONConversions.h | 0 .../FLTGoogleMapTileOverlayController.h | 0 .../FLTGoogleMapsPlugin.h | 0 .../GoogleMapCircleController.h | 0 .../GoogleMapController.h | 0 .../GoogleMapController_Test.h | 0 .../GoogleMapMarkerController.h | 0 .../GoogleMapPolygonController.h | 0 .../GoogleMapPolylineController.h | 0 .../include/module.modulemap | 10 +++++ 28 files changed, 142 insertions(+), 22 deletions(-) create mode 100644 packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved 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}/FLTGoogleMapJSONConversions.m (98%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapTileOverlayController.m (98%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/FLTGoogleMapsPlugin.m (91%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapCircleController.m (97%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapController.m (99%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapMarkerController.m (98%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapPolygonController.m (97%) rename packages/google_maps_flutter/google_maps_flutter_ios/ios/{Classes => google_maps_flutter_ios/Sources/google_maps_flutter_ios}/GoogleMapPolylineController.m (97%) 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}/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}/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%) create mode 100644 packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/module.modulemap diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Podfile b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Podfile index a5cfb3f7bfb..3beecefdf7d 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Podfile +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Podfile @@ -31,8 +31,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/ios14/ios/Runner.xcodeproj/project.pbxproj b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.pbxproj index d5b6d8248e0..463ec0d5a72 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 @@ -13,13 +13,14 @@ 4510D964F3B1259FEDD3ABA6 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7755F8F4BABC3D6A0BD4048B /* libPods-Runner.a */; }; 6851F3562835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6851F3552835BC180032B7C8 /* FLTGoogleMapJSONConversionsConversionTests.m */; }; 68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 68E472692836FF0C00BDDDAC /* MapKit.framework */; }; + 78521A5F2BE43055004D1DC1 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 78521A5E2BE43055004D1DC1 /* OCMock */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - F269303B2BB389BF00BF17C4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = F269303A2BB389BF00BF17C4 /* assets */; }; 982F2A6C27BADE17003C81F4 /* PartiallyMockedMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 982F2A6B27BADE17003C81F4 /* PartiallyMockedMapView.m */; }; + F269303B2BB389BF00BF17C4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = F269303A2BB389BF00BF17C4 /* assets */; }; F7151F13265D7ED70028CB91 /* GoogleMapsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F12265D7ED70028CB91 /* GoogleMapsTests.m */; }; F7151F21265D7EE50028CB91 /* GoogleMapsUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7151F20265D7EE50028CB91 /* GoogleMapsUITests.m */; }; FC8F35FC8CD533B128950487 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F267F68029D1A4E2E4C572A7 /* libPods-RunnerTests.a */; }; @@ -103,6 +104,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78521A5F2BE43055004D1DC1 /* OCMock in Frameworks */, 68E4726A2836FF0C00BDDDAC /* MapKit.framework in Frameworks */, FC8F35FC8CD533B128950487 /* libPods-RunnerTests.a in Frameworks */, ); @@ -260,6 +262,9 @@ F7151F16265D7ED70028CB91 /* PBXTargetDependency */, ); name = RunnerTests; + packageProductDependencies = ( + 78521A5E2BE43055004D1DC1 /* OCMock */, + ); productName = RunnerTests; productReference = F7151F10265D7ED70028CB91 /* RunnerTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -315,6 +320,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 78521A5D2BE43055004D1DC1 /* XCRemoteSwiftPackageReference "ocmock" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -784,6 +792,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 78521A5D2BE43055004D1DC1 /* XCRemoteSwiftPackageReference "ocmock" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/erikdoe/ocmock"; + requirement = { + kind = revision; + revision = afd2c6924e8a36cb872bc475248b978f743c6050; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78521A5E2BE43055004D1DC1 /* OCMock */ = { + isa = XCSwiftPackageProductDependency; + package = 78521A5D2BE43055004D1DC1 /* XCRemoteSwiftPackageReference "ocmock" */; + productName = OCMock; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000000..a551e8fa963 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,22 @@ +{ + "pins" : [ + { + "identity" : "ios-maps-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googlemaps/ios-maps-sdk", + "state" : { + "revision" : "bd392d7d844b49ec6795871a3c25edd01ab839f2", + "version" : "8.4.0" + } + }, + { + "identity" : "ocmock", + "kind" : "remoteSourceControl", + "location" : "https://github.com/erikdoe/ocmock", + "state" : { + "revision" : "afd2c6924e8a36cb872bc475248b978f743c6050" + } + } + ], + "version" : 2 +} diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000000..a551e8fa963 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,22 @@ +{ + "pins" : [ + { + "identity" : "ios-maps-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googlemaps/ios-maps-sdk", + "state" : { + "revision" : "bd392d7d844b49ec6795871a3c25edd01ab839f2", + "version" : "8.4.0" + } + }, + { + "identity" : "ocmock", + "kind" : "remoteSourceControl", + "location" : "https://github.com/erikdoe/ocmock", + "state" : { + "revision" : "afd2c6924e8a36cb872bc475248b978f743c6050" + } + } + ], + "version" : 2 +} 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 e69de29bb2d..00000000000 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 adf0f706089..bc5cdc819d8 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 @@ -28,5 +28,5 @@ Downloaded by pub (not CocoaPods). s.static_framework = true s.platform = :ios, '14.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - 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 00000000000..7b397724fa8 --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Package.swift @@ -0,0 +1,41 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "google_maps_flutter_ios", + platforms: [ + .iOS("14.0"), + .macOS("10.14") + ], + products: [ + .library(name: "google-maps-flutter-ios", type: .static, targets: ["google_maps_flutter_ios"]) + ], + dependencies: [ + // 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 + // in https://github.com/flutter/flutter/issues/86820 for why this should be as + // broad as possible. + // Versions earlier than 8.4 can't be supported because that's the first version + // that supports privacy manifests. + .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") + ], + targets: [ + .target( + name: "google_maps_flutter_ios", + dependencies: [ + .product(name: "GoogleMaps", package: "ios-maps-sdk"), + .product(name: "GoogleMapsBase", package: "ios-maps-sdk"), + .product(name: "GoogleMapsCore", package: "ios-maps-sdk") + ], + exclude: ["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/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 98% 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 index d554c501b1e..58cf7ff6968 100644 --- 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 @@ -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 "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @implementation FLTGoogleMapJSONConversions 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 98% 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 index 73eab6c1ead..773f8a9fb1a 100644 --- 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 @@ -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/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 91% 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 index 70bde9022a0..bcf39b6977d 100644 --- 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 @@ -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/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 97% 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 index 53bf69075c9..1cd5000b40a 100644 --- 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 @@ -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/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 99% 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 index 4c747f3eeba..224dd9733a4 100644 --- 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 @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "GoogleMapController.h" -#import "FLTGoogleMapJSONConversions.h" -#import "FLTGoogleMapTileOverlayController.h" +#import "./include/google_maps_flutter_ios/GoogleMapController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapTileOverlayController.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/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 98% 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 index dd07e791a88..24f6c2b2383 100644 --- 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 @@ -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 "GoogleMapMarkerController.h" -#import "FLTGoogleMapJSONConversions.h" +#import "./include/google_maps_flutter_ios/GoogleMapMarkerController.h" +#import "./include/google_maps_flutter_ios/FLTGoogleMapJSONConversions.h" @interface FLTGoogleMapMarkerController () 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 97% 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 index 398adfcacec..5c50624fa07 100644 --- 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 @@ -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/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 97% 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 index 77601d4a1bb..8bf8379995e 100644 --- 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 @@ -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 () 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/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/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/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/module.modulemap b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/module.modulemap new file mode 100644 index 00000000000..a2d6c5414da --- /dev/null +++ b/packages/google_maps_flutter/google_maps_flutter_ios/ios/google_maps_flutter_ios/Sources/google_maps_flutter_ios/include/module.modulemap @@ -0,0 +1,10 @@ +module google_maps_flutter_ios { + umbrella header "google_maps_flutter_ios-umbrella.h" + + export * + module * { export * } + + explicit module Test { + header "./google_maps_flutter_ios/GoogleMapController_Test.h" + } +} From 97ae15ef98209c328854645fe1f897c01a2cd768 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Thu, 2 May 2024 16:01:42 -0500 Subject: [PATCH 2/6] Format Package.swift and update changelog and version --- .../google_maps_flutter_ios/CHANGELOG.md | 4 ++ .../ios/google_maps_flutter_ios/Package.swift | 68 +++++++++---------- .../google_maps_flutter_ios/pubspec.yaml | 2 +- 3 files changed, 39 insertions(+), 35 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 cf9231d6a0a..024cf6f0433 100644 --- a/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md +++ b/packages/google_maps_flutter/google_maps_flutter_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.6.1 + +* Adds Swift Package Manager compatibility. + ## 2.6.0 * Updates the minimum allowed verison of the Google Maps SDK to 8.4, for privacy 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 index 7b397724fa8..13078f812b9 100644 --- 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 @@ -4,38 +4,38 @@ import PackageDescription let package = Package( - name: "google_maps_flutter_ios", - platforms: [ - .iOS("14.0"), - .macOS("10.14") - ], - products: [ - .library(name: "google-maps-flutter-ios", type: .static, targets: ["google_maps_flutter_ios"]) - ], - dependencies: [ - // 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 - // in https://github.com/flutter/flutter/issues/86820 for why this should be as - // broad as possible. - // Versions earlier than 8.4 can't be supported because that's the first version - // that supports privacy manifests. - .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") - ], - targets: [ - .target( - name: "google_maps_flutter_ios", - dependencies: [ - .product(name: "GoogleMaps", package: "ios-maps-sdk"), - .product(name: "GoogleMapsBase", package: "ios-maps-sdk"), - .product(name: "GoogleMapsCore", package: "ios-maps-sdk") - ], - exclude: ["include/google_maps_flutter_ios.modulemap"], - resources: [ - .process("Resources") - ], - cSettings: [ - .headerSearchPath("include/google_maps_flutter_ios") - ] - ) - ] + name: "google_maps_flutter_ios", + platforms: [ + .iOS("14.0"), + .macOS("10.14"), + ], + products: [ + .library(name: "google-maps-flutter-ios", type: .static, targets: ["google_maps_flutter_ios"]) + ], + dependencies: [ + // 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 + // in https://github.com/flutter/flutter/issues/86820 for why this should be as + // broad as possible. + // Versions earlier than 8.4 can't be supported because that's the first version + // that supports privacy manifests. + .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") + ], + targets: [ + .target( + name: "google_maps_flutter_ios", + dependencies: [ + .product(name: "GoogleMaps", package: "ios-maps-sdk"), + .product(name: "GoogleMapsBase", package: "ios-maps-sdk"), + .product(name: "GoogleMapsCore", package: "ios-maps-sdk"), + ], + exclude: ["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/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml index e98f7209380..df74168cb10 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.6.0 +version: 2.6.1 environment: sdk: ^3.2.3 From 98cc04de82d216f901f35fd77dc9bbf7d0b93636 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Thu, 2 May 2024 16:34:07 -0500 Subject: [PATCH 3/6] add license --- .../ios/google_maps_flutter_ios/Package.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 index 13078f812b9..b1a766d789a 100644 --- 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 @@ -1,5 +1,8 @@ // 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 From e868476502aab787a44ad57ad8f2ef49fd750cd5 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 6 May 2024 12:39:18 -0500 Subject: [PATCH 4/6] run drive in verbose to try and debug --- script/tool/lib/src/drive_examples_command.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart index f3baa5c7cee..15532265b22 100644 --- a/script/tool/lib/src/drive_examples_command.dart +++ b/script/tool/lib/src/drive_examples_command.dart @@ -110,7 +110,7 @@ class DriveExamplesCommand extends PackageLoopingCommand { _targetDeviceFlags = >{ if (getBoolArg(platformAndroid)) platformAndroid: ['-d', androidDevice!], - if (getBoolArg(platformIOS)) platformIOS: ['-d', iOSDevice!], + if (getBoolArg(platformIOS)) platformIOS: ['-d', iOSDevice!, '-v'], if (getBoolArg(platformLinux)) platformLinux: ['-d', 'linux'], if (getBoolArg(platformMacOS)) platformMacOS: ['-d', 'macos'], if (getBoolArg(platformWeb)) From 7ccd679fb40c23548b3fc5a81320f76ba73a6182 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Fri, 10 May 2024 11:02:50 -0500 Subject: [PATCH 5/6] temporary try new swift package --- .../ios/google_maps_flutter_ios/Package.swift | 10 ++++++---- script/tool/lib/src/build_examples_command.dart | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) 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 index b1a766d789a..e028322579a 100644 --- 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 @@ -22,15 +22,17 @@ let package = Package( // broad as possible. // Versions earlier than 8.4 can't be supported because that's the first version // that supports privacy manifests. - .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") +// .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") + .package(url: "https://github.com/dogahe/DogaheMaps", exact: "1.0.26") ], targets: [ .target( name: "google_maps_flutter_ios", dependencies: [ - .product(name: "GoogleMaps", package: "ios-maps-sdk"), - .product(name: "GoogleMapsBase", package: "ios-maps-sdk"), - .product(name: "GoogleMapsCore", package: "ios-maps-sdk"), + .product(name: "GoogleMaps", package: "DogaheMaps") +// .product(name: "GoogleMaps", package: "ios-maps-sdk"), +// .product(name: "GoogleMapsBase", package: "ios-maps-sdk"), +// .product(name: "GoogleMapsCore", package: "ios-maps-sdk"), ], exclude: ["include/google_maps_flutter_ios.modulemap"], resources: [ diff --git a/script/tool/lib/src/build_examples_command.dart b/script/tool/lib/src/build_examples_command.dart index d8d1613e06d..ac3b9db1c81 100644 --- a/script/tool/lib/src/build_examples_command.dart +++ b/script/tool/lib/src/build_examples_command.dart @@ -77,7 +77,7 @@ class BuildExamplesCommand extends PackageLoopingCommand { 'iOS', pluginPlatform: platformIOS, flutterBuildType: _flutterBuildTypeIOS, - extraBuildFlags: ['--no-codesign'], + extraBuildFlags: ['--no-codesign', '-v'], ), platformLinux: const _PlatformDetails( 'Linux', From dad9f3a74f4093fbc4bf85e7965768d9b8b59150 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Fri, 10 May 2024 11:36:04 -0500 Subject: [PATCH 6/6] try forked version --- .../ios/google_maps_flutter_ios/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index e028322579a..62f856b8d00 100644 --- 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 @@ -23,7 +23,7 @@ let package = Package( // Versions earlier than 8.4 can't be supported because that's the first version // that supports privacy manifests. // .package(url: "https://github.com/googlemaps/ios-maps-sdk", "8.4.0"..<"9.0.0") - .package(url: "https://github.com/dogahe/DogaheMaps", exact: "1.0.26") + .package(url: "https://github.com/vashworth/DogaheMaps", revision: "7cb209f67da64d11e128949ed3d7a356867a2c6c") ], targets: [ .target(