Fix CocoaPods compat

mapbox · Jun 7, 2019 · 24291c2 · 24291c2
1 parent e37246c
commit 24291c2
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 5 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.9.0"
+binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.11.0"
 github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"
-github "raphaelmor/Polyline" "v4.2.0"
+github "raphaelmor/Polyline" "v4.2.1"
diff --git a/MapboxDirections.podspec b/MapboxDirections.podspec
@@ -37,8 +37,8 @@ Pod::Spec.new do |s|
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 
-  s.source_files  = ["Sources/MapboxDirections", "Sources/MapboxDirections/*/*", "Sources/MapboxDirectionsCompat/*/*"]
-  s.exclude_files = ["Sources/MapboxDirections/SPM"]
+  s.source_files  = ["Sources/MapboxDirections", "Sources/MapboxDirections/*/*", "Sources/MapboxDirectionsCompat", "Sources/MapboxDirectionsCompat/*/*"]
+  s.exclude_files = ["Sources/MapboxDirectionsCompat/MapboxDirectionsCompat.h"]
 
   # ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 

diff --git a/Sources/MapboxDirections/MBAttribute.swift b/Sources/MapboxDirections/MBAttribute.swift
@@ -1,5 +1,7 @@
 import Foundation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 public typealias AttributeOptions = MBAttributeOptions

diff --git a/Sources/MapboxDirections/MBDirectionsOptions.swift b/Sources/MapboxDirections/MBDirectionsOptions.swift
@@ -1,7 +1,9 @@
 import Foundation
 import Polyline
 import CoreLocation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 /**

diff --git a/Sources/MapboxDirections/MBLaneIndication.swift b/Sources/MapboxDirections/MBLaneIndication.swift
@@ -1,5 +1,7 @@
 import Foundation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 public typealias LaneIndication = MBLaneIndication

diff --git a/Sources/MapboxDirections/MBRoadClasses.swift b/Sources/MapboxDirections/MBRoadClasses.swift
@@ -1,5 +1,7 @@
 import Foundation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 public typealias RoadClasses = MBRoadClasses

diff --git a/Sources/MapboxDirections/MBRouteLeg.swift b/Sources/MapboxDirections/MBRouteLeg.swift
@@ -1,7 +1,9 @@
 import Foundation
 import CoreLocation
 import Polyline
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 /**

diff --git a/Sources/MapboxDirections/MBRouteOptions.swift b/Sources/MapboxDirections/MBRouteOptions.swift
@@ -1,6 +1,8 @@
 import Foundation
 import CoreLocation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 /**

diff --git a/Sources/MapboxDirections/MBRouteStep.swift b/Sources/MapboxDirections/MBRouteStep.swift
@@ -1,7 +1,9 @@
 import Foundation
 import CoreLocation
 import Polyline
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 /**

diff --git a/Sources/MapboxDirections/MapboxDirections.h b/Sources/MapboxDirections/MapboxDirections.h
@@ -7,4 +7,6 @@ FOUNDATION_EXPORT double MapboxDirectionsVersionNumber;
 //! Project version string for MapboxDirections.
 FOUNDATION_EXPORT const unsigned char MapboxDirectionsVersionString[];
 
-#import <MapboxDirectionsCompat/MapboxDirectionsCompat.h>
+#if SWIFT_PACKAGE
+import MapboxDirectionsCompat
+#endif
diff --git a/Sources/MapboxDirections/Match/MBMatchOptions.swift b/Sources/MapboxDirections/Match/MBMatchOptions.swift
@@ -1,6 +1,8 @@
 import Foundation
 import CoreLocation
+#if SWIFT_PACKAGE
 import MapboxDirectionsCompat
+#endif
 
 
 /**