Issue #8: Update GEOSwift pod version

.travis.yml

@@ -2,21 +2,21 @@ language: objective-c
 
 before_install:
   - gem install xcpretty
-  - gem install cocoapods -v '1.2.1'
+  - gem install cocoapods -v '1.5.0'
   - pod repo update
 
-osx_image: xcode9
+osx_image: xcode10
 
 cache: cocoapods
 
 env:
   global:
     - WORKSPACE=GEOSwiftMapboxGL.xcworkspace
     - SCHEME=GEOSwiftMapboxGL
-    - SDK=iphonesimulator11.0
+    - SDK=iphonesimulator12.0
   matrix:
     # - DESTINATION="OS=10.3,name=iPhone 6"
-    - DESTINATION="OS=11.0,name=iPhone 6"
+    - DESTINATION="OS=12.0,name=iPhone 6"
     # - DESTINATION="OS=8.3,name=iPhone 6"
 
 script:

GEOSwiftMapboxGL.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "8.0"
 
-  s.dependency "GEOSwift", '~> 2.2'
+  s.dependency "GEOSwift", '3.0.2'
   s.dependency "Mapbox-iOS-SDK"
 
 end

GEOSwiftMapboxGL.xcodeproj/project.pbxproj

@@ -10,7 +10,7 @@
 		335C11A98B9F38F1FD0BADB2 /* Pods_GEOSwiftMapboxGLTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC30B2E0DB51B308F3F23D7D /* Pods_GEOSwiftMapboxGLTests.framework */; };
 		551999F5C39D78A8B1ED459F /* Pods_GEOSwiftMapboxGLTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD09AA7006799E426866956 /* Pods_GEOSwiftMapboxGLTests.framework */; };
 		5F0DC22FA0C1CCBFD126C687 /* Pods_GEOSwiftMapboxGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89BE20128818B970E4AC2198 /* Pods_GEOSwiftMapboxGL.framework */; };
-		7DF3A6F13BA744362BEF2CBF /* (null) in Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Weak, ); }; };
+		7DF3A6F13BA744362BEF2CBF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Weak, ); }; };
 		81E4A0711F0C700F0073186F /* MapboxGLAnnotations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81E4A0701F0C700F0073186F /* MapboxGLAnnotations.swift */; };
 		CD20F1DD1B2830700045D8FD /* GEOSwiftMapboxGL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CD2299841B10B506002C19AE /* GEOSwiftMapboxGL.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		CD22998F1B10B506002C19AE /* GEOSwiftMapboxGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2299841B10B506002C19AE /* GEOSwiftMapboxGL.framework */; };
@@ -94,7 +94,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CD22998F1B10B506002C19AE /* GEOSwiftMapboxGL.framework in Frameworks */,
-				7DF3A6F13BA744362BEF2CBF /* (null) in Frameworks */,
+				7DF3A6F13BA744362BEF2CBF /* BuildFile in Frameworks */,
 				335C11A98B9F38F1FD0BADB2 /* Pods_GEOSwiftMapboxGLTests.framework in Frameworks */,
 				551999F5C39D78A8B1ED459F /* Pods_GEOSwiftMapboxGLTests.framework in Frameworks */,
 			);
@@ -223,7 +223,6 @@
 				CD2299811B10B506002C19AE /* Headers */,
 				CD2299821B10B506002C19AE /* Resources */,
 				36BA490CD3061F30F02CD17A /* Frameworks */,
-				8C03586B494390F2C4BBEA17 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -244,7 +243,6 @@
 				CD22998C1B10B506002C19AE /* Resources */,
 				CD20F1DC1B2830600045D8FD /* CopyFiles */,
 				DE7797CE079BC339662037BC /* [CP] Embed Pods Frameworks */,
