refactor logger - brings back jobID and experienceName to android logs

2026-11-14 19:12:55 -10:00 · 2019-04-26 11:35:48 +02:00
73 changed files with 878 additions and 2511 deletions
@@ -33,12 +33,10 @@ commands:
          command: |
            nix-env -iA \
              nixpkgs.binutils \
-              nixpkgs.curl \
              nixpkgs.direnv \
              nixpkgs.findutils \
              nixpkgs.gawk \
              nixpkgs.git \
-              nixpkgs.gnused \
              nixpkgs.gnutar \
              nixpkgs.gzip \
              nixpkgs.openssh \
@@ -5,79 +5,6 @@ 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]
-### Added
- Adhoc Builds: use provisioningProfileId if specified.
- Registering supported SDK versions in Redis.
-
-## [0.8.6] - 2019-06-25
-### Added
- Added support for Android build modes: debug or release.
-### Fixed
- Upgrading the shell app for a given SDK version when the previous version is already downloaded (bug in `turtle-cli`).
- Updated Android shell app for SDK33 to include `[email protected]` which fixes crashes on Android 9.0 when showing some Lottie animations.
- Schema for `buildModes`.
- Updated @expo/xdl to 55.0.7 (fixed reading from binary plist).
-
-## [0.8.4] - 2019-06-13
-### Changed
- Upgraded `sharp` from `0.21.3` to `0.22.1`.
- `gulp-cli` is no longer required to build an app with `turtle-cli`.
-
-## [0.8.3] - 2019-06-13
-### Added
- Running Android Turtle process with `supervisor` (pod is restarted if there were 5 failures in the last 10 minutes).
-### Changed
- `turtle-cli` is now fetching the app manifest before running the build.
-
-## [0.8.2] - 2019-06-11
-### Changed
- Updated Android shell app for SDK33 to remove `expo-face-detector` and `expo-payments-stripe` from standalone builds.
- Updated Android shell app for SDK33 to get rid of `node_modules` for `tools-public`.
- From now on, `turtle-cli` installs dependencies for `tools-public` in shell apps for SDK versions < 33.
-### Fixed
- Android builds with turtle-cli by installing all unmodules if `dependencies` is empty.
-
-## [0.8.1] - 2019-06-10
-### Changed
- Add expo dependencies when resolving unimodules.
-### Fixed
- Support for Android tarballs without `universe-package.json`.
-
-## [0.8.0] - 2019-06-07
-### Added
- Turtle CLI logo to the project (created by [@zularizal](https://github.com/zularizal))!
- Shell apps for SDK 33.
- Support for Android App Bundles (App bundles are built by default, use `-t apk` to build apk).
-### Changed
- Updated Android shell app for SDK 32 to fix AppAuth issue (https://github.com/expo/expo/pull/4115) and to fix a newer than expected JSC version.
- Default value for build timeout to 15 minutes.
- Added filtering of logs (strips out download progress) when downloading SDK tools.
- `xdl` -> `@expo/xdl`, updated `@expo/xdl`.
-### Fixed
- Generating Android keystore in turtle when one is not passed to turtle-cli (https://github.com/expo/turtle/pull/65).
- Upload logs to s3 if build has been canceled or timed out.
- Unhandled exception on asset download (xdl).
-
-## [0.7.2] - 2019-05-09
-### Added
- Support for Android tarballs without `universe-package.json`.
-### Changed
- Upgraded `@expo/traveling-fastlane-darwin` to 1.9.4 (fixes issues with generating provisioning profiles for ad-hoc builds).
-### Removed
- Support for `CLIENT_LOGGER_LEVEL` env variable.
-
-## [0.7.1] - 2019-05-06
-### Fixed
- Resolving `fastlane` version when `LC_ALL` is not set.
-
-## [0.7.0] - 2019-05-06
-### Added
- Support for custom Android builds.
-### Changed
- Refactored logger.
-### Fixed
- `platform` log field wrongly set to `ios` for Android builds (when using `turtle-cli`).
- Brought back `jobID` and `experienceName` fields to Android logs.

 ## [0.6.1] - 2019-04-23
 ### Added
@@ -129,7 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [0.5.10] - 2019-02-19
 ### Added
- Registering Turtle version in Redis.
+- Register Turtle version in Redis.
 ### Changed
 - Update Android shell app for SDK 32 to fix [update](https://github.com/expo/expo/issues/3504) and [back button](https://github.com/expo/expo/issues/1786) issues.

@@ -20,11 +20,9 @@ RUN dpkg --add-architecture i386 && \
  libc6:i386\
  libncurses5:i386\
  libstdc++6:i386\
-  rsync\
  unzip\
  yarn\
  zlib1g:i386\
-  supervisor\
  --no-install-recommends && \
  apt-get clean

@@ -52,8 +50,20 @@ 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
+RUN yes | sdkmanager --licenses > /dev/null
+RUN yes | sdkmanager \
+  "platforms;android-23" \
+  "platforms;android-24" \
+  "platforms;android-25" \
+  "platforms;android-26" \
+  "platforms;android-27" \
+  "platforms;android-28"
+RUN yes | sdkmanager "platform-tools"
+RUN yes | sdkmanager "build-tools;28.0.3"
+RUN yes | sdkmanager \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services"

 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e
@@ -89,29 +99,20 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH

-ADD . /app/turtle
+ADD . /app

-RUN mv /app/turtle/workingdir /app && \
-    for SDK_VERSION in `ls /app/workingdir/android/`; do \
-      echo "preparing $SDK_VERSION shell app" && \
+RUN for SDK_VERSION in `ls /app/workingdir/android/`; do \
      cd /app/workingdir/android/$SDK_VERSION && \
-      if [ -f universe-package.json ]; then \
      mv package.json exponent-package.json && \
      mv universe-package.json package.json && \
      yarn install && \
      mv package.json universe-package.json && \
-      mv exponent-package.json package.json; \
-      else \
-      yarn install; \
-      fi \
-    ; done && \
-    mv /app/workingdir /app/turtle
+      mv exponent-package.json package.json \
+    ; done
+
+WORKDIR /app

 ENV NODE_ENV "production"
-ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
+ENV TURTLE_WORKING_DIR_PATH /app/workingdir/

-WORKDIR /app/turtle
-
-ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-CMD ["/usr/bin/supervisord"]
+CMD ["node", "./build/server.js"]
@@ -1,6 +1,4 @@
-<h3 align=center>
- <img src="logo/horizontal.png" width=50%>
-</h3>
+# Turtle CLI

 [![CircleCI](https://img.shields.io/circleci/project/github/expo/turtle/master.svg)](https://circleci.com/gh/expo/turtle)
 [![NPM](https://img.shields.io/npm/v/turtle-cli/latest.svg)](https://npmjs.com/package/turtle-cli)
@@ -9,8 +7,6 @@
 [![Expo Developers Slack](https://img.shields.io/badge/Expo%20Developers-e01563.svg?logo=slack)](http://slack.expo.io)
 [![Expo Forums](https://img.shields.io/badge/Expo%20Forums-blue.svg)](https://forums.expo.io/)

-<hr />
-
 Turtle CLI is a command line interface for building Expo standalone apps.
 You can use it both on your CI and your private computer.

@@ -22,7 +22,7 @@ spec:
        environment: ${NAMESPACE}
    spec:
      restartPolicy: Always
-      terminationGracePeriodSeconds: 1200 ## wait 20 minutes for any builds to complete
+      terminationGracePeriodSeconds: 1800 ## wait 30 minutes for any builds to complete
      tolerations:
      - key: dedicated
        operator: Equal
@@ -128,16 +128,6 @@ spec:
              secretKeyRef:
                name: turtle-js-config
                key: api_port
-          - name: DATADOG_API_KEY
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: datadog_api_key
-          - name: DATADOG_APP_KEY
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: datadog_app_key
          # other vars
          - name: GRADLE_DAEMON_DISABLED
            value: "1"
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="151.68256mm"
-   height="150.14914mm"
-   viewBox="0 0 151.68255 150.14914"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="logo-only.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <defs
-     id="defs2">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath16">
-      <path
-         d="M 0,192 H 192 V 0 H 0 Z"
-         id="path18"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath26">
-      <path
-         d="M -4.88281e-4,192 H 192 V -4.88281e-4 H -4.88281e-4 Z"
-         id="path28"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath34">
-      <path
-         d="M -4.88281e-4,192 H 192 V -4.88281e-4 H -4.88281e-4 Z"
-         id="path36"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath38">
-      <path
-         d="M 0,192 H 192 V 0 H 0 Z"
-         id="path40"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath42">
-      <path
-         d="M 0,192 H 192 V 0 H 0 Z"
-         id="path44"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath116">
-      <path
-         d="M 0,192 H 192 V -4.88281e-4 H 0 Z"
-         id="path118"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath120">
-      <path
-         d="M 0,192 H 192 V 4.88281e-4 H 0 Z"
-         id="path122"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath124">
-      <path
-         d="M 192,192 H 0 V 0 h 192 z"
-         id="path126"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#3d3d3d"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.49497474"
-     inkscape:cx="-192.6803"
-     inkscape:cy="237.87441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     units="mm"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="705"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:object-paths="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"
-     transform="translate(-29.1587,91.282943)">
-    <g
-       id="g6678"
-       transform="translate(792.65276,-237.50395)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6638"
-         d="m -687.31547,152.53653 -16.98554,9.86968 v 19.204 l 15.52774,-8.98033 a 2.9187589,2.9239263 0 0 1 1.52654,-0.38809 2.9187589,2.9239263 0 0 1 1.39009,0.38809 l 15.52721,8.98033 v -19.204 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6640"
-         d="m -687.3165,178.53959 -48.20947,27.88306 v 55.7661 l 48.20947,27.88306 48.20996,-27.88306 v -55.7661 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6642"
-         d="m -738.44361,184.99346 -16.985,9.86968 v 19.74092 l 14.06631,8.17418 v -18.04386 a 2.9187589,2.9239263 0 0 1 1.45986,-2.5337 l 15.57269,-9.00617 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6644"
-         d="m -634.61997,184.99346 -14.89522,8.65426 14.78772,8.55296 a 2.9187589,2.9239263 0 0 1 1.45986,2.5337 v 18.95491 l 15.63418,-9.08523 v -19.74092 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6646"
-         d="m -741.3623,245.97166 -16.30752,9.47642 v 19.74091 l 16.98398,9.87124 16.47753,-9.57513 -15.69413,-9.07748 a 2.9187589,2.9239263 0 0 1 -1.45986,-2.5306 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path6648"
-         d="m -633.26761,247.66664 v 16.21038 a 2.9187589,2.9239263 0 0 1 -1.45986,2.5306 l -17.35915,10.0397 v 5.2e-4 l 0.20309,-0.11782 15.02182,8.73022 16.98655,-9.87124 v -19.74091 z"
-         style="opacity:1;fill:#00002f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291651;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
-      <g
-         id="g6654"
-         transform="translate(-172.35714,278.19048)">
-        <path
-           inkscape:connector-curvature="0"
-           id="path6650"
-           d="m -514.88984,-105.94886 a 2.918759,2.9239263 0 0 0 -1.52625,0.388 l -51.12915,29.57121 a 2.918759,2.9239263 0 0 0 -1.45977,2.5338 v 59.142302 a 2.918759,2.9239263 0 0 0 1.45977,2.530901 l 51.12915,29.571197 a 2.918759,2.9239263 0 0 0 2.91661,0 l 51.12917,-29.571197 a 2.918759,2.9239263 0 0 0 1.45977,-2.530901 V -73.45585 a 2.918759,2.9239263 0 0 0 -1.45977,-2.5338 l -51.12917,-29.57121 a 2.918759,2.9239263 0 0 0 -1.39036,-0.388 z m -0.0694,6.298204 48.20963,27.882906 v 55.766001 l -48.20963,27.883001 -48.20965,-27.883001 V -71.76775 Z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6652"
-           d="m -514.88885,-85.717946 a 2.9118515,2.9308623 0 0 0 -1.52531,0.3904 l -33.47339,19.451796 a 2.9118515,2.9308623 0 0 0 -1.45528,2.5391 v 38.903402 a 2.9118515,2.9308623 0 0 0 1.45528,2.537198 l 33.47339,19.4517023 a 2.9118515,2.9308623 0 0 0 2.91246,0 l 33.47151,-19.4517023 a 2.9118515,2.9308623 0 0 0 1.45528,-2.537198 V -63.33665 a 2.9118515,2.9308623 0 0 0 -1.45528,-2.5391 l -33.47151,-19.451796 a 2.9118515,2.9308623 0 0 0 -1.38715,-0.3904 z m -0.0699,6.312396 30.56093,17.760299 V -26.12465 L -514.95875,-8.3663467 -545.5197,-26.12665 v -35.518601 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <g
-         id="g6660"
-         transform="translate(-172.35714,278.19048)">
-        <path
-           id="path6656"
-           d="m -519.66912,-32.288849 -5.84307,5.844 h 25.07044 a 2.9220001,2.9220001 0 0 0 0,-5.844 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#45eba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path6658"
-           d="m -529.50808,-61.355249 a 2.9213416,2.9213416 0 0 0 -2.0341,5.017 l 12.45256,12.452501 -12.45256,12.452599 a 2.9213416,2.9213416 0 1 0 4.1329,4.129201 l 14.51539,-14.515401 a 2.9213416,2.9213416 0 0 0 0,-4.1328 l -14.51539,-14.515401 a 2.9213416,2.9213416 0 0 0 -2.0988,-0.887699 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#45eba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <g
-         id="g6676"
-         transform="translate(-172.35714,278.19048)">
-        <g
-           id="g6672">
-          <path
-             inkscape:connector-curvature="0"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m -514.89008,-131.96866 a 2.9118515,2.9308623 0 0 0 -1.52426,0.3917 l -19.89585,11.5625 a 2.9118515,2.9308623 0 0 0 -1.45673,2.5388 v 23.125004 a 2.9118515,2.9308623 0 0 0 0.18924,1.02881 l 5.63388,-3.25861 v -19.203604 l 16.98527,-9.87 16.98619,9.87 v 19.203604 l 5.6348,3.25861 a 2.9118515,2.9308623 0 0 0 0.18734,-1.02881 v -23.125004 a 2.9118515,2.9308623 0 0 0 -1.4558,-2.5388 l -19.89678,-11.5625 a 2.9118515,2.9308623 0 0 0 -1.3873,-0.3917 z"
-             id="path6662" />
-          <path
-             inkscape:connector-curvature="0"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m -566.01799,-99.511956 a 2.9118515,2.9308623 0 0 0 -1.52421,0.3918 l -19.89585,11.56251 a 2.9118515,2.9308623 0 0 0 -1.45673,2.5387 v 23.124998 a 2.9118515,2.9308623 0 0 0 1.45673,2.537899 l 18.43343,10.7124 v -6.768201 l -14.06704,-8.174598 v -19.740898 l 16.98522,-9.8699 14.11368,8.2012 5.83733,-3.3766 -18.49521,-10.74751 a 2.9118515,2.9308623 0 0 0 -1.38735,-0.3918 z"
-             id="path6664" />
-          <path
-             inkscape:connector-curvature="0"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m -462.19425,-99.511956 a 2.9118515,2.9308623 0 0 0 -1.52421,0.3918 l -19.27591,11.20211 5.83641,3.3755 14.89526,-8.6547 16.98619,9.8699 v 19.740898 l -15.63409,9.085498 v 6.765401 a 2.9118515,2.9308623 0 0 0 0.10365,-0.058 l 19.89775,-11.5625 a 2.9118515,2.9308623 0 0 0 1.45483,-2.537801 v -23.124996 a 2.9118515,2.9308623 0 0 0 -1.45483,-2.5388 l -19.89775,-11.56251 a 2.9118515,2.9308623 0 0 0 -1.3873,-0.3918 z"
-             id="path6666" />
-          <path
-             inkscape:connector-curvature="0"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m -569.00462,-38.844049 a 2.9118515,2.9308623 0 0 0 -0.77875,0.308999 l -19.89683,11.562501 a 2.9118515,2.9308623 0 0 0 -1.45672,2.538801 v 23.1250003 a 2.9118515,2.9308623 0 0 0 1.45672,2.537801 l 19.89683,11.5624977 a 2.9118515,2.9308623 0 0 0 2.91058,0 l 19.89775,-11.5624977 a 2.9118515,2.9308623 0 0 0 0.77778,-0.66460201 l -5.65379,-3.26999799 -16.47749,9.575199 -16.98435,-9.8709 V -22.74215 l 16.30827,-9.477299 z"
-             id="path6668" />
-          <path
-             inkscape:connector-curvature="0"
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17499971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m -460.9106,-37.293149 v 6.769201 l 13.39292,7.781798 v 19.7409023 l -16.9862,9.8709 -15.02174,-8.729901 -5.83733,3.375502 19.40327,11.2762977 a 2.9118515,2.9308623 0 0 0 2.91155,0 l 19.89678,-11.5624977 a 2.9118515,2.9308623 0 0 0 1.4558,-2.537801 V -24.433748 a 2.9118515,2.9308623 0 0 0 -1.4558,-2.538801 z"
-             id="path6670" />
-        </g>
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#21aba5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.17500019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m -531.46275,-116.06384 -0.48112,0.27957 v 5.56039 a 2.9213415,2.9213415 0 0 0 0.0171,0 h 33.93644 a 2.9213415,2.9213415 0 0 0 0.0181,-5.2e-4 v -5.55987 l -0.48109,-0.27957 z"
-           id="path6674"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-</svg>
@@ -1,6 +1,6 @@
 {
  "name": "turtle-cli",
-  "version": "0.8.6",
+  "version": "0.6.1",
  "description": "The command-line tool for building standalone Expo apps",
  "preferGlobal": true,
  "scripts": {
@@ -13,7 +13,6 @@
    "prepare": "rimraf ./build && yarn build",
    "build": "ttsc",
    "build:production": "./scripts/build.sh",
-    "watch": "ttsc --watch",
    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
    "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
    "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
@@ -37,11 +36,7 @@
    "set-priorities:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setConfigurations.ts",
    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-priorities:default",
    "set-priorities:staging": "yarn set-priorities:default",
-    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default",
-    "set-replica-count:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setReplicaCount.ts | bunyan -o short -l debug",
-    "set-replica-count:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-replica-count:default",
-    "set-replica-count:staging": "yarn set-replica-count:default",
-    "set-replica-count:production": "EXPENV_OVERRIDES=prod yarn set-replica-count:default"
+    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default"
  },
  "husky": {
    "hooks": {
@@ -60,7 +55,7 @@
  "files": [
    "bin",
    "build",
-    "scripts/android/configureAndroidSdk.sh",
+    "scripts/cli",
    "shellTarballs"
  ],
  "keywords": [
@@ -84,7 +79,7 @@
    "@types/fs-extra": "^5.0.4",
    "@types/jest": "^23.3.9",
    "@types/joi": "^13.4.3",
-    "@types/lodash": "^4.14.129",
+    "@types/lodash": "^4.14.109",
    "@types/progress": "^2.0.1",
    "@types/raven": "^2.5.1",
    "@types/request": "^2.47.1",
@@ -111,7 +106,6 @@
  },
  "dependencies": {
    "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "55.0.7",
    "@google-cloud/logging-bunyan": "^0.9.5",
    "async-retry": "^1.2.1",
    "aws-sdk": "^2.226.1",
@@ -121,24 +115,24 @@
    "commander": "^2.15.1",
    "copy": "^0.3.1",
    "decompress": "^4.2.0",
-    "dogapi": "^2.8.3",
    "fs-extra": "^6.0.0",
    "ioredis": "^3.2.2",
    "is-semver": "^1.0.8",
    "joi": "^13.2.0",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.10",
    "progress": "^2.0.0",
    "raven": "^2.6.2",
    "request": "^2.88.0",
    "request-progress": "^3.0.0",
    "semver": "^6.0.0",
-    "sharp": "0.22.1",
+    "sharp": "^0.21.0",
    "source-map-support": "^0.5.6",
    "tar": "^4.4.6",
    "uuid": "^3.2.1",
-    "which": "^1.3.1"
+    "which": "^1.3.1",
+    "xdl": "53.5.3"
  },
  "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.9.4"
+    "@expo/traveling-fastlane-darwin": "^1.8.1"
  }
 }
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
-
-yes | $SDKMANAGER --licenses > /dev/null
-if [[ "$1" = "--install-all-platforms" ]]; then
-  yes | $SDKMANAGER \
-    "platforms;android-23" \
-    "platforms;android-24" \
-    "platforms;android-25" \
-    "platforms;android-26" \
-    "platforms;android-27" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-fi
-yes | $SDKMANAGER "platforms;android-28" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "platform-tools" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "build-tools;28.0.3" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER \
-  "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-printf "READY\n"; # signal to superivsord that listener is ready
-
-while read line; do
-  echo "[supervisord:eventlistener] Processing Event: $line" >&2;
-  kill -SIGQUIT $PPID
-done < /dev/stdin
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
+
+yes | $SDKMANAGER --licenses > /dev/null
+yes | $SDKMANAGER "platforms;android-28"
+yes | $SDKMANAGER "platform-tools"
+yes | $SDKMANAGER "build-tools;28.0.3"
+yes | $SDKMANAGER \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services"
@@ -36,7 +36,7 @@ setup_local() {
  mkdir -p $WORKINGDIR
  echo "$WORKINGDIR directory created"

-  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces" "node_modules")
+  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces")

  for LINKNAME in ${LINKS[@]}; do
    ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
@@ -55,18 +55,6 @@ setup_remote() {
      $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
    fi
  fi
-  
-  for sdk in $ROOT_DIR/workingdir/android/* ; do
-    if [[ -f "$sdk/universe-package.json" ]]; then
-      mv $sdk/package.json $sdk/exponent-package.json
-      mv $sdk/universe-package.json $sdk/package.json
-      cd $sdk && yarn
-    else
-      if [[ -f "$sdk/package.json" ]]; then
-        cd $sdk && yarn
-      fi
-    fi
-  done
 }

 switch_local() {
@@ -21,6 +21,5 @@ export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
-export DATADOG_DISABLED="true"

 yarn test:smoke:android
@@ -19,7 +19,6 @@ export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
-export DATADOG_DISABLED="true"

 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
 SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
@@ -21,6 +21,5 @@ export API_HOSTNAME="noop"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
-export DATADOG_DISABLED="true"

 yarn test:unit
@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-f796aaffa0b5715079b2950faf26c2ff4e53e4c0.tar.gz
+s3://exp-artifacts/android-shell-builder-0cab68670fc50ce1dc16b7d86ca7976870062c39.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-5090aab941f92c912c6643a1e25cc69f9f67d8e6.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz
+s3://exp-artifacts/ios-expo-client-15bb883c22173d5b01df19421580170e776041d0.tar.gz
@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-26-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-a2b1e16f330b36fa0dc627a76caabe4d2ff45f77.tar.gz
@@ -13,28 +13,3 @@ export const TYPE_DIMENSIONS = (type: string) => [
    { Name: 'host', Value: config.hostname },
  ],
 ];
-
-export const PRIORITY_DIMENSIONS = (type: string, priority: string) => [
-  [
-    { Name: 'env', Value: config.deploymentEnv },
-    { Name: 'platform', Value: config.platform },
-    { Name: 'priority', Value: priority },
-  ],
-  [
-    { Name: 'env', Value: config.deploymentEnv },
-    { Name: 'platform', Value: config.platform },
-    { Name: 'type', Value: type },
-  ],
-  [
-    { Name: 'env', Value: config.deploymentEnv },
-    { Name: 'platform', Value: config.platform },
-    { Name: 'type', Value: type },
-    { Name: 'priority', Value: priority },
-  ],
-  [
-    { Name: 'env', Value: config.deploymentEnv },
-    { Name: 'platform', Value: config.platform },
-    { Name: 'type', Value: type },
-    { Name: 'host', Value: config.hostname },
-  ],
-];
@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';

 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -14,30 +15,18 @@ export default (program: any, setCommonCommandOptions: any) => {
    .option(
      '--keystore-path <app.jks>',
      'path to your Keystore (please provide Keystore password and Key password as EXPO_ANDROID_KEYSTORE_PASSWORD'
-      + ' and EXPO_ANDROID_KEY_PASSWORD env variables)',
+      + 'and EXPO_ANDROID_KEY_PASSWORD env variables)',
    )
    .option('--keystore-alias <alias>', 'keystore Alias')
-    .option(
-      '-t --type <build>',
-      'type of build: app-bundle|apk',
-      /^(app-bundle|apk)$/i,
-      'app-bundle',
-    )
-    .option(
-      '-m --mode <build>',
-      'type of build: debug|release',
-      /^(debug|release)$/i,
-      'release',
-    )
    .description(
-      'Build a standalone APK or App Bundle for your project, either signed and ready for submission to'
-      + ' the Google Play Store or in debug mode.',
+      'Build a standalone APK for your project, signed and ready for submission to the Google Play Store.',
    )
    .asyncAction(
      createBuilderAction({
        program,
        command,
        prepareCredentials,
+        buildJobObject,
        builder,
        platform: PLATFORMS.ANDROID,
        os: ['darwin', 'linux'],
@@ -45,6 +34,20 @@ export default (program: any, setCommonCommandOptions: any) => {
    );
 };

+const buildJobObject = (appJSON: any, { releaseChannel, username, projectDir, publicUrl }: any, credentials: any) => ({
+  config: {
+    ..._.get(appJSON, 'expo.android.config', {}),
+    releaseChannel,
+    publicUrl,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.ANDROID,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  projectDir,
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
  const { keystorePath, keystoreAlias } = cmd;
  const keystorePassword = process.env.EXPO_ANDROID_KEYSTORE_PASSWORD;
@@ -1,10 +1,11 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';

 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
 import builder from 'turtle/builders/ios';
-import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
+import { IOS, PLATFORMS } from 'turtle/constants';

 export default (program: any, setCommonCommandOptions: any) => {
  const command = program.command('build:ios [project-dir]');
@@ -31,6 +32,7 @@ export default (program: any, setCommonCommandOptions: any) => {
        program,
        command,
        prepareCredentials,
+        buildJobObject,
        builder,
        platform: PLATFORMS.IOS,
        os: 'darwin',
@@ -38,8 +40,23 @@ export default (program: any, setCommonCommandOptions: any) => {
    );
 };

+const buildJobObject = (appJSON: any, { releaseChannel, buildType, username, publicUrl }: any, credentials: any) => ({
+  config: {
+    ..._.get(appJSON, 'expo.ios.config', {}),
+    buildType,
+    releaseChannel,
+    bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier'),
+    publicUrl,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.IOS,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
-  if (cmd.type !== IOS_BUILD_TYPES.ARCHIVE) {
+  if (cmd.type !== IOS.BUILD_TYPES.ARCHIVE) {
    return null;
  }

@@ -1,8 +1,8 @@
 import path from 'path';

-import { LoggerDetach, ModuleVersion } from '@expo/xdl';
 import program, { Command } from 'commander';
 import fs from 'fs-extra';
+import { LoggerDetach, ModuleVersion } from 'xdl';

 import * as commands from 'turtle/bin/commands';
 import logger from 'turtle/logger';
@@ -1,9 +1,9 @@
 import path from 'path';
 import util from 'util';

-import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
+import { ExponentTools } from 'xdl';

 import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
@@ -20,6 +20,10 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
    command: 'bash',
    missingDescription: 'Please install bash',
  },
+  {
+    command: 'gulp',
+    missingDescription: 'Run `npm install -g gulp-cli` (or `yarn global add gulp-cli`) to install gulp',
+  },
  {
    command: 'javac',
    missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
@@ -63,26 +67,18 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
  return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }

-async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: string) {
+async function _shellAppPostDownloadAction(workingdir: string) {
  const inWorkingdir = (filename: string) => path.join(workingdir, filename);

-  if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
-    // legacy shell app built from universe
-    await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
-    await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
-    await _installNodeModules(workingdir);
-    await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
-    await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
-  } else {
-    // new shell app built from expo or not
-    await _installNodeModules(workingdir);
-  }
+  await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
+  await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
+  await _installNodeModules(workingdir);
+  await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
+  await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));

-  // TODO: remove this after making sure that we don't need node_modules in tools-public for older sdks
-  if (ExponentTools.parseSdkMajorVersion(sdkVersion) < 33) {
-    const toolsPublicDir = path.join(workingdir, 'tools-public');
-    await _installNodeModules(toolsPublicDir);
-  }
+  // TODO: remove following lines after upgrading android shell app
+  const toolsPublicDir = path.join(workingdir, 'tools-public');
+  await _installNodeModules(toolsPublicDir);
 }

 async function _installNodeModules(cwd: string) {
@@ -4,7 +4,7 @@ import path from 'path';
 import decompress from 'decompress';
 import fs from 'fs-extra';

-import * as utils from 'turtle/bin/setup/utils/common';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -16,10 +16,9 @@ const l = logger.child(LOGGER_FIELDS);

 export default async function ensureAndroidNDKIsPresent() {
  const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
-  await utils.removeDirectoryUnlessReady(androidNdkDir);
  if (!(await fs.pathExists(androidNdkDir))) {
    await fs.ensureDir(androidNdkDir);
-    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
+    const androidNdkDownloadPath = formatArtifactDownloadPath(ANDROID_NDK_URL);

    try {
      l.info('Downloading Android NDK');
@@ -27,7 +26,6 @@ export default async function ensureAndroidNDKIsPresent() {
      await download(ANDROID_NDK_URL, androidNdkDownloadPath);
      l.info('Decompressing Android NDK');
      await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
-      await utils.markDirectoryAsReady(androidNdkDir);
      l.info('Android NDK installed successfully');
    } catch (err) {
      await fs.remove(androidNdkDir);
@@ -1,11 +1,11 @@
 import os from 'os';
 import path from 'path';

-import { ExponentTools } from '@expo/xdl';
 import decompress from 'decompress';
 import fs from 'fs-extra';
+import { ExponentTools } from 'xdl';

-import * as utils from 'turtle/bin/setup/utils/common';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -17,10 +17,9 @@ const l = logger.child(LOGGER_FIELDS);

 export default async function ensureAndroidSDKIsPresent() {
  const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
-  await utils.removeDirectoryUnlessReady(androidSdkDir);
  if (!(await fs.pathExists(androidSdkDir))) {
    await fs.ensureDir(androidSdkDir);
-    const androidSdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_SDK_URL);
+    const androidSdkDownloadPath = formatArtifactDownloadPath(ANDROID_SDK_URL);

    try {
      l.info('Downloading Android SDK');
@@ -32,7 +31,6 @@ export default async function ensureAndroidSDKIsPresent() {
      await fs.remove(androidSdkDownloadPath);
      l.info('Configuring Android SDK, this may take a while');
      await _configureSdk(androidSdkDir);
-      await utils.markDirectoryAsReady(androidSdkDir);
      l.info('Android SDK installed and configured successfully');
    } catch (err) {
      await fs.remove(androidSdkDir);
@@ -54,7 +52,7 @@ async function _configureSdk(androidSdkDir: string) {
  await ExponentTools.spawnAsyncThrowError('./configureAndroidSdk.sh', [], {
    pipeToLogger: true,
    loggerFields: LOGGER_FIELDS,
-    cwd: path.join(config.directories.rootDir, 'scripts/android'),
+    cwd: path.join(config.directories.rootDir, 'scripts/cli'),
    env: {
      ...process.env,
      ANDROID_HOME: androidSdkDir,
@@ -3,7 +3,7 @@ import trim from 'lodash/trim';
 import path from 'path';
 import semver from 'semver';

-import { ExponentTools } from '@expo/xdl';
+import { ExponentTools } from 'xdl';

 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -25,13 +25,11 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
      const { stdout } = await ExponentTools.spawnAsyncThrowError(
        'fastlane',
        ['--version'],
-        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1', LC_ALL: 'en_US.UTF-8' } },
+        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1' } },
      );
      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}.`,
-        );
+        throw new Error(`Please install newer version of fastlane (>= ${MINIMAL_VERSION})`);
      }
    },
  },
@@ -1,8 +1,8 @@
 import path from 'path';

-import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import tar from 'tar';
+import { ExponentTools } from 'xdl';

 import download from 'turtle/bin/setup/utils/downloader';
 import { ensureToolsAreInstalled, IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -17,7 +17,7 @@ interface IShellAppFormaters {
  formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }

-type PostDownloadAction = (sdkVersion: string, workingdir: string) => void;
+type PostDownloadAction = (workingdir: string) => void;

 export async function checkSystem(requiredTools: IToolDefinition[]) {
  await ensureToolsAreInstalled(requiredTools);
@@ -29,17 +29,14 @@ export async function ensureShellAppIsPresent(
  postDownloadAction?: PostDownloadAction,
 ) {
  const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
-  const shellAppMetadata = await _readShellAppTarballS3Uri(sdkVersion, formatters);
-  await removeDirectoryUnlessReady(workingdir, shellAppMetadata);
  if (await fs.pathExists(workingdir)) {
    return;
  }
  l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
  await _downloadShellApp(sdkVersion, workingdir, formatters);
  if (postDownloadAction) {
-    await postDownloadAction(sdkVersion, workingdir);
+    await postDownloadAction(workingdir);
  }
-  await markDirectoryAsReady(workingdir, shellAppMetadata);
 }

 async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
@@ -68,31 +65,3 @@ async function _readShellAppTarballS3Uri(sdkVersion: string, formatters: IShellA
  const data = await fs.readFile(filePath, 'utf8');
  return data.trim();
 }
-
-export async function removeDirectoryUnlessReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  const readyFileExists = await fs.pathExists(readyFilePath);
-  let shouldRemove = false;
-  if (readyFileExists) {
-    if (metadata !== undefined) {
-      const readyFileContents = (await fs.readFile(readyFilePath, 'utf-8')).trim();
-      if (readyFileContents !== metadata) {
-        shouldRemove = true;
-       }
-    }
-  } else {
-    shouldRemove = true;
-  }
-  if (shouldRemove) {
-    await fs.remove(dir);
-  }
-}
-
-export async function markDirectoryAsReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  if (metadata === undefined) {
-    await fs.open(readyFilePath, 'w');
-  } else {
-    await fs.writeFile(readyFilePath, metadata);
-  }
-}
@@ -1,13 +1,10 @@
-import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
-import uuid from 'uuid';

 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 import setup from 'turtle/bin/setup/setup';
 import * as ProjectUtils from 'turtle/bin/utils/project';
 import * as UserUtils from 'turtle/bin/utils/user';
-import { getExperienceUrl } from 'turtle/builders/utils/common';
 import logger from 'turtle/logger';
 import { sanitizeJob } from 'turtle/validator';

@@ -15,6 +12,7 @@ export function createBuilderAction({
  program,
  command,
  prepareCredentials,
+  buildJobObject,
  builder,
  platform,
  os,
@@ -57,7 +55,6 @@ export function createBuilderAction({
      const args = {
        releaseChannel: cmd.releaseChannel || 'default',
        buildType: cmd.type,
-        buildMode: cmd.mode,
        username: userData.username || 'anonymous',
        projectDir: ProjectUtils.resolveAbsoluteDir(projectDirArg),
        publicUrl: cmd.publicUrl,
@@ -68,7 +65,7 @@ export function createBuilderAction({
      await setup(platform, sdkVersion);
      const credentials = await prepareCredentials(cmd);
      const rawJob = {
-        ...await buildJobObject(platform, appJSON, args, credentials),
+        ...buildJobObject(appJSON, args, credentials),
        ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
        ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
      };
@@ -85,38 +82,3 @@ export function createBuilderAction({
    }
  };
 }
-
-const buildJobObject = async (
-  platform: 'android' | 'ios',
-  appJSON: any,
-  { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
-  credentials: any,
-) => {
-  const job = {
-    config: {
-      ..._.get(appJSON, 'expo.ios.config', {}),
-      buildType,
-      ...(platform === 'android' ? { buildMode } : {}),
-      releaseChannel,
-      ...(platform === 'ios' ? { bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier') } : {}),
-      ...(platform === 'android' ? { androidPackage: _.get(appJSON, 'expo.android.package') } : {}),
-      publicUrl,
-    },
-    id: uuid.v4(),
-    platform,
-    projectDir,
-    sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
-    experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
-    ...(credentials && { credentials }),
-  };
-  const url = getExperienceUrl(job.experienceName, job.config.publicUrl);
-
-  const manifest = await ExponentTools.getManifestAsync(url, {
-    'Exponent-SDK-Version': _.get(appJSON, 'expo.sdkVersion'),
-    'Exponent-Platform': platform,
-    'Expo-Release-Channel': releaseChannel,
-    'Accept': 'application/expo+json,application/json',
-  });
-
-  return { ...job, manifest };
-};
@@ -1,4 +1,4 @@
-import { User as UserManager } from '@expo/xdl';
+import { User as UserManager } from 'xdl';

 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';

@@ -1,17 +1,14 @@
 import path from 'path';

-import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
-import semver from 'semver';
-import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
+import { AndroidShellApp, ImageUtils } from 'xdl';

 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 { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -21,16 +18,13 @@ import logger from 'turtle/logger';
 export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
  await ensureCanBuildSdkVersion(jobData);
  const credentials = await getOrCreateCredentials(jobData);
-  const outputFilePath = await runShellAppBuilder(jobData, credentials);
-
+  const apkFilePath = await runShellAppBuilder(jobData, credentials);
  const randomHex = uuidv4().replace(/-/g, '');
-  const s3FileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
-  const s3Filename = `${jobData.experienceName}-${randomHex}-signed.${s3FileExtension}`;
+  const s3Filename = `${jobData.experienceName}-${randomHex}-signed.apk`;
  const s3FileKey = `android/${s3Filename}`;
  const fakeUploadFilename = s3Filename.replace('/', '\\');
-
  const artifactUrl = await uploadBuildToS3({
-    uploadPath: outputFilePath,
+    uploadPath: apkFilePath,
    s3FileKey,
    ...config.builder.fakeUpload && {
      fakeUploadBuildPath:
@@ -66,21 +60,15 @@ async function runShellAppBuilder(
  ImageUtils.setResizeImageFunction(imageHelpers.resizeIconWithSharpAsync);
  ImageUtils.setGetImageDimensionsFunction(imageHelpers.getImageDimensionsWithSharpAsync);

-  const fileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
-  const outputFilePath = path.join(temporaryFilesRoot, `shell-signed-${jobData.id}.${fileExtension}`);
+  const outputFilePath = path.join(temporaryFilesRoot, `shell-signed-${jobData.id}.apk`);

  const { config: jobConfig, manifest, sdkVersion: sdkVersionFromJob } = jobData;
  const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
  const workingDir = formatShellAppDirectory({ sdkVersion });

-  logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))
-    : null;
-
  try {
    await AndroidShellApp.createAndroidShellAppAsync({
-      url: commonUtils.getExperienceUrl(jobData.experienceName, jobData.config.publicUrl),
+      url: commonUtils.getExperienceUrl(jobData),
      sdkVersion,
      keystore: tempKeystorePath,
      manifest,
@@ -91,9 +79,6 @@ async function runShellAppBuilder(
      releaseChannel: jobConfig.releaseChannel,
      workingDir,
      outputFile: outputFilePath,
-      modules: enabledModules,
-      buildType: jobData.config.buildType,
-      buildMode: jobData.config.buildMode,
    });
  } catch (err) {
    commonUtils.logErrorOnce(err);
@@ -1,5 +1,5 @@
-import { IosIPABuilder as createIPABuilder } from '@expo/xdl';
 import _ from 'lodash';
+import { IosIPABuilder as createIPABuilder } from 'xdl';

 import { IContext } from 'turtle/builders/ios/context';
 import { logErrorOnce } from 'turtle/builders/utils/common';
@@ -1,11 +1,11 @@
 import * as path from 'path';

-import { IosShellApp } from '@expo/xdl';
 import { v4 as uuidv4 } from 'uuid';
+import { IosShellApp } from 'xdl';

 import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
 import config from 'turtle/config';
-import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants/index';
+import { IOS, PLATFORMS } from 'turtle/constants/index';
 import { IJob } from 'turtle/job';

 export interface IContext {
@@ -27,6 +27,7 @@ export interface IContext {
 }

 const { EXPOKIT_APP, EXPONENT_APP } = IosShellApp;
+const { BUILD_TYPES } = IOS;

 export function createBuilderContext(job: IJob): IContext {
  const { join } = path;
@@ -56,7 +57,7 @@ export function createBuilderContext(job: IJob): IContext {
  context.tempCertPath = join(context.appDir, 'cert.p12');
  context.baseArchiveDir = join(context.appDir, 'archive');

-  if (buildType === IOS_BUILD_TYPES.CLIENT) {
+  if (buildType === BUILD_TYPES.CLIENT) {
    context.applicationFilesSrc = join(
      workingDir,
      'expo-client-build',
@@ -73,7 +74,7 @@ export function createBuilderContext(job: IJob): IContext {
    );
  }

-  if (buildType === IOS_BUILD_TYPES.ARCHIVE) {
+  if (buildType === BUILD_TYPES.ARCHIVE) {
    context.outputPath = join(context.appDir, 'archive.xcarchive');
    context.uploadPath = join(context.buildDir, 'archive.ipa');
    context.archiveDir = join(
@@ -91,7 +92,7 @@ export function createBuilderContext(job: IJob): IContext {
      'default',
      `${EXPOKIT_APP}.xcworkspace`,
    );
-  } else if (buildType === IOS_BUILD_TYPES.CLIENT) {
+  } else if (buildType === BUILD_TYPES.CLIENT) {
    context.outputPath = join(context.appDir, 'archive.xcarchive');
    context.uploadPath = join(context.buildDir, 'archive.ipa');
    context.archiveDir = join(
@@ -106,7 +107,7 @@ export function createBuilderContext(job: IJob): IContext {
      'ios',
      `${EXPONENT_APP}.xcworkspace`,
    );
-  } else if (buildType === IOS_BUILD_TYPES.SIMULATOR) {
+  } else if (buildType === BUILD_TYPES.SIMULATOR) {
    context.outputPath = join(context.appDir, 'archive.tar.gz');
    context.uploadPath = join(context.appDir, 'archive.tar.gz');
    context.archiveDir = join(
@@ -116,7 +117,7 @@ export function createBuilderContext(job: IJob): IContext {
    );
  }

-  const s3FileExtension = buildType === IOS_BUILD_TYPES.SIMULATOR ? 'tar.gz' : 'ipa';
+  const s3FileExtension = buildType === BUILD_TYPES.SIMULATOR ? 'tar.gz' : 'ipa';
  const s3Filename = `${job.experienceName}-${appUUID}-${buildType}.${s3FileExtension}`;
  if (config.builder.fakeUpload) {
    const fakeUploadFilename = s3Filename.replace('/', '\\');
@@ -9,11 +9,13 @@ import prepareAdHocBuildCredentials from 'turtle/builders/utils/ios/adhocBuild';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
-import { IOS_BUILD_TYPES } from 'turtle/constants';
+import { IOS } from 'turtle/constants/index';
 import { IJob, IJobResult } from 'turtle/job';

+const { BUILD_TYPES } = IOS;
+
 export default async function iosBuilder(job: IJob): Promise<IJobResult> {
-  if (job.config.buildType !== IOS_BUILD_TYPES.CLIENT) {
+  if (job.config.buildType !== BUILD_TYPES.CLIENT) {
    await ensureCanBuildSdkVersion(job);
  }

@@ -24,13 +26,13 @@ export default async function iosBuilder(job: IJob): Promise<IJobResult> {

    const { buildType } = job.config;

-    if (buildType === IOS_BUILD_TYPES.CLIENT) {
+    if (buildType === BUILD_TYPES.CLIENT) {
      await prepareAdHocBuildCredentials(job);
    }

-    if ([IOS_BUILD_TYPES.ARCHIVE, IOS_BUILD_TYPES.CLIENT].includes(buildType!)) {
+    if ([BUILD_TYPES.ARCHIVE, BUILD_TYPES.CLIENT].includes(buildType!)) {
      await buildArchive(ctx, job);
-    } else if (buildType === IOS_BUILD_TYPES.SIMULATOR) {
+    } else if (buildType === BUILD_TYPES.SIMULATOR) {
      await buildSimulator(ctx, job);
    } else {
      throw new Error(`Unsupported iOS build type: ${buildType}`);
@@ -1,9 +1,8 @@
 import path from 'path';

-import { Credentials } from '@expo/xdl';
 import fs from 'fs-extra';
-import get from 'lodash/get';
 import uuidv4 from 'uuid/v4';
+import { Credentials } from 'xdl';

 import * as sqs from 'turtle/aws/sqs';
 import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
@@ -20,14 +19,7 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
    credentials.keystorePassword = uuidv4().replace(/-/g, '');
    credentials.keyPassword = uuidv4().replace(/-/g, '');
    credentials.keystoreAlias = Buffer.from(jobData.experienceName).toString('base64');
-    const androidPackage =
-      get(jobData, 'manifest.android.package')
-      || get(jobData, 'config.androidPackage');
-    if (!androidPackage) {
-      throw new Error(
-        'Android package name is not set in the app manifest (please update app.json if you\'re using turtle-cli).',
-      );
-    }
+    const androidPackage = jobData.manifest.android.package;

    await Credentials.Android.createKeystore(
      {
@@ -1,6 +1,6 @@
 import path from 'path';

-import { ExponentTools } from '@expo/xdl';
+import { ExponentTools } from 'xdl';

 import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
@@ -1,9 +1,13 @@
 import * as url from 'url';

 import config from 'turtle/config';
+import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';

-export function getExperienceUrl(experienceName: string, publicUrl?: string) {
+export function getExperienceUrl(job: IJob) {
+  const { experienceName, config: jobConfig } = job;
+  const { publicUrl } = jobConfig;
+
  // publicUrl is passed in if user wants to build an externally hosted app
  if (publicUrl) {
    return publicUrl;
@@ -1,8 +1,9 @@
 import path from 'path';

 import spawnAsync from '@expo/spawn-async';
-import { IosCodeSigning } from '@expo/xdl';
 import fs from 'fs-extra';
+import isEmpty from 'lodash/isEmpty';
+import { IosCodeSigning } from 'xdl';

 import * as sqs from 'turtle/aws/sqs';
 import BuildError, { BuildErrorReason } from 'turtle/builders/BuildError';
@@ -20,18 +21,10 @@ async function prepareAdHocBuildCredentials(job: IJob) {
  }

  const { bundleIdentifier } = job.config;
-  const {
-    certP12,
-    certPassword,
-    teamId,
-    appleSession,
-    udids,
-    provisioningProfileId,
-  } = job.credentials;
+  const { certP12, certPassword, teamId, appleSession, udids } = job.credentials;

  const certSerialNumber = IosCodeSigning.findP12CertSerialNumber(certP12, certPassword);
  const args = [
-    ...(provisioningProfileId ? ['--profile-id', provisioningProfileId] : []),
    teamId,
    udids!.join(','),
    bundleIdentifier,
@@ -39,26 +32,25 @@ async function prepareAdHocBuildCredentials(job: IJob) {
  ];

  try {
-    if (provisioningProfileId) {
-      logger.info(
-        `Using ad hoc provisioning profile id: ${provisioningProfileId}`,
-      );
-    }
-
    const credentials = await runFastlaneAction(
      travelingFastlane.manageAdHocProvisioningProfile,
      args,
      { env: { FASTLANE_SESSION: appleSession } },
    );
+    if (isEmpty(credentials)) {
+      if (!job.credentials.provisioningProfile) {
+        // a user has generated the provisioning profile for his app, but he probably deleted it from Expo servers, ...
+        throw new BuildError(
+          BuildErrorReason.PROVISIONING_PROFILE_MISSING,
+          `Provisioning profile is missing on Expo servers.`,
+        );
+      }
+      return;
+    }

    logger.info('New ad hoc provisioning profile successfully created');
    job.credentials.provisioningProfile = credentials.provisioningProfile;

-    if (!credentials.provisioningProfileUpdateTimestamp) {
-      //  dont need to persist profile because nothing changed
-      return;
-    }
-
    if (isOffline()) {
      const provisioningProfilePath = path.join(job.projectDir, `adhoc.mobileprovision`);
      await fs.writeFile(provisioningProfilePath, Buffer.from(credentials.provisioningProfile, 'base64'));
@@ -1,4 +1,4 @@
-import { IosKeychain } from '@expo/xdl';
+import { IosKeychain } from 'xdl';

 import { IContext } from 'turtle/builders/ios/context';
 import * as fileUtils from 'turtle/builders/utils/file';
@@ -1,14 +1,14 @@
 import path from 'path';
 import util from 'util';

-import { ImageUtils, IosShellApp } from '@expo/xdl';
 import copy from 'copy';
 import _ from 'lodash';
+import { ImageUtils, IosShellApp } from 'xdl';

 import { IContext } from 'turtle/builders/ios/context';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { IOS_BUILD_TYPES } from 'turtle/constants/index';
+import { IOS } from 'turtle/constants/index';
 import { IJob } from 'turtle/job';
 import logger from 'turtle/logger/index';

@@ -37,13 +37,13 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
    output: ctx.outputPath,
    verbose: true,
  };
-  if (buildType === IOS_BUILD_TYPES.CLIENT) {
+  if (buildType === IOS.BUILD_TYPES.CLIENT) {
    Object.assign(shellAppParams, {
      workspacePath: path.join(ctx.workingDir, 'ios'),
    });
  } else {
    Object.assign(shellAppParams, {
-      url: commonUtils.getExperienceUrl(job.experienceName, job.config.publicUrl),
+      url: commonUtils.getExperienceUrl(job),
      releaseChannel,
      sdkVersion,
    });
@@ -1,14 +1,14 @@
 import path from 'path';

-import { ExponentTools } from '@expo/xdl';
+import { ExponentTools } from 'xdl';

 import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
-import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
+import { IOS, PLATFORMS } from 'turtle/constants';

 export function formatShellAppDirectory({ sdkVersion, buildType }: IShellAppDirectoryConfig) {
  const { workingDir } = config.directories;
-  if (buildType === IOS_BUILD_TYPES.CLIENT) {
+  if (buildType === IOS.BUILD_TYPES.CLIENT) {
    return path.join(workingDir, PLATFORMS.IOS, 'client');
  } else if (config.builder.useLocalWorkingDir) {
    return path.join(workingDir, 'local');
@@ -1,169 +0,0 @@
-import fs from 'fs-extra';
-import filter from 'lodash/filter';
-import keys from 'lodash/keys';
-import merge from 'lodash/merge';
-import values from 'lodash/values';
-import path from 'path';
-import logger from 'turtle/logger';
-
-export interface IUnimoduleEntry {
-  name: string;
-  version: string;
-  dirname: string;
-}
-
-interface IPackageInfo {
-  name: string;
-  version: string;
-  dirname: string; // could be different than name
-  dependencies: string[];
-}
-
-export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
-  const resolver = new Resolver(workingdir);
-  await resolver.init();
-
-  if (!packages) {
-    resolver.addAll();
-  } else {
-    const corePackages = await readCorePackages(workingdir);
-    for (const pkg of corePackages) {
-      if (resolver.isUnimodule(pkg)) {
-        resolver.addModule(pkg);
-      }
-    }
-    for (const pkg of packages) {
-      if (resolver.isUnimodule(pkg)) {
-        resolver.addModule(pkg);
-      }
-    }
-  }
-
-  return resolver.getModules();
-}
-
-async function readCorePackages(workingdir: string) {
-  const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
-  const expoPkgJsonPath = path.join(workingdir, 'packages', 'expo', 'package.json');
-  if (await fs.pathExists(pkgJsonPath) && await fs.pathExists(expoPkgJsonPath)) {
-    const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    const expoPackageJson = JSON.parse(await fs.readFile(expoPkgJsonPath, 'utf-8'));
-    return keys(packageJson.dependencies).concat(keys(expoPackageJson.dependencies));
-  } else {
-    logger.warn('No core packages detected');
-    return [];
-  }
-}
-
-interface IDependencyInfo {
-  [key: string]: IPackageInfo;
-}
-
-class Resolver {
-  private workingdir: string;
-  private modulesMap: {[key: string]: IUnimoduleEntry};
-  private dependencyMap: IDependencyInfo;
-
-  constructor(workingdir: string) {
-    this.workingdir = workingdir;
-    this.modulesMap = {};
-    this.dependencyMap = {};
-  }
-
-  public async init() {
-    this.dependencyMap = await generateDependenciesInfo(this.workingdir);
-  }
-
-  public isUnimodule(moduleName: string): boolean {
-    return !!this.dependencyMap[moduleName];
-  }
-
-  public addAll() {
-    for (const moduleName of Object.keys(this.dependencyMap)) {
-      this.addModule(moduleName);
-    }
-  }
-
-  public addModule(moduleName: string) {
-    if (this.dependencyMap[moduleName]) {
-      this.resolveModule(moduleName);
-    } else {
-      throw new Error('Attempting to add unknown module');
-    }
-  }
-
-  public getModules(): IUnimoduleEntry[] {
-     return values(this.modulesMap);
-  }
-
-  private async resolveModule(moduleName: string) {
-    if (this.modulesMap[moduleName]) {
-      return;
-    }
-    const pkg = this.dependencyMap[moduleName];
-    logger.info(`Adding ${moduleName}:${pkg.version}`);
-    this.modulesMap[moduleName] = {
-      name: pkg.name,
-      dirname: pkg.dirname,
-      version: pkg.version,
-    };
-    for (const dep of pkg.dependencies) {
-      this.resolveModule(dep);
-    }
-  }
-}
-
-async function generateDependenciesInfo(workingdir: string): Promise<IDependencyInfo> {
-  const dir = await fs.readdir(path.join(workingdir, 'packages'));
-  const map: IDependencyInfo = {};
-
-  // scrap directory for package metadata
-  for (const pkgName of dir) {
-    const pkg = await getPackage(workingdir, pkgName);
-    if (pkg) {
-      map[pkg.name] = pkg;
-    }
-  }
-
-  // handle @unimodules directory
-  const unimodulesDir = await fs.readdir(path.join(workingdir, 'packages', '@unimodules'));
-  for (const pkgName of unimodulesDir) {
-    const pkg = await getPackage(workingdir, path.join('@unimodules', pkgName));
-    if (pkg) {
-      map[pkg.name] = pkg;
-    }
-  }
-
-  // remove non unimodule dependencies
-  for (const pkg of Object.keys(map)) {
-    map[pkg].dependencies = filter(map[pkg].dependencies, (dep) => !!map[dep]);
-  }
-  return map;
-}
-
-async function getPackage(workingdir: string, pkgName: string): Promise<IPackageInfo | null> {
-  const pkgPath = path.join(workingdir, 'packages', pkgName);
-  const isAndroid = await fs.pathExists(path.join(pkgPath, 'android'));
-  const isIos = await fs.pathExists(path.join(pkgPath, 'ios'));
-  const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
-  const hasPackageJson = await fs.pathExists(path.join(pkgPath, 'package.json'));
-  if (!isUnimodule || !hasPackageJson || (!isAndroid && !isIos)) {
-    return null;
-  }
-
-  const packageJson = JSON.parse(await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'));
-
-  const pkgDeps = merge({}, // reading everything to make sure
-    packageJson.dependencies,
-    packageJson.peerDependencies,
-    packageJson.unimodulePeerDependencies,
-  );
-  const info: IPackageInfo = {
-    name: packageJson.name,
-    version: packageJson.version,
-    dirname: pkgName,
-    dependencies: Object.keys(pkgDeps),
-  };
-
-  return info;
-}
@@ -1,36 +1,30 @@
-import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import path from 'path';
+import { ExponentTools } from 'xdl';

 import config from 'turtle/config';
 import { IJob } from 'turtle/job';

-interface IVersionsMap {
-  [platform: string]: number[];
-}
-
-const versions: IVersionsMap = {};
+let SUPPORTED_SDK_VERSIONS: number[];

 export async function ensureCanBuildSdkVersion(job: IJob) {
  if (config.builder.useLocalWorkingDir) {
    return;
  }

-  const platformVersions = await findSupportedSdkVersions(job.platform);
+  if (!SUPPORTED_SDK_VERSIONS) {
+    SUPPORTED_SDK_VERSIONS = await findSupportedSdkVersions(job.platform);
+  }
+
  const targetMajorSdkVersion = ExponentTools.parseSdkMajorVersion(job.sdkVersion || job.manifest.sdkVersion);
-  if (!platformVersions.includes(targetMajorSdkVersion)) {
+  if (!SUPPORTED_SDK_VERSIONS.includes(targetMajorSdkVersion)) {
    throw new Error(`Unsupported SDK Version!`);
  }
 }

-export async function findSupportedSdkVersions(platform: 'android' | 'ios'): Promise<number[]> {
-  if (versions[platform]) {
-    return versions[platform];
-  } else {
-    const SDK_DIR_PREFIX = 'sdk';
-    const files = await fs.readdir(path.join(config.directories.workingDir, platform));
-    const sdks = files.filter((file) => file.startsWith(SDK_DIR_PREFIX));
-    versions[platform] = sdks.map((sdk) => parseInt(sdk.substr(SDK_DIR_PREFIX.length), 10));
-    return versions[platform];
-  }
+async function findSupportedSdkVersions(platform: 'android' | 'ios'): Promise<number[]> {
+  const SDK_DIR_PREFIX = 'sdk';
+  const files = await fs.readdir(path.join(config.directories.workingDir, platform));
+  const sdks = files.filter((file) => file.startsWith(SDK_DIR_PREFIX));
+  return sdks.map((sdk) => parseInt(sdk.substr(SDK_DIR_PREFIX.length), 10));
 }
@@ -1,6 +1,6 @@
-import { ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
+import { IOS } from 'turtle/constants';

 export interface IShellAppDirectoryConfig {
  sdkVersion: string;
-  buildType?: IOS_BUILD_TYPES & ANDROID_BUILD_TYPES;
+  buildType?: IOS.BUILD_TYPES;
 }
@@ -2,7 +2,7 @@ import os from 'os';
 import path from 'path';

 import { PLATFORMS } from 'turtle/constants';
-import { env, envBoolean, envNum, envOptional, envTransform } from 'turtle/utils/env';
+import { env, envNum, envOptional, envTransform } from 'turtle/utils/env';

 export default {
  env: env('NODE_ENV'),
@@ -37,12 +37,6 @@ export default {
    intervalMs: envNum('AWS_CLOUDWATCH_INTERVAL_MS', 30000),
    namespace: env('AWS_CLOUDWATCH_NAMESPACE', 'Turtle'),
  },
-  datadog: {
-    disabled: envBoolean('DATADOG_DISABLED', false),
-    apiKey: envOptional('DATADOG_API_KEY'),
-    appKey: envOptional('DATADOG_APP_KEY'),
-    intervalMs: env('DATADOG_INTERVAL_MS', 5 * 60 * 1000),
-  },
  redis: {
    url: env('REDIS_URL'),
    configUrl: env('REDIS_CONFIG_URL'),
@@ -50,6 +44,9 @@ export default {
  logger: {
    level: env('LOGGER_LEVEL', 'info'),
    intervalMs: envNum('LOGGER_INTERVAL_MS', 5000),
+    client: {
+      level: env('CLIENT_LOGGER_LEVEL', 'info'),
+    },
  },
  google: {
    credentials: env('GOOGLE_APPLICATION_CREDENTIALS', ''),
@@ -70,7 +67,7 @@ export default {
      (val: string) => env('NODE_ENV') === 'development' && val === '1',
    ),
    fakeUpload: envTransform('TURTLE_FAKE_UPLOAD', '0', (val: string) => val === '1'),
-    maxJobTimeMs: envNum('TURTLE_MAX_JOB_TIME_MS', 15 * 60 * 1000),
+    maxJobTimeMs: envNum('TURTLE_MAX_JOB_TIME_MS', 60 * 60 * 1000),
    useLocalWorkingDir: envTransform('TURTLE_USE_LOCAL_WORKING_DIR', '0', (val: string) => val === '1'),
  },
  directories: {
@@ -1,24 +1,9 @@
 import * as BUILD from './build';
+import * as IOS from './ios';

 export enum PLATFORMS {
  IOS = 'ios',
  ANDROID = 'android',
 }

-export enum IOS_BUILD_TYPES {
-  ARCHIVE = 'archive',
-  CLIENT = 'client',
-  SIMULATOR = 'simulator',
-}
-
-export enum ANDROID_BUILD_TYPES {
-  APK = 'apk',
-  APP_BUNDLE = 'app-bundle',
-}
-
-export enum ANDROID_BUILD_MODES {
-  DEBUG = 'debug',
-  RELEASE = 'release',
-}
-
-export { BUILD };
+export { IOS, BUILD };
@@ -0,0 +1,5 @@
+export enum BUILD_TYPES {
+  ARCHIVE = 'archive',
+  CLIENT = 'client',
+  SIMULATOR = 'simulator',
+}
@@ -1,4 +1,4 @@
-import { ANDROID_BUILD_MODES, ANDROID_BUILD_TYPES, IOS_BUILD_TYPES } from 'turtle/constants';
+import { IOS } from 'turtle/constants';

 export interface IJob {
  platform: 'android' | 'ios';
@@ -9,12 +9,9 @@ export interface IJob {
  config: {
    releaseChannel: string;
    publicUrl?: string;
-    buildType: IOS_BUILD_TYPES & ANDROID_BUILD_TYPES;
    // ios
+    buildType?: IOS.BUILD_TYPES;
    bundleIdentifier?: string;
-    // android
-    androidPackage?: string;
-    buildMode?: ANDROID_BUILD_MODES;
  };
  credentials: {
    // android
@@ -26,7 +23,6 @@ export interface IJob {
    certP12?: string;
    certPassword?: string;
    provisioningProfile?: string;
-    provisioningProfileId?: string;
    teamId?: string;
    appleSession?: string;
    udids?: string[];
@@ -64,10 +64,7 @@ async function processJob(jobData: any) {
    setCurrentJobId(job.id);
    const pingerHandle = sqs.changeMessageVisibilityRecurring(priority, jobData.ReceiptHandle, job.id);

-    logger.info(
-      `Doing job MessageId=${jobData.MessageId} BuildId=${job.id} `
-      + `Priority=${priority.slice(0, priority.length - 8)} ${Date.now()}`,
-    );
+    logger.info(`Doing job MessageId=${jobData.MessageId} BuildId=${job.id} ${Date.now()}`);

    const cancelled = await redis.checkIfCancelled(job.id);
    if (cancelled) {
@@ -79,10 +76,10 @@ async function processJob(jobData: any) {
      const buildType = _.get(job, 'config.buildType', 'default');
      try {
        const status = await build(job);
-        buildStatusMetric.add(buildType, priority, status);
+        buildStatusMetric.add(buildType, status);
        buildFailed = !status;
      } catch (err) {
-        buildStatusMetric.add(buildType, priority, false);
+        buildStatusMetric.add(buildType, false);
        buildFailed = true;
        throw err;
      } finally {
@@ -116,8 +113,7 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
      sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
      await deleteMessage(priority, receiptHandle);
    } finally {
-      logger.error('Build timed out. Going to terminate turtle agent.');
-      await logger.cleanup();
+      logger.error('Going to terminate turtle agent, just in case...');
      process.exit(1);
    }
  }, config.builder.maxJobTimeMs);
@@ -1,6 +1,6 @@
 import Joi from 'joi';

-import { ANDROID_BUILD_MODES, ANDROID_BUILD_TYPES, PLATFORMS } from 'turtle/constants';
+import { PLATFORMS } from 'turtle/constants';
 import baseJobSchema from 'turtle/jobsSchemas/base';

 export default baseJobSchema.concat(
@@ -12,9 +12,5 @@ export default baseJobSchema.concat(
      keystoreAlias: Joi.string(),
      keystore: Joi.string(),
    }),
-    config: Joi.object().keys({
-      buildMode: Joi.string().valid(Object.values(ANDROID_BUILD_MODES)).default(ANDROID_BUILD_MODES.RELEASE),
-      buildType: Joi.string().valid(Object.values(ANDROID_BUILD_TYPES)).default(ANDROID_BUILD_TYPES.APK),
-    }),
  }),
 );
@@ -1,13 +1,13 @@
 import Joi from 'joi';

-import { IOS_BUILD_TYPES, PLATFORMS } from 'turtle/constants/index';
+import { IOS, PLATFORMS } from 'turtle/constants/index';
 import baseJobSchema from 'turtle/jobsSchemas/base';

 export default baseJobSchema.concat(
  Joi.object().keys({
    platform: Joi.string().valid(PLATFORMS.IOS),
    config: Joi.object().keys({
-      buildType: Joi.string().default(IOS_BUILD_TYPES.ARCHIVE),
+      buildType: Joi.string().default(IOS.BUILD_TYPES.ARCHIVE),
      bundleIdentifier: Joi.string().regex(/^[a-zA-Z][a-zA-Z0-9\-.]+$/),
    }),
    credentials: Joi.object()
@@ -17,12 +17,11 @@ export default baseJobSchema.concat(
        teamId: Joi.string().required(),
        // it's not required for adhoc Expo Client builds
        provisioningProfile: Joi.string(),
-        provisioningProfileId: Joi.string(),
        appleSession: Joi.string(),
        udids: Joi.array().items(Joi.string()),
      })
      .when('config.buildType', {
-        is: IOS_BUILD_TYPES.SIMULATOR,
+        is: IOS.BUILD_TYPES.SIMULATOR,
        then: Joi.optional(),
        otherwise: Joi.required(),
      }),
@@ -17,7 +17,6 @@ class Logger {
      name: 'turtle',
      level: config.logger.level,
      platform: config.platform,
-      serializers: bunyan.stdSerializers,
      ...config.deploymentEnv && { environment: config.deploymentEnv },
      streams: Object.values(streams),
    });
@@ -22,7 +22,7 @@ export default function create() {
    },
  });
  return {
-    level: config.logger.level,
+    level: 'info',
    type: 'raw',
    stream: gcloudStream,
  };
@@ -6,6 +6,6 @@ export default function create() {
  return {
    stream: prettyStdOut,
    type: 'raw',
-    level: config.logger.level,
+    level: config.logger.client.level,
  };
 }
@@ -15,7 +15,7 @@ export default function create() {
    type: 'raw',
    stream: s3,
    reemitErrorEvents: true,
-    level: config.logger.level,
+    level: config.logger.client.level,
  };
 }

@@ -1,5 +1,5 @@
 import * as cloudwatch from 'turtle/aws/cloudwatch';
-import { PRIORITY_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
+import { TYPE_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
 import * as reducers from 'turtle/aws/cloudwatch/reducers';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -24,11 +24,11 @@ export function register() {
  });
 }

-export function add(type: string, priority: string, success = true) {
+export function add(type: string, success = true) {
  cloudwatch.addMetricData({
    name: BUILD_METRIC_NAME,
    value: 1,
    success,
-    extraDimensions: PRIORITY_DIMENSIONS(type, priority),
+    extraDimensions: TYPE_DIMENSIONS(type),
  });
 }
@@ -1,54 +0,0 @@
-import groupBy from 'lodash/groupBy';
-import mapValues from 'lodash/mapValues';
-import take from 'lodash/take';
-
-import logger from 'turtle/logger';
-import { sendMetric } from 'turtle/metrics/datadog';
-import { getReplicaCount } from 'turtle/utils/metadata';
-import { getLabeledConfiguration, TurtleModeLabels } from 'turtle/utils/priorities';
-
-const createMetricName = () => `turtle.replicaCount`;
-const createModeMetricName = (mode: TurtleModeLabels) => `${createMetricName()}.${mode}`;
-const createModeTag = (mode: TurtleModeLabels) => `mode:${mode}`;
-
-export default async function sendConfigToDatadog() {
-  const configuration = await getLabeledConfiguration();
-  const replicaCount = await getReplicaCount();
-  const currentReplicaCount = replicaCount === null ? configuration.length : replicaCount;
-
-  const replicaCounts = mapValues(
-    groupBy<string>(take(configuration, currentReplicaCount)),
-    (i) => i.length,
-  );
-
-  const metricName = createMetricName();
-
-  const normalReplicaCount = replicaCounts[TurtleModeLabels.Normal] || 0;
-  const highReplicaCount = replicaCounts[TurtleModeLabels.High] || 0;
-  const highOnlyReplicaCount = replicaCounts[TurtleModeLabels.HighOnly] || 0;
-
-  const normalTag = createModeTag(TurtleModeLabels.Normal);
-  const normalMetricName = createModeMetricName(TurtleModeLabels.Normal);
-  logger.debug(
-    `Sending ${metricName}=${normalReplicaCount} (${normalTag}), ${normalMetricName}=${normalReplicaCount} to Datadog`,
-  );
-  await sendMetric(metricName, normalReplicaCount, [normalTag]);
-  await sendMetric(normalMetricName, normalReplicaCount);
-
-  const highTag = createModeTag(TurtleModeLabels.High);
-  const highMetricName = createModeMetricName(TurtleModeLabels.High);
-  logger.debug(
-    `Sending ${metricName}=${highReplicaCount} (${highTag}), ${highMetricName}=${highReplicaCount} to Datadog`,
-  );
-  await sendMetric(metricName, highReplicaCount, [highTag]);
-  await sendMetric(highMetricName, highReplicaCount);
-
-  const highOnlyTag = createModeTag(TurtleModeLabels.HighOnly);
-  const highOnlyMetricName = createModeMetricName(TurtleModeLabels.HighOnly);
-  logger.debug(
-    `Sending ${metricName}=${highOnlyReplicaCount} (${highOnlyTag}),`
-    + ` ${highOnlyMetricName}=${highOnlyReplicaCount} to Datadog`,
-  );
-  await sendMetric(metricName, highOnlyReplicaCount, [highOnlyTag]);
-  await sendMetric(highOnlyMetricName, highOnlyReplicaCount);
-}
@@ -1,24 +0,0 @@
-import dogapi from 'dogapi';
-import util from 'util';
-
-import config from 'turtle/config';
-
-const datadogSendMetric = util.promisify(dogapi.metric.send);
-
-if (!config.datadog.disabled) {
-  dogapi.initialize({
-    api_key: config.datadog.apiKey,
-    app_key: config.datadog.appKey,
-   });
-}
-
-const tags = [
-  `env:${config.deploymentEnv}`,
-  `platform:${config.platform}`,
-];
-
-export function sendMetric(name: string, value: number, additionalTags?: string[]) {
-  if (!config.datadog.disabled) {
-    return datadogSendMetric(name, value, { tags: [...tags, ...(additionalTags || [])] });
-  }
-}
@@ -5,7 +5,7 @@ import {
  createConfigurationsKey,
  createDefaultConfigurationKey,
  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 } from 'turtle/utils/priorities';
 import { connect, RedisClient } from 'turtle/utils/redis';

@@ -29,35 +29,29 @@ const TIMEOUT = 3000;
 const AVAILABLE_CONFIGURATIONS_IOS = [
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  // there are 5 iOS builders at the moment
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];

 const AVAILABLE_CONFIGURATIONS_ANDROID = [
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
  HIGH_CONFIGURATION,
  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  // there are 15 Android builders at the moment
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];

 const DEFAULT_CONFIGURATION = HIGH_CONFIGURATION;
@@ -1,38 +0,0 @@
-import isNaN from 'lodash/isNaN';
-
-import { PLATFORMS } from 'turtle/constants';
-import logger from 'turtle/logger';
-import { setReplicaCount } from 'turtle/utils/metadata';
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
-
-async function run() {
-  const platform = process.env.SCRIPT_PLATFORM;
-  const replicaCountRaw = process.env.SCRIPT_REPLICA_COUNT;
-  const replicaCount = Number(replicaCountRaw);
-
-  if (!platform || !replicaCountRaw) {
-    throw new Error('You must set both SCRIPT_PLATFORM and SCRIPT_REPLICA_COUNT env variables.');
-  }
-
-  if (!Object.values(PLATFORMS).includes(platform)) {
-    throw new Error(`Unsupported platform: ${platform}`);
-  }
-
-  if (isNaN(replicaCount)) {
-    throw new Error(`Wrong value for replica count: ${replicaCountRaw}`);
-  }
-
-  const redis = await getRedisClient(RedisClient.Configuration);
-  logger.info(`[${platform}] Setting replica count in redis to ${replicaCount}`);
-  await setReplicaCount(platform as PLATFORMS, replicaCount);
-  redis.disconnect();
-}
-
-if (require.main === module) {
-  run()
-    .then(() => logger.info('All done'))
-    .catch((err) => {
-      logger.error('Error:', err);
-      process.exit(1);
-    });
-}
@@ -1,15 +1,13 @@
-import { LoggerDetach } from '@expo/xdl';
+import { LoggerDetach } from 'xdl';

-import { findSupportedSdkVersions } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
 import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
 import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { getRedisClient } from 'turtle/utils/redis';
+import { getRedisClient, RedisClient } from 'turtle/utils/redis';

 const REDIS_TURTLE_VERSION_KEY = 'turtle:version';
-const REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY = `turtle:${config.platform}:sdkVersions`;

 process.on('unhandledRejection', (err) => logger.error({ err }, 'Unhandled promise rejection'));

@@ -37,14 +35,11 @@ async function main() {
  }

  try {
-    const redis = await getRedisClient();
+    const redis = await getRedisClient(RedisClient.Configuration);
    await redis.set(REDIS_TURTLE_VERSION_KEY, turtleVersion);
-    logger.info(`Registered Turtle version (${turtleVersion}) in Redis`);
-    const sdkVersions = (await findSupportedSdkVersions(config.platform)).join(',');
-    await redis.set(REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY, sdkVersions);
-    logger.info(`Registered supported SDK versions (${sdkVersions}) in Redis`);
+    logger.info(`Register Turtle version ${turtleVersion} in Redis`);
  } catch (err) {
-    logger.error({ err }, 'Failed to set versions in Redis');
+    logger.error({ err }, 'Failed to register Turtle version in Redis');
  }

  while (true) {
@@ -1,23 +1,10 @@
 import fs from 'fs-extra';

 import config from 'turtle/config';
-import logger from 'turtle/logger';
 import * as metrics from 'turtle/metrics';
-import sendConfigToDatadog from 'turtle/metrics/buildersConfig';

 export default async function commonSetup() {
-  announceBuildersConfig();
  await metrics.init();
  await fs.remove(config.directories.temporaryFilesRoot);
  await fs.remove(config.directories.tempS3LogsDir);
 }
-
-async function announceBuildersConfig() {
-  try {
-    await sendConfigToDatadog();
-  } catch (err) {
-    logger.error({ err }, 'Failed to send metrics to Datadog');
-  } finally {
-    setTimeout(announceBuildersConfig, config.datadog.intervalMs);
-  }
-}
@@ -1,10 +1,9 @@
-declare module 'async-retry';
+declare module 'copy';
+declare module 'xdl';
 declare module 'bunyan';
 declare module 'bunyan-sentry-stream';
 declare module 'bunyan-debug-stream';
-declare module 'copy';
-declare module 'dogapi';
+declare module 'async-retry';
 declare module 'ioredis';
-declare module 'is-semver';
 declare module 'request-progress';
-declare module '@expo/xdl';
+declare module 'is-semver';
@@ -16,16 +16,5 @@ export const env = (varName: string, defaultValue?: any) => {
 export const envOptional = (varName: string) => env(varName, null);
 export const envTransform = (varName: string, defaultValue: any, fn: any) => fn(env(varName, defaultValue));
 export const envNum = (varName: string, defaultValue?: number) => parseInt(env(varName, defaultValue), 10);
-export const envBoolean = (varName: string, defaultValue?: boolean) => {
-  let defaultString;
-  if (defaultValue === true) {
-    defaultString = 'true';
-  } else if (defaultValue === false) {
-    defaultString = 'false';
-  } else {
-    defaultString = defaultValue;
-  }
-  return env(varName, defaultString) === 'true';
-};

 const isOffline = () => process.env.TURTLE_MODE === 'offline';
@@ -1,21 +0,0 @@
-import config from 'turtle/config';
-import { PLATFORMS } from 'turtle/constants';
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
-
-const createKeyPrefix = (platform: PLATFORMS) => `${config.deploymentEnv}:${platform}`;
-const createReplicaCountKey = (platform: PLATFORMS) => `${createKeyPrefix(platform)}:replicaCount`;
-
-export async function setReplicaCount(platform: PLATFORMS, replicaCount: number) {
-  const redis = await getRedisClient(RedisClient.Configuration);
-  await redis.set(
-    createReplicaCountKey(platform),
-    replicaCount,
-  );
-}
-
-export async function getReplicaCount(maybePlatform?: PLATFORMS) {
-  const platform = maybePlatform || config.platform;
-  const redis = await getRedisClient(RedisClient.Configuration);
-  const result = await redis.get(createReplicaCountKey(platform));
-  return result === null ? null : Number(result);
-}
@@ -1,5 +1,4 @@
 import Joi from 'joi';
-import isEqual from 'lodash/isEqual';
 import os from 'os';

 import config from 'turtle/config';
@@ -9,15 +8,8 @@ import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 export const NORMAL = 'normalPriority';
 export const HIGH = 'highPriority';

-export enum TurtleModeLabels {
-  Normal = 'normal',
-  High = 'high',
-  HighOnly = 'highOnly',
-}
-
 export const NORMAL_CONFIGURATION = [NORMAL, HIGH];
 export const HIGH_CONFIGURATION = [HIGH, NORMAL];
-export const HIGH_ONLY_CONFIGURATION = [HIGH];

 const REDIS_GET_CONFIG = `
  local i = 0
@@ -63,7 +55,7 @@ export async function getPriorities() {
    }

    try {
-      const configurations = await getConfiguration(redis);
+      const configurations = JSON.parse(await redis.get(createConfigurationsKey()));
      const configurationsIndex = await redis.getConfig(createConfigurationsKey(), os.hostname());
      logger.debug(`Using configuration at index ${configurationsIndex} pulled from redis`);
      const { error, value: configValue } = configSchema.validate(configurations[configurationsIndex]);
@@ -92,21 +84,3 @@ export async function getPriorities() {
    }
  }
 }
-
-export async function getConfiguration(currentRedisClient: any) {
-  const redis = currentRedisClient || await getRedisClient(RedisClient.Configuration);
-  return JSON.parse(await redis.get(createConfigurationsKey()));
-}
-
-export async function getLabeledConfiguration(currentRedisClient?: any) {
-  const configuration = await getConfiguration(currentRedisClient);
-  return configuration.map((i: string[]) => {
-    if (isEqual(i, NORMAL_CONFIGURATION)) {
-      return TurtleModeLabels.Normal;
-    } else if (isEqual(i, HIGH_CONFIGURATION)) {
-      return TurtleModeLabels.High;
-    } else {
-      return TurtleModeLabels.HighOnly;
-    }
-  });
-}
@@ -79,7 +79,6 @@ export async function registerListener(jobId: string, deleteMessage: any) {
      if (message === jobId) {
        logger.info({ lastBuildLog: true }, 'Job cancelled - killing process');
        await deleteMessage();
-        await logger.cleanup();
        setTimeout(() => process.exit(1), MILLIS_TO_UPLOAD_LOGS);
      }
    });
@@ -1,17 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:turtle]
-directory=/app/turtle
-command=node ./build/server.js
-autorestart=true
-startretries=5
-startsecs=600
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[eventlistener:turtle_failure]
-events=PROCESS_STATE_FATAL
-command=/app/turtle/scripts/android/supervisordEventListener.sh
				`@@ -0,0 +1 @@`
				`s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz`
				`@@ -1 +0,0 @@`
				`s3://exp-artifacts/android-shell-builder-5090aab941f92c912c6643a1e25cc69f9f67d8e6.tar.gz`
				`@@ -0,0 +1 @@`
				`s3://exp-artifacts/ios-shell-builder-sdk-26-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz`