Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update Turf to 2.8.0 #825

Merged
merged 12 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ commands:
steps:
- run:
name: Dependencies
command: carthage bootstrap --platform all --cache-builds --configuration Debug --use-xcframeworks
command: |
carthage checkout
# Workaround for OHHTTPStubs not supporting Xcode 14.3+
sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = 10.9/MACOSX_DEPLOYMENT_TARGET = 10.13/g' Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
sed -i '' 's/IPHONEOS_DEPLOYMENT_TARGET = 8.0/IPHONEOS_DEPLOYMENT_TARGET = 12.0/g' Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
carthage build --platform all --cache-builds --configuration Debug --use-xcframeworks
install-mbx-ci:
steps:
- run:
Expand Down Expand Up @@ -117,7 +122,7 @@ step-library:
jobs:
detect-breaking-changes:
macos:
xcode: 13.4.1
xcode: 14.3.1
steps:
- checkout
- install-mapbox-token
Expand Down Expand Up @@ -153,7 +158,7 @@ jobs:
fi
spm-linux-job:
docker:
- image: swift:5.6
- image: swift:5.7
steps:
- checkout
- run: swift build
Expand Down Expand Up @@ -192,7 +197,7 @@ jobs:
carthage bootstrap --platform all --use-netrc --use-xcframeworks
example-app-build:
macos:
xcode: "13.4.1"
xcode: "14.3.1"
environment:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
Expand All @@ -210,19 +215,19 @@ jobs:
parameters:
xcode:
type: string
default: "13.4.1"
default: "14.3.1"
device:
type: string
default: "iPhone 13"
default: "iPhone 14"
iOS:
type: string
default: "15.5"
default: "16.4"
watchOS:
type: string
default: "8.5"
default: "9.4"
tvOS:
type: string
default: "15.4"
default: "16.4"
test:
type: boolean
default: true
Expand Down Expand Up @@ -262,7 +267,7 @@ jobs:
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
command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 - 44mm,OS=<< parameters.watchOS >>' clean build
- save-cache

publish-documentation:
Expand All @@ -287,7 +292,7 @@ jobs:
parameters:
xcode:
type: string
default: "13.4.1"
default: "14.3.1"
macos:
xcode: << parameters.xcode >>
environment:
Expand Down Expand Up @@ -315,7 +320,7 @@ jobs:
parameters:
xcode:
type: string
default: "13.4.1"
default: "14.3.1"
macos:
xcode: << parameters.xcode >>
environment:
Expand Down Expand Up @@ -367,16 +372,16 @@ workflows:
- detect-breaking-changes:
name: "Detect Breaking Changes"
- build-job:
name: "Dev Build: Xcode 13.4.1"
name: "Dev Build: Xcode 14.3.1"
- carthage-integration-test:
name: "Carthage Integration Test 13.4.1"
xcode: "13.4.1"
name: "Carthage Integration Test 14.3.1"
xcode: "14.3.1"
- carthage-integration-test:
name: "Carthage Integration Test 14.0.0"
xcode: "14.0.0"
- spm-job:
name: "SPM build 13.4.1"
xcode: "13.4.1"
name: "SPM build 14.3.1"
xcode: "14.3.1"
- spm-job:
name: "SPM build 14.1.0"
xcode: "14.1.0"
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changes to Mapbox Directions for Swift


## v2.13.0

* This library now depends on Turf v2.8.x. ([#825](https://github.com/mapbox/mapbox-directions-swift/pull/825))

## v2.12.0

* This library now depends on Turf v2.7.x. ([#819](https://github.com/mapbox/mapbox-directions-swift/pull/819))

## v2.11.0

* Added `Incident.trafficCodes` and corresponding `TrafficCodes` struct to hold jartic codes. ([#808](https://github.com/mapbox/mapbox-directions-swift/pull/808))
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "raphaelmor/Polyline" ~> 5.0
github "mapbox/turf-swift" ~> 2.7.0
github "mapbox/turf-swift" ~> 2.8.0
2 changes: 1 addition & 1 deletion MapboxDirections.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ Pod::Spec.new do |s|
s.swift_version = "5.5"

s.dependency "Polyline", "~> 5.0"
s.dependency "Turf", "~> 2.7.0"
s.dependency "Turf", "~> 2.8.0"

end
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs",
"state": {
"branch": null,
"revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
"version": "9.1.0"
"revision": "c582400a38590a3dabb4353416d9d46cb7278d06",
"version": null
azarovalex marked this conversation as resolved.
Show resolved Hide resolved
azarovalex marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
Expand All @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/mapbox/turf-swift.git",
"state": {
"branch": null,
"revision": "42926cfbb4f024e7823103638f0186f4b0f947ef",
"version": "2.7.1"
"revision": "213050191cfcb3d5aa76e1fa90c6ff1e182a42ca",
"version": "2.8.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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", "2.7.0"..<"2.8.0"),
.package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", "2.8.0"..<"2.9.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
.package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0")
],
Expand Down