fix issue with flutter 3.27

CHANGELOG.md

@@ -1,147 +1,153 @@
 # Changelog
 
+## 1.5.0
+
+- Swift Package Manager support (requires Flutter 3.44+); CocoaPods podspec kept in sync
+
 ## 1.4.0
 
-* Flutter 3.27.1 compatibility, replace `ui.hash*` with `Object.hash*
+- Flutter 3.27.1 compatibility, replace `ui.hash*` with `Object.hash\*
 
 ## 1.3.0
 
-* Animate marker position changes instead of removing and re-adding
-* Fix Fatal error: Attempted to read an unowned reference but the object was already deallocated
-* Fixed an issue where onCameraMove was not invoked by double-tapping
-* Added insetsLayoutMarginsFromSafeArea
+- Animate marker position changes instead of removing and re-adding
+- Fix Fatal error: Attempted to read an unowned reference but the object was already deallocated
+- Fixed an issue where onCameraMove was not invoked by double-tapping
+- Added insetsLayoutMarginsFromSafeArea
 
 ## 1.2.0
 
-* Added a `markerAnnotationWithHue()` and `pinAnnotationWithHue()` method to allow custom marker/pin colors
+- Added a `markerAnnotationWithHue()` and `pinAnnotationWithHue()` method to allow custom marker/pin colors
 
 ## 1.1.0
 
-* Added Annotation zIndex
-* Added posibility to take snapshots of the map
+- Added Annotation zIndex
+- Added posibility to take snapshots of the map
 
 ## 1.0.3
 
-* Fixes an issue where mapController.moveCamera would animate the camera transition
-* To animate a camera movement, mapController.animateCamera should be used instead
+- Fixes an issue where mapController.moveCamera would animate the camera transition
+- To animate a camera movement, mapController.animateCamera should be used instead
 
 ## 1.0.2
 
-* Removed Android folder to fix build failures
+- Removed Android folder to fix build failures
 
 ## 1.0.1
 
-* Fixes memory leak
-* Adds ability to take snapshots of the map
+- Fixes memory leak
+- Adds ability to take snapshots of the map
+
 ## 1.0.0
 
 Thanks to @jonbhanson
-* Adds null safety.
-* Refreshes the example app.
-* Updates .gitignore and removes files that should not be tracked.
+
+- Adds null safety.
+- Refreshes the example app.
+- Updates .gitignore and removes files that should not be tracked.
 
 ## 0.1.4
 
-* Animate to bounds was added. (Thanks to @nghiashiyi)
-* Fixed an issue where the user location was only displayed in `authorizationInUse` status. (Thanks to @zgosalvez)
+- Animate to bounds was added. (Thanks to @nghiashiyi)
+- Fixed an issue where the user location was only displayed in `authorizationInUse` status. (Thanks to @zgosalvez)
 
-* minor fixes
+- minor fixes
 
 ## 0.1.3
 
-* Thanks to @maxiundtesa the getter for the current zoomLevel was added
-* iOS build failure for Flutter modules was fixed
+- Thanks to @maxiundtesa the getter for the current zoomLevel was added
+- iOS build failure for Flutter modules was fixed
 
 ## 0.1.2+5
 
-* Fixed build failure
-* Added anchor param to Annotation
-* Added missing comparison of Overlay coordinates, which caused
+- Fixed build failure
+- Added anchor param to Annotation
+- Added missing comparison of Overlay coordinates, which caused
   Circles, Annotations, Polylines and Ploygons to not update correctly
   on coordinate changes.
 
 ## 0.1.2+4
 
-* Added configurable Anchor for infoWindows
+- Added configurable Anchor for infoWindows
 
 ## 0.1.2+3
 
-* Fixed the offset of custom markers
+- Fixed the offset of custom markers
 
 ## 0.1.2+2
 
-* Fixed the onTap event for Annotation Callouts
+- Fixed the onTap event for Annotation Callouts
 
 ## 0.1.2+1
 
-* Added custom annotation icons from byte data
-* Fixed scaling of icons from assets => see: https://flutter.dev/docs/development/ui/assets-and-images#declaring-resolution-aware-image-assets
+- Added custom annotation icons from byte data
+- Fixed scaling of icons from assets => see: https://flutter.dev/docs/development/ui/assets-and-images#declaring-resolution-aware-image-assets
 
 ## 0.1.2
 
-* Annotation rework:
-   * onTap for InfoWindow added
-   * Multiline InfoWindow subtitle support
-   * Overall Annotation handling refactored
-   * Correct UserTracking Button added
+- Annotation rework:
+  - onTap for InfoWindow added
+  - Multiline InfoWindow subtitle support
+  - Overall Annotation handling refactored
+  - Correct UserTracking Button added
 
 ## 0.1.1+2
 
