Update iOS shell tarball

- expo-branch
- expo-face-detector

.envrc

@@ -10,6 +10,13 @@ source_local() {
 
 source_local
 
+if [[ "$CI" != "true" && (-z "$GITHUB_TOKEN" || -z "$CIRCLE_API_USER_TOKEN") ]]; then
+  yellow=`tput setaf 3`
+  reset=`tput sgr0`
+  echo "${yellow}please set GITHUB_TOKEN and CIRCLE_API_USER_TOKEN env variables in .envrc.local file if you wish to release turtle-cli"
+  echo "run 'cp .envrc.local.example .envrc.local' if you don't have one yet and edit the new file${reset}"
+fi
+
 export NODE_ENV=development
 
 export EXPO_TURTLE_TOOLS_DIR="$(pwd)/tools"

.envrc.local.example

@@ -0,0 +1,2 @@
+export GITHUB_TOKEN=__PUT_YOUR_GITHUB_TOKEN_HERE__ # follow the guide to create one: https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line
+export CIRCLE_API_USER_TOKEN=__PUT_YOUR_CIRCLECI_API_TOKEN_HERE__ # create one here: https://circleci.com/account/api

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,38 @@
+---
+name: "\U0001F41B Bug Report"
+about: You want to report a reproducible bug or regression in turtle-cli.
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!-- Thanks for helping expo! Before you submit your issue, please make sure you followed our checklist and check the appropriate boxes by putting an x in the [ ]: [x] -->
+
+### New Issue Checklist
+
+- [ ] Updated turtle-cli to the latest version (`yarn global add turtle-cli` or `npm install --global turtle-cli`).
+- [ ] I read the [Contribution Guidelines](https://github.com/expo/turtle/blob/master/CONTRIBUTING.md).
+- [ ] I read [docs.expo.io](https://docs.expo.io) (Managed Workflow > Distributing Your App).
+- [ ] I searched for [existing GitHub issues](https://github.com/expo/turtle/issues).
+- [ ] **I enclosed the complete output when running turtle, including the stack trace and command used.**
+
+### Issue Description
+<!-- Please include what's happening, expected behavior, and any relevant code samples -->
+
+##### Command executed
+<!-- The command you executed on the command line that resulted in an error -->
+
+##### Complete output when running turtle, including the stack trace and command used
+
+<details>
+  <pre> [PUT LOGS HERE] </pre>
+</details>
+
+### Environment
+
+<!-- Please run `expo diagnostics` and copy the output below. This will help us help you. -->
+
+<details>
+  <pre> [PUT OUTPUT HERE] </pre>
+</details>

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,22 @@
+---
+name: "\U0001F64B Feature Request"
+about: Want us to add something to turtle-cli?
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+### Feature Request
+
+#### Motivation Behind Feature
+<!-- Why should this feature be implemented? What problem does it solve? -->
+
+#### Feature Description
+<!-- Describe your feature request in detail -->
+<!-- Please provide any code examples or screenshots of what this feature would look like -->
+<!-- Are there any drawbacks? Will this break anything for existing users? -->
+
+#### Alternatives or Workarounds
+<!-- Describe alternatives or workarounds you are currently using -->
+<!-- Are there ways to do this with existing commands? -->

.github/ISSUE_TEMPLATE/QUESTION.md

@@ -0,0 +1,21 @@
+---
+name: "\U00002753 Questions and discussions"
+about: You have a question about turtle-cli or want to discuss some aspects of turtle-cli.
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+### Question Checklist
+
+- [ ] I read the [Contribution Guidelines](https://github.com/expo/turtle/blob/master/CONTRIBUTING.md).
+- [ ] I read [docs.expo.io](https://docs.expo.io) (Managed Workflow > Distributing Your App).
+- [ ] I searched for [existing GitHub issues](https://github.com/expo/turtle/issues).
+
+### Question Subject
+<!-- What command do you have a question about? -->
+<!-- Is this a question about documentation? -->
+
+#### Question Description
+<!-- Please include expected behavior and any relevant code samples with your question if possible -->

.github/PULL_REQUEST_TEMPLATE

@@ -1,11 +0,0 @@
-# Why
-
-Please describe the motivation for this PR, and link to relevant GitHub issues, forums posts, or feature requests.
-
-# How
-
-How did you build this feature or fix this bug and why?
-
-# Test Plan
-
-Please describe how you tested this change and how a reviewer could reproduce your test, especially if this PR does not include automated tests! If possible, please also provide terminal output and/or screenshots demonstrating your test/reproduction.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!-- Thanks for contributing to _turtle_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->
+
+### Checklist
+- [ ] I've read the [Contribution Guidelines](https://github.com/expo/turtle/blob/master/CONTRIBUTING.md).
+- [ ] I've updated the [CHANGELOG](https://github.com/expo/turtle/blob/master/CHANGELOG.md) if necessary.
+- [ ] I've ensured the unit and smoke tests are still passing - either by running `yarn test:unit` and `yarn test:smoke:[ios|android]` or by checking the appropriate CircleCI builds' statuses.
+- [ ] **I've manually tested whether the changes I made work as expected.**
+
+### Motivation and Context
+<!-- Why is this change required? What problem does it solve? -->
+<!-- If it fixes an open issue, please link to the issue here. -->
+
+### Description
+<!-- Describe your changes in detail -->
+<!-- Please describe in detail how you tested your changes. -->

.gitignore

@@ -12,3 +12,5 @@ shell.apk
 
 *.swp
 *.swo
+
+.envrc.local

.release-it.json

@@ -8,5 +8,8 @@
   },
   "github": {
     "release": true
+  },
+  "hooks": {
+    "after:release": "yarn release:update:turtle-cli-example"
   }
 }

CHANGELOG.md

@@ -5,6 +5,40 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Enabled back optional modules support, but only for specific unimodules.
+- Updated SDK34 Android shell app with latest fixes (up to 2.12.2)
+- Updated SDK34 iOS shell app with latest fixes (up to 2.12.3)
+
+## [0.10.0] - 2019-08-01
+### Changed
+- Fully disabled optional modules on Android for now.
+- Updated iOS shell apps for SDK 33 and 34 to fix scoped permissions issue.
+- Updated Android shell app for SDK 34 to work after disabling optional modules.
+
+## [0.9.1] - 2019-07-29
+### Changed
+- `release-it` version to `12.3.4`.
+
+## [0.9.0] - 2019-07-29
+### Added
+- Android, iOS standalone shell apps and iOS Expo client shell app for SDK34.
+- Xcode license check for iOS builds.
+### Fixed
+- Setting `Constants.nativeAppVersion` for Android standalone builds (actually fixed in [expo/expo-cli#878](https://github.com/expo/expo-cli/pull/878)).
+- Passing `expo.android.config` object from `app.json` to the Android builder.
+
+## [0.8.11] - 2019-07-16
+### Fixed
+- Android debug builds.
+
+## [0.8.10] - 2019-07-16
+### Fixed
+- iOS simulator builds.
+
+## [0.8.9] - 2019-07-15
+### Fixed
+- User authentication.
 
 ## [0.8.8] - 2019-07-11
 ### Fixed

CONTRIBUTING.md

@@ -24,7 +24,7 @@ To submit a pull request:
 4. Wait for a review and adjust the code if necessary.
 
 ## Publishing a release
+- Make sure you have set `GITHUB_TOKEN` and `CIRCLE_API_USER_TOKEN` environment variables in `.envrc.local` file. If you don't have the file, run `cp .envrc.local.example .envrc.local` and edit the file.
 - To release a new version of `turtle-cli`, run `yarn release` command.
 - If you wish to release a new *beta* version of `turtle-cli`, run `yarn release:beta` instead.
-- Update [Changelog](CHANGELOG.md).
-- In a terminal, `cd` into [expo/turtle-cli-example](https://github.com/expo/turtle-cli-example) repository, run `yarn update-turtle-cli-version` (this script updates `turtle-cli` version number in CI configuration files and commits the changes) and then run `git push`. Thanks!
+- Update the [changelog](CHANGELOG.md).

Dockerfile

@@ -1,93 +1,5 @@
-FROM openjdk:8u141
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# https://github.com/yarnpkg/yarn/issues/2821
-RUN apt-get update && apt-get install apt-transport-https
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-# Install dependencies
-RUN dpkg --add-architecture i386 && \
-  apt-get update && \
-  apt-get install -yq \
-  ant\
-  build-essential\
-  bzip2:i386\
-  file\
-  lib32ncurses5\
-  lib32z1\
-  libc6:i386\
-  libncurses5:i386\
-  libstdc++6:i386\
-  rsync\
-  unzip\
-  yarn\
-  zlib1g:i386\
-  supervisor\
-  --no-install-recommends && \
-  apt-get clean
-
-ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 8.12.0
-
-RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
-  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-# Download and untar SDK
-ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-RUN mkdir -p ${ANDROID_HOME} && \
-  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
-  cd ${ANDROID_HOME} && \
-  unzip -qq sdk.zip && \
-  rm sdk.zip && \
-  mkdir -p ${HOME}/.android && \
-  touch ${HOME}/.android/repositories.cfg
-
-ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
-ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
-
-ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
-RUN /tmp/configureAndroidSdk.sh --install-all-platforms
-
-# Install Android NDK
-ENV ANDROID_NDK_VERSION android-ndk-r10e
-ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
-ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
-ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
-ENV PATH $ANDROID_NDK:$PATH
-
-# i have no clue why some of this is here, but it's working elsewhere
-# it appears to install the NDK version expo needs, so that's cool
-RUN mkdir /ndk_setup && cd /ndk_setup && \
-  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
-  chmod +x ${ANDROID_NDK_FILE} && \
-  sync && \
-  ./${ANDROID_NDK_FILE} && \
-  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
-  cp -R \
-  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
-  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
-  cp -R \
-  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
-  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
-  cd && rm -rf /ndk_setup
-
-# Support Gradle
-ENV TERM dumb
-
-# Install gradle
-RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
-RUN unzip -qq gradle-4.4-all.zip
-RUN mv gradle-4.4 /usr/local
-RUN rm gradle-4.4-all.zip
-ENV GRADLE_HOME /usr/local/gradle-4.4
-ENV PATH ${GRADLE_HOME}/bin:$PATH
+# see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
+FROM gcr.io/exponentjs/turtle-android-base:0.1.0
 
 ADD . /app/turtle
 

docker-base/Dockerfile

@@ -0,0 +1,92 @@
+# If you ever need to rebuild this, run:
+# yarn docker:build-and-push:android-base-image NEW_IMAGE_SEMVER
+FROM openjdk:8u141
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# https://github.com/yarnpkg/yarn/issues/2821
+RUN apt-get update && apt-get install apt-transport-https
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+# Install dependencies
+RUN dpkg --add-architecture i386 && \
+  apt-get update && \
+  apt-get install -yq \
+  ant\
+  build-essential\
+  bzip2:i386\
+  file\
+  lib32ncurses5\
+  lib32z1\
+  libc6:i386\
+  libncurses5:i386\
+  libstdc++6:i386\
+  rsync\
+  unzip\
+  yarn\
+  zlib1g:i386\
+  supervisor\
+  --no-install-recommends && \
+  apt-get clean
+
+ENV NPM_CONFIG_LOGLEVEL warn
+ENV NODE_VERSION 8.12.0
+
+RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
+  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+# Download and untar SDK
+ENV ANDROID_HOME /usr/local/android-sdk-linux
+ENV ANDROID_SDK /usr/local/android-sdk-linux
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+RUN mkdir -p ${ANDROID_HOME} && \
+  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
+  cd ${ANDROID_HOME} && \
+  unzip -qq sdk.zip && \
+  rm sdk.zip && \
+  mkdir -p ${HOME}/.android && \
+  touch ${HOME}/.android/repositories.cfg
+
+ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
+ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
+
+ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
+RUN /tmp/configureAndroidSdk.sh --install-all-platforms
+
+# Install Android NDK
+ENV ANDROID_NDK_VERSION android-ndk-r10e
+ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
+ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
+ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
+ENV PATH $ANDROID_NDK:$PATH
+
+# i have no clue why some of this is here, but it's working elsewhere
+# it appears to install the NDK version expo needs, so that's cool
+RUN mkdir /ndk_setup && cd /ndk_setup && \
+  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
+  chmod +x ${ANDROID_NDK_FILE} && \
+  sync && \
+  ./${ANDROID_NDK_FILE} && \
+  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
+  cd && rm -rf /ndk_setup
+
+# Support Gradle
+ENV TERM dumb
+
+# Install gradle
+RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
+RUN unzip -qq gradle-4.4-all.zip
+RUN mv gradle-4.4 /usr/local
+RUN rm gradle-4.4-all.zip
+ENV GRADLE_HOME /usr/local/gradle-4.4
+ENV PATH ${GRADLE_HOME}/bin:$PATH

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.8.8",
+  "version": "0.10.0",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -24,7 +24,9 @@
     "test:smoke:android": "PLATFORM=android yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
     "release": "./scripts/release.sh",
-    "release:beta": "./scripts/releaseBeta.sh"
+    "release:beta": "./scripts/releaseBeta.sh",
+    "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh",
+    "docker:build-and-push:android-base-image": "./scripts/android/buildAndPushAndroidBaseImage.sh"
   },
   "husky": {
     "hooks": {
@@ -83,7 +85,7 @@
     "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
     "nodemon": "^1.18.11",
-    "release-it": "^10.0.0",
+    "release-it": "^12.3.4",
     "rimraf": "^2.6.2",
     "ts-jest": "^23.10.4",
     "ts-node": "^8.0.3",
@@ -96,7 +98,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "56.0.1-rc.0",
+    "@expo/xdl": "56.1.4-rc.0",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
+
+IMAGE_TAG="$1"
+if [[ -z "$IMAGE_TAG" ]]; then
+  echo "usage: yarn docker:build:android-base-image IMAGE_SEMVER"
+  exit 1
+fi
+
+IMAGE_VERSION_FULL_NAME="gcr.io/exponentjs/turtle-android-base:$IMAGE_TAG"
+IMAGE_LATEST_FULL_NAME="gcr.io/exponentjs/turtle-android-base:latest"
+
+pushd $ROOT_DIR > /dev/null
+echo docker build -f docker-base/Dockerfile -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
+echo "Successfully built $IMAGE_VERSION_FULL_NAME Docker image"
+echo gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
+echo gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
+echo "Successfully pushed $IMAGE_VERSION_FULL_NAME Docker image to GCloud"
+popd  > /dev/null

scripts/release.sh

@@ -4,6 +4,14 @@ set -eo pipefail
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
 
+if [[ -z "$GITHUB_TOKEN" || -z "$CIRCLE_API_USER_TOKEN" ]]; then
+  yellow=`tput setaf 3`
+  reset=`tput sgr0`
+  echo "${yellow}please set GITHUB_TOKEN and CIRCLE_API_USER_TOKEN env variables in .envrc.local file if you wish to release turtle-cli"
+  echo "run 'cp .envrc.local.example .envrc.local' if you don't have one yet and edit the new file${reset}"
+  exit 1
+fi
+
 $ROOT_DIR/node_modules/.bin/release-it
 echo
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

scripts/updateTurtleCliExampleRepo.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+DEPLOY_ENDPOINT_URL="https://circleci.com/api/v1.1/project/github/expo/turtle-cli-example/tree/updates-do-not-remove-me"
+
+curl -X POST \
+    --header "Content-Type: application/json" \
+    -u $CIRCLE_API_USER_TOKEN: \
+    -d '
+      {
+        "build_parameters": {
+          "CIRCLE_JOB": "update",
+          "TURTLE_TAG": "latest"
+        }
+      }' \
+    $DEPLOY_ENDPOINT_URL 2>/dev/null | jq -r .build_url

shellTarballs/android/sdk34

@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-d1aabbbe9d124201bf453fa985c36324ae4b76fb.tar.gz

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz
+s3://exp-artifacts/ios-expo-client-5b74b634263fa1980d88cdd9b7d8f16b06c36671.tar.gz

shellTarballs/ios/sdk31

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-e1a8bd0ab2e1eba546792c0ffc282b5b202ccc39.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-55848298c7332f7586c4281fa691a4ca31548532.tar.gz

shellTarballs/ios/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-dc981c7110b7d508de8e9c352064dc3d745c9f72.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-edd02214dd84368c197df32a2d30a901d6c766ff.tar.gz

shellTarballs/ios/sdk33

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-7a0e6bb94bd3edb2bc2dc501d6c09ad6edccd1bb.tar.gz

shellTarballs/ios/sdk34

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-7c4c6866646398874a092769299036e8d22e8d49.tar.gz

src/bin/setup/ios.ts

@@ -10,6 +10,7 @@ import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
 import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
 import config from 'turtle/config';
 import { PLATFORMS } from 'turtle/constants';
+import logger from 'turtle/logger';
 
 const REQUIRED_TOOLS: IToolDefinition[] = [
   {
@@ -30,7 +31,7 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       const fastlaneVersion = parseFastlaneVersion(stdout);
       if (fastlaneVersion && !semver.satisfies(fastlaneVersion, `>= ${MINIMAL_VERSION}`)) {
         throw new Error(
-          `Your fastlane on version ${fastlaneVersion}. Please upgrade it to at least ${MINIMAL_VERSION}.`,
+          `Your fastlane is on version ${fastlaneVersion}. Please upgrade it to at least ${MINIMAL_VERSION}.`,
         );
       }
     },
@@ -47,7 +48,30 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       if (stdout.match(/requires xcode/i)) {
         return false;
       }
-      return status === 0;
+
+      if (status !== 0) {
+        return false;
+      }
+
+      try {
+        await ExponentTools.spawnAsyncThrowError('ibtool', ['--version'], { stdio: 'pipe' });
+      } catch (err) {
+        if (err.stderr) {
+          const stderr = err.stderr.trim();
+          if (stderr.match(/Agreeing to the Xcode\/iOS license/)) {
+            logger.error('You have not accepted the Xcode license. Run \'sudo xcodebuild -runFirstLaunch\' to do so.');
+            return false;
+          }
+          if (stderr.match(/The bundle is damaged or missing necessary resources/)) {
+            logger.error(
+              'Make sure to install additional required components. Run \'sudo xcodebuild -runFirstLaunch\' to do so.',
+            );
+            return false;
+          }
+        }
+      }
+
+      return true;
     },
   },
 ];

src/bin/setup/utils/toolsDetector.ts

@@ -19,7 +19,7 @@ export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
     try {
       if (testFn) {
         if (!await testFn()) {
-          throw new Error('Required tool doesn\'t exist');
+          throw new Error('Required tool is not properly installed');
         }
       } else {
         await which(command);

src/bin/utils/builder.ts

@@ -94,7 +94,7 @@ const buildJobObject = async (
 ) => {
   const job = {
     config: {
-      ..._.get(appJSON, 'expo.ios.config', {}),
+      ..._.get(appJSON, `expo.${platform}.config`, {}),
       buildType,
       ...(platform === 'android' ? { buildMode } : {}),
       releaseChannel,

src/bin/utils/user.ts

@@ -1,4 +1,4 @@
-import { User as UserManager } from '@expo/xdl';
+import { UserManager } from '@expo/xdl';
 
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 

src/builders/android.ts

@@ -11,7 +11,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveNativeModules } from 'turtle/builders/utils/unimodules';
+import { resolveExplicitOptIn } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -73,9 +73,14 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
+  // (2019-07-31) We are explicitly choosing to disable this option until we have more
+  // infrastructure/tooling built around optional modules and OTA updates, as right now it's
+  // very easy for developers to break apps in production with optional modules.
+  //
+  // to enable full resolver switch resolveExplicitOptIn to resolveNativeModules
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
   const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))
+    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
     : null;
 
   try {

src/builders/ios/context.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 
-import { IosShellApp } from '@expo/xdl';
+import { ExponentTools, IosShellApp } from '@expo/xdl';
 import { v4 as uuidv4 } from 'uuid';
 
 import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
@@ -41,6 +41,7 @@ export function createBuilderContext(job: IJob): IContext {
 
   const sdkVersion = sdkVersionFromJob || sdkVersionFromManifest;
   const workingDir = formatShellAppDirectory({ sdkVersion, buildType: buildType! });
+  const majorSdkVersion = ExponentTools.parseSdkMajorVersion(sdkVersion);
 
   const context: any = {
     appDir: join(config.directories.temporaryFilesRoot, appUUID),
@@ -84,13 +85,24 @@ export function createBuilderContext(job: IJob): IContext {
       'Applications',
       `${EXPOKIT_APP}.app`,
     );
-    context.workspacePath = path.join(
-      workingDir,
-      'shellAppWorkspaces',
-      'ios',
-      'default',
-      `${EXPOKIT_APP}.xcworkspace`,
-    );
+    if (majorSdkVersion >= 33) {
+      context.workspacePath = path.join(
+        workingDir,
+        'shellAppWorkspaces',
+        'default',
+        'ios',
+        `${EXPOKIT_APP}.xcworkspace`,
+      );
+    } else {
+      context.workspacePath = path.join(
+        workingDir,
+        'shellAppWorkspaces',
+        'ios',
+        'default',
+        `${EXPOKIT_APP}.xcworkspace`,
+      );
+    }
+
   } else if (buildType === IOS_BUILD_TYPES.CLIENT) {
     context.outputPath = join(context.appDir, 'archive.xcarchive');
     context.uploadPath = join(context.buildDir, 'archive.ipa');

src/builders/utils/android/credentials.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { Credentials } from '@expo/xdl';
+import { AndroidCredentials } from '@expo/xdl';
 import fs from 'fs-extra';
 import get from 'lodash/get';
 import uuidv4 from 'uuid/v4';
@@ -29,7 +29,7 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
       );
     }
 
-    await Credentials.Android.createKeystore(
+    await AndroidCredentials.createKeystore(
       {
         keystorePath: keystoreFilename,
         keystorePassword: credentials.keystorePassword,

src/builders/utils/unimodules.ts

@@ -19,6 +19,20 @@ interface IPackageInfo {
   dependencies: string[];
 }
 
+export async function resolveExplicitOptIn(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
+  const resolver = new Resolver(workingdir);
+  await resolver.init();
+
+  const optionalModules = ['expo-branch', 'expo-face-detector'];
+  resolver.addAll();
+  const modules = packages
+    ? resolver.getModules().filter((mod) => !optionalModules.includes(mod.name) || packages.includes(mod.name))
+    : resolver.getModules().filter((mod) => !optionalModules.includes(mod.name));
+
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
+  return modules;
+}
+
 export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
   const resolver = new Resolver(workingdir);
   await resolver.init();
@@ -38,8 +52,9 @@ export async function resolveNativeModules(workingdir: string, packages?: string
       }
     }
   }
-
-  return resolver.getModules();
+  const modules = resolver.getModules();
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
+  return modules;
 }
 
 async function readCorePackages(workingdir: string) {
@@ -101,7 +116,6 @@ class Resolver {
       return;
     }
     const pkg = this.dependencyMap[moduleName];
-    logger.info(`Adding ${moduleName}:${pkg.version}`);
     this.modulesMap[moduleName] = {
       name: pkg.name,
       dirname: pkg.dirname,