Skip to content

Commit 7cc3859

Browse files
authored
Switch to binary Turf (#2347)
1 parent 1cdf682 commit 7cc3859

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MapboxMaps.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ Pod::Spec.new do |m|
2323

2424
m.dependency 'MapboxCoreMaps', '11.8.0'
2525
m.dependency 'MapboxCommon', '24.8.0'
26-
m.dependency 'Turf', '3.0.0'
26+
m.dependency 'Turf', '4.0.0-beta.1'
2727

2828
end

Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let package = Package(
2020
targets: ["MapboxMaps"]),
2121
],
2222
dependencies: [
23-
.package(url: "https://github.com/mapbox/turf-swift.git", exact: "3.0.0"),
23+
.package(url: "https://github.com/mapbox/turf-swift.git", exact: "4.0.0-beta.1"),
2424
] + coreMaps.packageDependencies + common.packageDependencies,
2525
targets: [
2626
.target(

scripts/prepare_binary_dependencies.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,15 @@ cat <<EOF > Cartfile.MapboxCommon.json
2323
{"$MAPBOX_COMMON_VERSION": "https://api.mapbox.com/downloads/v2/mapbox-common/$(release_folder "$MAPBOX_COMMON_VERSION")/ios/packages/$MAPBOX_COMMON_VERSION/MapboxCommon.zip"}
2424
EOF
2525

26+
cat <<EOF > Cartfile.Turf.json
27+
{"$MAPBOX_TURF_VERSION": "https://github.com/mapbox/turf-swift/releases/download/v$MAPBOX_TURF_VERSION/Turf.xcframework.zip"}
28+
EOF
29+
2630
cat <<EOF > Cartfile
2731
# xcode version: $XCODE_VERSION
2832
binary "Cartfile.MapboxCoreMaps.json" == $MAPBOX_CORE_MAPS_VERSION
2933
binary "Cartfile.MapboxCommon.json" == $MAPBOX_COMMON_VERSION
30-
github "mapbox/turf-swift" == $MAPBOX_TURF_VERSION
34+
binary "Cartfile.Turf.json" == $MAPBOX_TURF_VERSION
3135
3236
EOF
3337

@@ -36,7 +40,7 @@ BUILD_LIBRARY_FOR_DISTRIBUTION=YES
3640
EOF
3741

3842
mkdir -p Carthage
39-
CURRENT_CONFIG_HASH=$(cat Cartfile Cartfile.xcconfig Cartfile.MapboxCoreMaps.json Cartfile.MapboxCommon.json | shasum -a 256)
43+
CURRENT_CONFIG_HASH=$(cat Cartfile Cartfile.xcconfig Cartfile.MapboxCoreMaps.json Cartfile.MapboxCommon.json Cartfile.Turf.json | shasum -a 256)
4044

4145
EXPECTED_CONFIG_HASH=""
4246
if [[ -f Carthage/config.version ]]; then
@@ -64,4 +68,4 @@ if [[ "$CURRENT_CONFIG_HASH" != "$EXPECTED_CONFIG_HASH" ]]; then
6468
echo "$CURRENT_CONFIG_HASH" > Carthage/config.version
6569
fi
6670

67-
rm -f Cartfile Cartfile.resolved Cartfile.xcconfig Cartfile.MapboxCoreMaps.json Cartfile.MapboxCommon.json
71+
rm -f Cartfile Cartfile.resolved Cartfile.xcconfig Cartfile.MapboxCoreMaps.json Cartfile.MapboxCommon.json Cartfile.Turf.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"MapboxCoreMaps": "11.8.0",
33
"MapboxCommon": "24.8.0",
4-
"Turf": "3.0.0"
4+
"Turf": "4.0.0-beta.1"
55
}

0 commit comments

Comments
 (0)