-* Fixed map freezing when setState is being called
+- Fixed map freezing when setState is being called
 
 ## 0.1.1+1
 
-* Fixed Polygon and Circle Tap events.
+- Fixed Polygon and Circle Tap events.
 
 ## 0.1.1
 
-* Added markerAnnotation as selectable annotation type.
+- Added markerAnnotation as selectable annotation type.
 
 ## 0.1.0
 
-* Added ability to place circles on the map.
+- Added ability to place circles on the map.
 
 ## 0.0.7
 
-* Added ability to place polygons on the map.
+- Added ability to place polygons on the map.
 
 ## 0.0.6+4
 
-* Fixed build issues
+- Fixed build issues
 
 ## 0.0.6+3
 
-* Fixes issue #6, location permission is only requested if it's actually used.
+- Fixes issue #6, location permission is only requested if it's actually used.
 
 ## 0.0.6+2
 
-* Converted iOS code to swift 5.
+- Converted iOS code to swift 5.
 
 ## 0.0.6+1
 
-* Changed annotation initialisation, fixes custom annotation icons not showing up on the map.
+- Changed annotation initialisation, fixes custom annotation icons not showing up on the map.
 
 ## 0.0.6
 
-* Added ability to add padding to the map
+- Added ability to add padding to the map
 
 ## 0.0.5
 
-* Added ability to place polylines.
+- Added ability to place polylines.
 
 ## 0.0.4
 
-* Fixed error when updating Annotations on map.
+- Fixed error when updating Annotations on map.
 
 ## 0.0.3
 
-* Added getter for visible map region.
+- Added getter for visible map region.
 
 ## 0.0.2
 
-* Added zoomBy functionality.
-* Added setter for min and max zoom levels.
+- Added zoomBy functionality.
+- Added setter for min and max zoom levels.
 
 ## 0.0.1
 
-* Initial release.
+- Initial release.

example/android/.project

@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1601924530843</id>
+			<id>1792504847059</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

example/ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>9.0</string>
 </dict>
 </plist>

example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift

@@ -0,0 +1,25 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+// Generated file. Do not edit.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "FlutterGeneratedPluginSwiftPackage",
+    platforms: [
+        .iOS("15.0")
+    ],
+    products: [
+        .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
+    ],
+    dependencies: [
+
+    ],
+    targets: [
+        .target(
+            name: "FlutterGeneratedPluginSwiftPackage"
+        )
+    ]
+)

example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift

@@ -0,0 +1,3 @@
+//
+// Generated file. Do not edit.
+//

example/ios/Flutter/ephemeral/flutter_lldb_helper.py

@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")

example/ios/Flutter/ephemeral/flutter_lldbinit

@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py

example/ios/Flutter/ephemeral/flutter_native_integration.env

@@ -0,0 +1,13 @@
+FLUTTER_ROOT=/Users/admin/Development/flutter
+FLUTTER_APPLICATION_PATH=/Users/admin/Projects/apple_maps_flutter/example
+FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=/Users/admin/Projects/apple_maps_flutter/example/ios/Flutter/ephemeral/Packages/.packages/FlutterFramework
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=1.0.0
+FLUTTER_BUILD_NUMBER=1
+DART_DEFINES=RkxVVFRFUl9CVUlMRF9OQU1FPTEuMC4w,RkxVVFRFUl9CVUlMRF9OVU1CRVI9MQ==,RkxVVFRFUl9WRVJTSU9OPTMuNDcuNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049YWJhZjljNTIzNw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049ZGViMjg3NDgxZQ==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMy41
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=false
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=/Users/admin/Projects/apple_maps_flutter/example/.dart_tool/package_config.json

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Podfile.lock

@@ -1,22 +1,16 @@
 PODS:
-  - apple_maps_flutter (0.0.1):
-    - Flutter
   - Flutter (1.0.0)
 
 DEPENDENCIES:
-  - apple_maps_flutter (from `.symlinks/plugins/apple_maps_flutter/ios`)
   - Flutter (from `Flutter`)
 
 EXTERNAL SOURCES:
-  apple_maps_flutter:
-    :path: ".symlinks/plugins/apple_maps_flutter/ios"
   Flutter:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  apple_maps_flutter: c59725efea39e13e703cde52a1d2b14866ad68a8
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: 71a624a5bc0c04062bf19101d501e466baf2fb47
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: a938cb79d452854fa9f13c14ded5e356e38f0fc7
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.16.2