Converted code to swift 5 + bumped version number.

Author: LuisThein

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.6+2
+
+* Converted iOS code to swift 5.
+
 ## 0.0.6+1
 
 * Changed annotation initialisation, fixes custom annotation icons not showing up on the map.

example/ios/Runner.xcodeproj/project.pbxproj

@@ -181,7 +181,7 @@
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = PT2UDFM269;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1100;
 					};
 				};
 			};
@@ -389,7 +389,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = de.luisthein.appleMapsFlutterExample2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -526,7 +526,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -555,7 +555,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

example/ios/Runner/AppDelegate.swift

@@ -5,7 +5,7 @@ import Flutter
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)

example/pubspec.lock

@@ -14,7 +14,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.6+1"
+    version: "0.0.6+2"
   args:
     dependency: transitive
     description:

ios/Classes/FlutterMapView.swift

@@ -114,7 +114,7 @@ class FlutterMapView: MKMapView, UIGestureRecognizerDelegate {
         self.isMyLocationButtonShowing = visible
         if visible {
            let image = UIImage(named: "outline_near_me")
-           let locationButton = UIButton(type: UIButtonType.custom) as UIButton
+           let locationButton = UIButton(type: UIButton.ButtonType.custom) as UIButton
            locationButton.tag = 100
            locationButton.layer.cornerRadius = 5
            locationButton.frame = CGRect(origin: CGPoint(x: self.bounds.width - 45, y: self.bounds.height - 45), size: CGSize(width: 40, height: 40))
@@ -191,7 +191,7 @@ class FlutterMapView: MKMapView, UIGestureRecognizerDelegate {
             var nearestPoly: FlutterPolyline? = nil
             for overlay: MKOverlay in self.overlays {
                 if overlay is FlutterPolyline {
-                    let distance: Float = Float(distanceOf(pt: MKMapPointForCoordinate(coord), toPoly: overlay as! MKPolyline))
+                    let distance: Float = Float(distanceOf(pt: MKMapPoint.init(coord), toPoly: overlay as! MKPolyline))
                     if distance < nearestDistance {
                         nearestDistance = distance
                         nearestPoly = (overlay as! FlutterPolyline)
@@ -246,10 +246,10 @@ class FlutterMapView: MKMapView, UIGestureRecognizerDelegate {
                 ptClosest = ptB
             }
             else {
-                ptClosest = MKMapPointMake(ptA.x + u * xDelta, ptA.y + u * yDelta)
+                ptClosest = MKMapPoint.init(x: ptA.x + u * xDelta, y: ptA.y + u * yDelta)
             }
 
-            distance = min(distance, MKMetersBetweenMapPoints(ptClosest, pt))
+            distance = min(distance, ptClosest.distance(to: pt))
         }
         return distance
     }
@@ -258,6 +258,6 @@ class FlutterMapView: MKMapView, UIGestureRecognizerDelegate {
         let ptB = CGPoint(x: pt.x + CGFloat(px), y: pt.y)
         let coordA: CLLocationCoordinate2D = self.convert(pt, toCoordinateFrom: self)
         let coordB: CLLocationCoordinate2D = self.convert(ptB, toCoordinateFrom: self)
-        return MKMetersBetweenMapPoints(MKMapPointForCoordinate(coordA), MKMapPointForCoordinate(coordB))
+        return MKMapPoint.init(coordA).distance(to: MKMapPoint.init(coordB))
     }
 }

ios/Classes/MapViewExtension.swift

@@ -139,7 +139,7 @@ public extension MKMapView {
 
         // use the zoom level to compute the region
         let span = self.coordinateSpanWithMapView(centerCoordinate: centerCoordinate, zoomLevel: Int(zoomL))
-        let region = MKCoordinateRegionMake(centerCoordinate, span)
+        let region = MKCoordinateRegion.init(center: centerCoordinate, span: span)
 
         // set the region like normal
         self.setRegion(region, animated: animated)
@@ -181,7 +181,7 @@ public extension MKMapView {
         let latitudeDelta = -1 * (maxLat - minLat)
 
         // create and return the lat/lng span
-        return MKCoordinateSpanMake(latitudeDelta, longitudeDelta)
+        return MKCoordinateSpan.init(latitudeDelta: latitudeDelta, longitudeDelta: longitudeDelta)
     }
 
     @available(iOS 9.0, *)
@@ -207,7 +207,7 @@ public extension MKMapView {
         let maxLat = pixelSpaceYToLatitude(pixelY: topLeftPixelY + scaledMapHeight)
         let topBottom = CLLocationCoordinate2D.init(latitude: maxLat, longitude: centerCoordinate.longitude)
 
-        let distance = MKMetersBetweenMapPoints(MKMapPointForCoordinate(centerCoordinate), MKMapPointForCoordinate(topBottom))
+        let distance = MKMapPoint.init(centerCoordinate).distance(to: MKMapPoint.init(topBottom))
         let altitude = distance / tan(.pi*(15/180.0))
 
         return altitude

ios/Classes/PolylineController.swift

@@ -62,7 +62,7 @@ class PolylineController {
         for _polyline in data {
             let polylineData :Dictionary<String, Any> = _polyline as! Dictionary<String, Any>
             let polyline = FlutterPolyline(fromDictionaray: polylineData)
-            mapView.add(polyline)
+            mapView.addOverlay(polyline)
         }
     }
 
@@ -88,15 +88,15 @@ class PolylineController {
         for overlay in mapView.overlays {
             if let polyline = overlay as? FlutterPolyline {
                 if polylineIds.contains(polyline.id!) {
-                    mapView.remove(polyline)
+                    mapView.removeOverlay(polyline)
                 }
             }
         }
     }
 
     private func updatePolylinesOnMap(oldPolyline: FlutterPolyline, newPolyline: FlutterPolyline) {
-        mapView.remove(oldPolyline)
-        mapView.add(newPolyline)
+        mapView.removeOverlay(oldPolyline)
+        mapView.addOverlay(newPolyline)
     }
 
     private func linePatternToArray(patternData: NSArray?, lineWidth: CGFloat?) -> [NSNumber] {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: apple_maps_flutter
 description: This plugin uses the Flutter platform view to display an Apple Maps widget.
-version: 0.0.6+1
+version: 0.0.6+2
 author: Luis Thein <luis.thein@gmx.de>
 homepage: https://github.com/LuisThein