Merge branch 'next' into v7

bengourley · bengourley · commit d938f378dafd · 2020-04-09T16:17:22.000+01:00
diff --git a/test/expo/scripts/build-ios-locally.sh b/test/expo/scripts/build-ios-locally.sh
@@ -7,7 +7,8 @@ docker-compose run expo-publisher
 
 cd test/expo/features/fixtures/test-app && \
 npm i turtle-cli@0.14 bunyan --no-save --no-package-lock && \
-perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/xdl/build/detach/IosNSBundle.js && \
+perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/\@expo/xdl/build/detach/IosNSBundle.js && \
+perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/\@expo/xdl/build/detach/IosNSBundle.js && \
 node_modules/.bin/turtle build:ios \
   -c test/expo/features/fixtures/test-app/app.json \
   --team-id $APPLE_TEAM_ID \
diff --git a/test/expo/scripts/build-ios.sh b/test/expo/scripts/build-ios.sh
@@ -6,7 +6,8 @@ set -e
 rm -rf $BUILDKITE_BUILD_CHECKOUT_PATH/build/*
 cd test/expo/features/fixtures/test-app
 npm i turtle-cli@0.14 bunyan
-perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/xdl/build/detach/IosNSBundle.js
+perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/\@expo/xdl/build/detach/IosNSBundle.js
+perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/\@expo/xdl/build/detach/IosNSBundle.js
 node_modules/.bin/turtle build:ios \
   -c ./app.json \
   --team-id $APPLE_TEAM_ID \
