Skip to content

Commit

Permalink
[bare-expo][ios] Fix Podfile.lock unstable between different machines (
Browse files Browse the repository at this point in the history
…expo#13974)

# Why

there were `__dir__` in podspec script_phase which makes the lock unstable on different machines.

# How

cherry-pick facebook/react-native@bdfe2a5 into our react-native fork. currently the fork branch is still on [@kudo/pick_stable_podfilelock branch](https://github.com/expo/react-native/tree/%40kudo/pick_stable_podfilelock). merge to exp-latest and sdk-43 branch if this pr getting merged.

# Test Plan

CI passed
should not have different lockfile between different machines.
  • Loading branch information
Kudo authored Aug 9, 2021
1 parent 74843a6 commit 0c85997
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions apps/bare-expo/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ SPEC CHECKSUMS:
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
EXAmplitude: 19866218bc855e6ac7a29e5c8ec1b24eab81b40c
EXAppAuth: b7ecb4ce7634676985f67d2489054ea7727cd5e3
EXApplication: 9ff2a206009d6e55bca6c20b3f33d07986b51ef3
Expand Down Expand Up @@ -1256,14 +1256,14 @@ SPEC CHECKSUMS:
EXWebBrowser: b244cd85281a2b8f90a4ce81d674e3dc4f4ccc5e
FacebookSDK: 4b9bb8e2824898b47f18c666dc145c09b40609e6
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: bd01503e57428d002fd530ca0c66664ca5751b22
FBReactNativeSpec: 6baddc2c2b39d192b96965ec745b4d6628e62b2e
FBSDKCoreKit: dace5abafc2fd9272733e6d027bcf18102712117
Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5
FirebaseAnalytics: f3f8f75de34fe04141a69bb1c4bd7e24a80178e1
FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b
FirebaseCoreDiagnostics: 3d36e05da74cb8b7ce30e6594a8f201b982c725c
FirebaseInstallations: bf2ec8dbf36ff4c91af6b9a003d15855757680c1
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384
GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939
GoogleMLKit: 6ca2a10de262ee1017b52ac045e8967884ace992
Expand Down
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4028,7 +4028,7 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
Branch: 9a37f707974a128c37829033c49018b79c7e7a2d
CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
EXAdsAdMob: aeb474fc44d29866b259f6573c3726311befc664
EXAdsFacebook: 32a8b46b1df6cd3eec72a8cfa2213e313acc5887
EXAmplitude: 19866218bc855e6ac7a29e5c8ec1b24eab81b40c
Expand Down Expand Up @@ -4099,14 +4099,14 @@ SPEC CHECKSUMS:
FacebookSDK: 4b9bb8e2824898b47f18c666dc145c09b40609e6
FBAudienceNetwork: cfe55330dcc4e9a1df083c34a346ca7f8e32951e
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: bd01503e57428d002fd530ca0c66664ca5751b22
FBReactNativeSpec: 6baddc2c2b39d192b96965ec745b4d6628e62b2e
FBSDKCoreKit: dace5abafc2fd9272733e6d027bcf18102712117
Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5
FirebaseAnalytics: f3f8f75de34fe04141a69bb1c4bd7e24a80178e1
FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b
FirebaseCoreDiagnostics: 3d36e05da74cb8b7ce30e6594a8f201b982c725c
FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
Google-Maps-iOS-Utils: c32891ff472eaaa1fca032beedafa1a013af7875
Google-Mobile-Ads-SDK: 2f288748a42920d1c744946a460896a95b0e9110
GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384
Expand Down
2 changes: 1 addition & 1 deletion react-native-lab/react-native

0 comments on commit 0c85997

Please sign in to comment.