Skip to content

Commit

Permalink
Turf v2.0.0-alpha.1 (#517)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
1ec5 and chezzdev authored Feb 18, 2021
1 parent d603dbe commit 0351a3b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 31 deletions.
22 changes: 0 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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"
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 1 addition & 3 deletions MapboxDirections.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
Expand All @@ -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
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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: [
Expand Down

0 comments on commit 0351a3b

Please sign in to comment.