From 0351a3b29f703b3bdbf37034050ecf8a8a62f5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Thu, 18 Feb 2021 12:08:26 -0800
Subject: [PATCH] Turf v2.0.0-alpha.1 (#517)

* Change Turf dependency to a binary version

* Turf v2.0.0-alpha.2

* Removed tvOS, watchOS, Linux support

Co-authored-by: Alexander Pristavko <alexander.pristavko@mapbox.com>
---
 .circleci/config.yml     | 22 ----------------------
 Cartfile                 |  2 +-
 Cartfile.resolved        |  2 +-
 MapboxDirections.podspec |  4 +---
 Package.resolved         |  4 ++--
 Package.swift            |  4 ++--
 6 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c5a681dd..ef8efdcef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,12 +68,6 @@ jobs:
       iOS:
         type: string
         default: "12.1"
-      watchOS:
-        type: string
-        default: "5.0"
-      tvOS:
-        type: string
-        default: "12.0"
       test:
         type: boolean
         default: true
@@ -107,19 +101,9 @@ jobs:
           condition: << parameters.codecoverage >>
           steps:
             - publish-codecov
-      - run:
-          name: tvOS
-          command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=<< parameters.tvOS >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
-      - when:
-          condition: << parameters.codecoverage >>
-          steps:
-            - publish-codecov
       - run:
           name: macOS
           command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
-      - run:
-          name: watchOS
-          command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm,OS=<< parameters.watchOS >>' clean build
       - save-cache
 
 workflows:
@@ -129,17 +113,11 @@ workflows:
           name: "Xcode_12.1"
           xcode: "12.0.0"
           iOS: "14.0"
-          tvOS: "14.0"
-          watchOS: "7.0"
       - build-job:
           name: "Xcode_11.1"
           xcode: "11.1.0"
           iOS: "13.1"
-          tvOS: "13.0"
-          watchOS: "6.0"
           codecoverage: true
       - spm-job:
           name: "SPM_build"
           xcode: "12.0.0"
-      - spm-linux-job:
-          name: "SPM_Ubuntu_build"
diff --git a/Cartfile b/Cartfile
index 70c46e7cf..b857cd721 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "raphaelmor/Polyline" ~> 5.0
-github "mapbox/turf-swift" ~> 1.0
+github "mapbox/turf-swift" "v2.0.0-alpha.2"
 github "Udumft/SwiftCLI" "carthage-fix"
diff --git a/Cartfile.resolved b/Cartfile.resolved
index f804a2dab..71758dbb9 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -2,5 +2,5 @@ binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "5.9.0"
 github "AliSoftware/OHHTTPStubs" "9.1.0"
 github "Udumft/SwiftCLI" "da19d2a16cd5aa838d8fb7256e28c171bc67dd82"
 github "mapbox/mapbox-events-ios" "v0.10.7"
-github "mapbox/turf-swift" "v1.2.0"
+github "mapbox/turf-swift" "v2.0.0-alpha.2"
 github "raphaelmor/Polyline" "v5.0.2"
diff --git a/MapboxDirections.podspec b/MapboxDirections.podspec
index 39c22d785..13a9691c0 100644
--- a/MapboxDirections.podspec
+++ b/MapboxDirections.podspec
@@ -27,8 +27,6 @@ Pod::Spec.new do |s|
   #  When using multiple platforms
   s.ios.deployment_target = "10.0"
   s.osx.deployment_target = "10.12"
-  s.watchos.deployment_target = "3.0"
-  s.tvos.deployment_target = "10.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -46,6 +44,6 @@ Pod::Spec.new do |s|
   s.swift_version = "5.0"
 
   s.dependency "Polyline", "~> 5.0"
-  s.dependency "Turf", "~> 1.0"
+  s.dependency "Turf", "~> 2.0.0-alpha.2"
 
 end
diff --git a/Package.resolved b/Package.resolved
index 0cff404cb..b0fb876d7 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/mapbox/turf-swift.git",
         "state": {
           "branch": null,
-          "revision": "ee24a33eb9f02bf2715d3e0d3bcebbf302376af6",
-          "version": "1.1.0"
+          "revision": "d347d3651823422bd7b645d8691f3816e26cac73",
+          "version": "2.0.0-alpha.2"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index 503c4679a..d67a27802 100644
--- a/Package.swift
+++ b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "MapboxDirections",
     platforms: [
-        .macOS(.v10_12), .iOS(.v10), .watchOS(.v3), .tvOS(.v12)
+        .macOS(.v10_12), .iOS(.v10),
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
@@ -21,7 +21,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/raphaelmor/Polyline.git", from: "5.0.2"),
-        .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", from: "1.1.0"),
+        .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", from: "2.0.0-alpha.2"),
         .package(url: "https://github.com/jakeheis/SwiftCLI", from: "6.0.0")
     ],
     targets: [