-				899F3C1F74F9FFEA3B25EDE1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -330,13 +328,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-GEOSwiftMapboxGLTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		62A7A265A251663EAA88D507 /* [CP] Check Pods Manifest.lock */ = {
@@ -345,43 +346,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-GEOSwiftMapboxGL-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		899F3C1F74F9FFEA3B25EDE1 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GEOSwiftMapboxGLTests/Pods-GEOSwiftMapboxGLTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8C03586B494390F2C4BBEA17 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GEOSwiftMapboxGL/Pods-GEOSwiftMapboxGL-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DE7797CE079BC339662037BC /* [CP] Embed Pods Frameworks */ = {
@@ -390,9 +364,18 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-GEOSwiftMapboxGLTests/Pods-GEOSwiftMapboxGLTests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/GEOSwift/GEOSwift.framework",
+				"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
+				"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
+				"${BUILT_PRODUCTS_DIR}/geos/geos.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GEOSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework",
+				"${DWARF_DSYM_FOLDER_PATH}/Mapbox.framework.dSYM",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geos.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

GEOSwiftMapboxGL/MapboxGLAnnotations.swift

@@ -24,13 +24,13 @@ extension Geometry : GEOSwiftMapboxGL {
 
         case is Waypoint:
             let pointAnno = MGLPointAnnotation()
-            pointAnno.coordinate = CLLocationCoordinate2DFromCoordinate((self as! Waypoint).coordinate)
+            pointAnno.coordinate = CLLocationCoordinate2D((self as! Waypoint).coordinate)
             return pointAnno
 
         case is LineString:
             var coordinates = (self as! LineString).points.map({ (point: Coordinate) ->
                 CLLocationCoordinate2D in
-                return CLLocationCoordinate2DFromCoordinate(point)
+                return CLLocationCoordinate2D(point)
             })
             let polyline = MGLPolyline(coordinates: &coordinates,
                 count: UInt(coordinates.count))
@@ -39,7 +39,7 @@ extension Geometry : GEOSwiftMapboxGL {
         case is Polygon:
             var exteriorRingCoordinates = (self as! Polygon).exteriorRing.points.map({ (point: Coordinate) ->
                 CLLocationCoordinate2D in
-                return CLLocationCoordinate2DFromCoordinate(point)
+                return CLLocationCoordinate2D(point)
             })
 
             // interior rings are not handled by MapBoxGL, we must drop this info!
@@ -67,7 +67,7 @@ extension Geometry : GEOSwiftMapboxGL {
 private func MGLPolygonWithCoordinatesSequence(coordinates: CoordinatesCollection) -> MGLPolygon {
     var coordinates = coordinates.map({ (point: Coordinate) ->
         CLLocationCoordinate2D in
-        return CLLocationCoordinate2DFromCoordinate(point)
+        return CLLocationCoordinate2D(point)
     })
     return MGLPolygon(coordinates: &coordinates,
         count: UInt(coordinates.count))
@@ -93,17 +93,17 @@ public class MGLShapesCollection : MGLShape, MGLOverlay {
         })
 
         if let coordinate = geometryCollection.centroid()?.coordinate {
-            self.centroid = CLLocationCoordinate2DFromCoordinate(coordinate)
+            self.centroid = CLLocationCoordinate2D(coordinate)
         } else {
-            self.centroid = CLLocationCoordinate2DFromCoordinate(CoordinateFromCLLocationCoordinate2D(CLLocationCoordinate2DMake(0, 0)))
+            self.centroid = CLLocationCoordinate2D(Coordinate(CLLocationCoordinate2DMake(0, 0)))
         }
 
         self.shapes = shapes
 
         if let envelope = geometryCollection.envelope() as? Polygon {
             let exteriorRing = envelope.exteriorRing
-            let sw = CLLocationCoordinate2DFromCoordinate(exteriorRing.points[0])
-            let ne = CLLocationCoordinate2DFromCoordinate(exteriorRing.points[2])
+            let sw = CLLocationCoordinate2D(exteriorRing.points[0])
+            let ne = CLLocationCoordinate2D(exteriorRing.points[2])
             self.overlayBounds = MGLCoordinateBounds(sw:sw, ne:ne)
         } else {
             let zeroCoord = CLLocationCoordinate2DMake(0, 0)

Podfile

@@ -4,11 +4,11 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'GEOSwiftMapboxGL' do
-  pod 'GEOSwift'
+  pod 'GEOSwift', '~> 3.0.0'
   pod 'Mapbox-iOS-SDK'
 end
 
 target 'GEOSwiftMapboxGLTests' do
-  pod 'GEOSwift'
+  pod 'GEOSwift', '~> 3.0.0'
   pod 'Mapbox-iOS-SDK'
 end

Podfile.lock

@@ -1,24 +1,24 @@
 PODS:
-  - geos (3.5.0)
-  - GEOSwift (2.2.0):
-    - geos (= 3.5.0)
+  - geos (3.7.0)
+  - GEOSwift (3.0.0):
+    - geos (= 3.7.0)
   - Mapbox-iOS-SDK (4.0.1)
 
 DEPENDENCIES:
-  - GEOSwift
+  - GEOSwift (~> 3.0.0)
   - Mapbox-iOS-SDK
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - geos
     - GEOSwift
     - Mapbox-iOS-SDK
 
 SPEC CHECKSUMS:
-  geos: e96c6ca3f3ce02d20feaa8d90d4af383e11e7198
-  GEOSwift: 8633f4f613d8c010eec90d26a6b7efd15bb98a51
+  geos: de7d149482a5798a4b5cfda2f0dbabd5a23f2591
+  GEOSwift: 0e7ce382fd678b554f758b1320c24f913b875abc
   Mapbox-iOS-SDK: 09b978be732d753e5c5e2911460fc0a018ce9be6
 
-PODFILE CHECKSUM: ab72b494530c13dc57e62fdeb5990f080ee54663
+PODFILE CHECKSUM: c65f715fba3fbd3f80306a354ec265d1ea352ad2
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3