Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix: Downgrade to mapbox rc4, and pin 1.9.3 version of CocoaPods #653

Merged
merged 3 commits into from
Nov 8, 2020
Merged
Show file tree
Hide file tree
Changes from all 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
15 changes: 15 additions & 0 deletions appcenter-post-clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,18 @@
source github.sh

github_set_status_pending

#!/usr/bin/env bash
CUR_COCOAPODS_VER=`sed -n -e 's/^COCOAPODS: \([0-9.]*\)/\1/p' ios/Podfile.lock`
ENV_COCOAPODS_VER=`pod --version`

# check if not the same version, reinstall cocoapods version to current project's
if [ $CUR_COCOAPODS_VER != $ENV_COCOAPODS_VER ];
then
echo "Uninstalling all CocoaPods versions"
sudo gem uninstall cocoapods --all --executables
echo "Installing CocoaPods version $CUR_COCOAPODS_VER"
sudo gem install cocoapods -v $CUR_COCOAPODS_VER
else
echo "CocoaPods version is suitable for the project"
fi;
29 changes: 13 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -332,23 +332,20 @@ PODS:
- react-native-intercom (18.0.0):
- Intercom (~> 8.0.0)
- React
- react-native-mapbox-gl (8.1.0-rc.8):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8.0)"
- Mapbox-iOS-SDK (~> 5.8.0)
- react-native-mapbox-gl (8.1.0-rc.4):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8)"
- Mapbox-iOS-SDK (~> 5.8)
- React
- React-Core
- react-native-mapbox-gl/DynamicLibrary (= 8.1.0-rc.8)
- react-native-mapbox-gl/StaticLibraryFixer (= 8.1.0-rc.8)
- react-native-mapbox-gl/DynamicLibrary (8.1.0-rc.8):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8.0)"
- Mapbox-iOS-SDK (~> 5.8.0)
- react-native-mapbox-gl/DynamicLibrary (= 8.1.0-rc.4)
- react-native-mapbox-gl/StaticLibraryFixer (= 8.1.0-rc.4)
- react-native-mapbox-gl/DynamicLibrary (8.1.0-rc.4):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8)"
- Mapbox-iOS-SDK (~> 5.8)
- React
- React-Core
- react-native-mapbox-gl/StaticLibraryFixer (8.1.0-rc.8):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8.0)"
- Mapbox-iOS-SDK (~> 5.8.0)
- react-native-mapbox-gl/StaticLibraryFixer (8.1.0-rc.4):
- "@react-native-mapbox-gl-mapbox-static (~> 5.8)"
- Mapbox-iOS-SDK (~> 5.8)
- React
- React-Core
- react-native-safe-area-context (3.1.8):
- React-Core
- react-native-webview (10.9.2):
Expand Down Expand Up @@ -701,7 +698,7 @@ SPEC CHECKSUMS:
react-native-geolocation-service: 141e33bdb179bcba10b216ee13962611e21f2be4
react-native-get-random-values: 1404bd5cc0ab0e287f75ee1c489555688fc65f89
react-native-intercom: c48e0e15877bf96ff4d461f7aa9b833d11188139
react-native-mapbox-gl: 447f8bf34146d813e707c6ff7cbc25aecd3f5df6
react-native-mapbox-gl: b2e4cee6a40cb713cd72846c9573cd5bc468c3d5
react-native-safe-area-context: 79fea126c6830c85f65947c223a5e3058a666937
react-native-webview: 4e96d493f9f90ba4f03b28933f30b2964df07e39
React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
Expand Down Expand Up @@ -731,4 +728,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 62e6d8fc85ac6b63b6370c161340ec610b2d688a

COCOAPODS: 1.10.0
COCOAPODS: 1.9.3
16 changes: 16 additions & 0 deletions ios/atb.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,28 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-atb/Pods-atb-frameworks.sh",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/MapboxMobileEvents.framework",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/MapboxMobileEvents.framework.dSYM",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/BADC3E19-B154-39DA-BE9A-E7C52B45BD0C.bcsymbolmap",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/F86F5A50-B0A0-3D96-8330-20AFDAC47DCC.bcsymbolmap",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/877E1F78-505A-34B9-A9A0-42F8BFA435B9.bcsymbolmap",
"${PODS_ROOT}/@react-native-mapbox-gl-mapbox-static/dynamic/7C38D00F-328F-3E0C-B30E-E47F366F0F3D.bcsymbolmap",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/BADC3E19-B154-39DA-BE9A-E7C52B45BD0C.bcsymbolmap",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/F86F5A50-B0A0-3D96-8330-20AFDAC47DCC.bcsymbolmap",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/877E1F78-505A-34B9-A9A0-42F8BFA435B9.bcsymbolmap",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/7C38D00F-328F-3E0C-B30E-E47F366F0F3D.bcsymbolmap",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
"${DWARF_DSYM_FOLDER_PATH}/MapboxMobileEvents.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/BADC3E19-B154-39DA-BE9A-E7C52B45BD0C.bcsymbolmap",
"${BUILT_PRODUCTS_DIR}/F86F5A50-B0A0-3D96-8330-20AFDAC47DCC.bcsymbolmap",
"${BUILT_PRODUCTS_DIR}/877E1F78-505A-34B9-A9A0-42F8BFA435B9.bcsymbolmap",
"${BUILT_PRODUCTS_DIR}/7C38D00F-328F-3E0C-B30E-E47F366F0F3D.bcsymbolmap",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework",
"${DWARF_DSYM_FOLDER_PATH}/Mapbox.framework.dSYM",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@react-native-firebase/analytics": "^7.6.7",
"@react-native-firebase/app": "^8.4.5",
"@react-native-firebase/remote-config": "^9.0.10",
"@react-native-mapbox-gl/maps": "8.1.0-rc.8",
"@react-native-mapbox-gl/maps": "8.1.0-rc.4",
"@react-navigation/bottom-tabs": "^5.9.2",
"@react-navigation/core": "^5.12.5",
"@react-navigation/native": "^5.7.6",
Expand Down
22 changes: 22 additions & 0 deletions patches/@react-native-mapbox-gl+maps+8.1.0-rc.4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/node_modules/@react-native-mapbox-gl/maps/index.d.ts b/node_modules/@react-native-mapbox-gl/maps/index.d.ts
index 0f07d73..fbb59fe 100644
--- a/node_modules/@react-native-mapbox-gl/maps/index.d.ts
+++ b/node_modules/@react-native-mapbox-gl/maps/index.d.ts
@@ -398,7 +398,7 @@ export interface MapViewProps extends ViewProps {
logoEnabled?: boolean;
compassEnabled?: boolean;
compassViewPosition?: number;
- compassViewMargins?: Point;
+ compassViewMargins?: {x: number; y:number};
surfaceView?: boolean;
regionWillChangeDebounceTime?: number;
regionDidChangeDebounceTime?: number;
@@ -747,7 +747,7 @@ export interface VectorSourceProps extends TileSourceProps {
export interface ShapeSourceProps extends ViewProps {
id?: string;
url?: string;
- shape?: GeoJSON.GeometryCollection | GeoJSON.Feature | GeoJSON.FeatureCollection;
+ shape?: GeoJSON.Geometry | GeoJSON.GeometryCollection | GeoJSON.Feature | GeoJSON.FeatureCollection;
cluster?: boolean;
clusterRadius?: number;
clusterMaxZoomLevel?: number;
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1845,10 +1845,10 @@
resolved "https://registry.yarnpkg.com/@react-native-firebase/remote-config/-/remote-config-9.0.10.tgz#7dfa82dd38e2e968a7ab6ac0ea92c2795fa2f73a"
integrity sha512-0AkSD/jlCxxXEMf4bulFJXP/nP7qC3HLypNCmwWI3bkVIq66M1uok0cV2YbSquzBx0Ve5WgxPVViy+HZgTEJAg==

"@react-native-mapbox-gl/[email protected].8":
version "8.1.0-rc.8"
resolved "https://registry.yarnpkg.com/@react-native-mapbox-gl/maps/-/maps-8.1.0-rc.8.tgz#a3e57ea5a29e16388fd367aebfc8f2bc95a18677"
integrity sha512-fBPIGiDdTUN6r3DvOXxY29u+ifG5hQuhmonOLtsRlwWcuThhMypAQMUnrO0LEZiOtMy01RB21GXsmrbbuPPxiw==
"@react-native-mapbox-gl/[email protected].4":
version "8.1.0-rc.4"
resolved "https://registry.yarnpkg.com/@react-native-mapbox-gl/maps/-/maps-8.1.0-rc.4.tgz#7a9415f1a076ed1a514a7107d74b7d8ea96ad560"
integrity sha512-OdzpkvBvkllU+ymO3hpAT31+zJJUITjsK/c7dX2j3wvHLCQmhAhg5GY3PJUK2cBhZsE6ojjc739Bcnbg9IBFIQ==
dependencies:
"@mapbox/geo-viewport" ">= 0.4.0"
"@turf/along" ">= 4.0.0 <7.0.0"
Expand Down