[turtle-cli] don't require push notifications cert to build an ios app

.babelrc

@@ -0,0 +1,16 @@
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "node": "8.9"
+      }
+    }]
+  ],
+  "plugins": [
+    ["module-resolver", {
+      "alias": {
+        "turtle": "./build"
+      }
+    }]
+  ]
+}

.circleci/config.yml

@@ -1,214 +1,29 @@
-version: 2.1
+version: 2
 
-executors:
-  nix: &nix
-    docker:
-      - image: lnl7/nix:2.2
-    # Symlink to the readline-enabled bash which is the default command of the container
-    shell: /run/current-system/sw/bin/bash -leo pipefail
-    working_directory: ~/turtle
-  mac:
-    macos: # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: '10.1.0'
-    working_directory: /Users/distiller/project
-    shell: /bin/bash -leo pipefail
-  android:
-    <<: *nix
-    resource_class: xlarge
-
-commands:
-  install_nix:
-    steps:
-      - run:
-          name: Install nix
-          command: curl https://nixos.org/releases/nix/nix-2.2.1/install | bash -s -- --no-daemon
-      - run:
-          name: Add nix-initializing line to .bashrc
-          command: echo ". ~/.nix-profile/etc/profile.d/nix.sh" >> ~/.bashrc
-
-  setup:
-    steps:
-      - run:
-          name: Install common packages
-          command: |
-            nix-env -iA \
-              nixpkgs.binutils \
-              nixpkgs.curl \
-              nixpkgs.direnv \
-              nixpkgs.findutils \
-              nixpkgs.gawk \
-              nixpkgs.git \
-              nixpkgs.gnused \
-              nixpkgs.gnutar \
-              nixpkgs.gzip \
-              nixpkgs.openssh \
-              nixpkgs.python \
-              nixpkgs.xz
-      - run:
-          name: Configure direnv
-          command: |
-            mkdir -p ~/.config/direnv
-            echo -e "[whitelist]\nprefix = [ \"$HOME\" ]" > ~/.config/direnv/config.toml
-            echo 'eval "$(direnv export bash)"' >> ~/.bash_profile
-      - run:
-          name: Configure yarn
-          command: echo '--frozen-lockfile true' >> ~/.yarnrc
-      - checkout
-      - run:
-          name: Configure aws-cli
-          command: |
-              aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
-              aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
-
-  setup_nix:
-    steps:
-      - run:
-          name: Add cp and rm stubs
-          command: |
-            cat \<< 'EOF' >> /bin/cp
-            #! /usr/bin/env bash
-            /usr/bin/env cp "$@"
-            EOF
-            chmod +x /bin/cp
-
-            cat \<< 'EOF' >> /bin/rm
-            #! /usr/bin/env bash
-            /usr/bin/env rm "$@"
-            EOF
-            chmod +x /bin/rm
-
-  decrypt_secrets_if_possible:
-    steps:
-      - run:
-          name: Decrypt secrets if possible
-          command: |
-            if [[ -z "$TURTLE_GIT_CRYPT_KEY_BASE64" ]]; then
-              echo 'git-crypt key not present in environment'
-            else
-              git crypt unlock <(echo $TURTLE_GIT_CRYPT_KEY_BASE64 | base64 --decode)
-            fi
-
-  restore_yarn_cache:
-    parameters:
-      workingdir:
-        type: string
-        default: .
-    steps:
-      - restore_cache:
-          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
-
-  save_yarn_cache:
-    parameters:
-      workingdir:
-        type: string
-        default: .
-    steps:
-      - save_cache:
-          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
-          paths:
-            - ~/.cache/yarn # `yarn cache dir`
-
-  restore_workingdir_cache:
-    parameters:
-      platform:
-        type: string
-        default: ios
-      sdk_version:
-        type: string
-        default: sdk32
-    steps:
-      - restore_cache:
-          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
-
-  save_workingdir_cache:
-    parameters:
-      workingdir:
-        type: string
-        default: /Users/distiller/project/workingdir
-      platform:
-        type: string
-        default: ios
-      sdk_version:
-        type: string
-        default: sdk32
-    steps:
-      - save_cache:
-          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
-          paths:
-            - "<< parameters.workingdir >>/<< parameters.platform >>/<< parameters.sdk_version >>"
+machine:
+  node:
+    # Circle will use node v4.0.0
+    version: 4.0.0
 
 jobs:
   build:
-    executor: nix
+    docker:
+      - image: circleci/node:10.15.0
     steps:
-      - setup
-      - restore_yarn_cache
+      - checkout
       - run: yarn
-      - save_yarn_cache
-      - run: yarn lint
       - run: yarn build
-
-  unit_tests:
-    executor: nix
+  test:
+    docker:
+      - image: circleci/node:10.15.0
     steps:
-      - setup
-      - restore_yarn_cache
+      - checkout
       - run: yarn
-      - save_yarn_cache
-      - run:
-          name: Run unit tests
-          command: ./scripts/tests/runUnitTestsCI.sh
-
-  ios_smoke_tests:
-    executor: mac
-    steps:
-      - install_nix
-      - setup
-      - decrypt_secrets_if_possible
-      - restore_yarn_cache
-      - run: yarn
-      - save_yarn_cache
-      - restore_workingdir_cache:
-          sdk_version: sdk32
-          platform: ios
-      - run:
-          name: Run iOS smoke tests
-          command: ./scripts/tests/runIOSSmokeTestsCI.sh
-      - save_workingdir_cache:
-          workingdir: /Users/distiller/project/workingdir
-          sdk_version: sdk32
-          platform: ios
-
-  android_smoke_tests:
-    executor: android
-    steps:
-      - setup
-      - setup_nix
-      - restore_yarn_cache
-      - run: yarn
-      - save_yarn_cache
-      - restore_workingdir_cache:
-          sdk_version: sdk32
-          platform: android
-      - run:
-          name: Fetch Android shell app
-          command: SDK_VERSION=sdk32 ./scripts/android/fetchRemoteAndroidTarball.sh
-      - run:
-          name: Run Android smoke tests
-          command: |
-            nix-shell nix/android-shell.nix --pure \
-              --run "./scripts/tests/runAndroidSmokeTestsCI.sh"
-      - save_workingdir_cache:
-          workingdir: ~/turtle/workingdir
-          sdk_version: sdk32
-          platform: android
+      - run: ./test-ci-unit.sh
 
 workflows:
-  checks:
+  version: 2
+  build_and_test:
     jobs:
       - build
-  tests:
-    jobs:
-      - unit_tests
-      - ios_smoke_tests
-      - android_smoke_tests
+      - test

.envrc

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 source_local() {
   file=./.envrc.local
@@ -15,9 +15,4 @@ export NODE_ENV=development
 
 export EXPO_TURTLE_TOOLS_DIR="$(pwd)/tools"
 
-if [ -z "$EXPO_UNIVERSE_DIR" ]; then
-  PATH_add $EXPO_TURTLE_TOOLS_DIR/bin
-  if [ "$CI" = "true" ]; then
-    PATH_add $EXPO_TURTLE_TOOLS_DIR/ci/bin
-  fi
-fi
+PATH_add $EXPO_TURTLE_TOOLS_DIR/bin

.eslintrc

@@ -0,0 +1,21 @@
+{
+  "plugins": [
+    "import"
+  ],
+  "extends": ["universe", "plugin:import/errors"],
+  "rules":{
+    "import/order": [
+      "error",
+      {
+        "groups": ["builtin", "external", "parent", "sibling", "index"],
+        "newlines-between": "always"
+      }
+    ],
+    "import/no-unresolved": "off"
+  },
+  "settings": {
+    "import/resolver": {
+      "babel-module": {}
+    }
+  }
+}

.gitignore

@@ -1,14 +1,8 @@
 !/src/node_modules
 
-node_modules
-yarn-error.log
-google-cloud-credentials.json
-
 /build/
 /workingdir/*
 /artifacts/*
 shell.apk
+node_modules
 .secrets*
-
-*.swp
-*.swo

.ignore

@@ -1 +0,0 @@
-fixtures/

.nvmrc

@@ -1 +0,0 @@
-v8.15.1

.release-it.beta.json

@@ -1,9 +0,0 @@
-{
-  "git": {
-    "commit": false,
-    "tag": true,
-    "push": true,
-    "requireUpstream": false,
-    "tagName": "v${version}"
-  }
-}

.release-it.json

@@ -1,12 +0,0 @@
-{
-  "npm": {
-    "tag": "latest"
-  },
-  "git": {
-    "requireUpstream": false,
-    "tagName": "v${version}"
-  },
-  "github": {
-    "release": true
-  }
-}

.secrets.local-common

@@ -2,6 +2,7 @@ LOGGER_LEVEL="debug"
 API_PROTOCOL="http"
 API_HOSTNAME="localhost"
 API_PORT="3000"
+LOGGLY_TOKEN=""
 SENTRY_DSN=""
 ENVIRONMENT="development"
 REDIS_URL="redis://localhost:6379/0"

CHANGELOG.md

@@ -1,133 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-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]
-
-## [0.7.2] - 2019-05-09
-### Removed
-- Support for `CLIENT_LOGGER_LEVEL` env variable.
-### 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).
-
-## [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
-- Checking fastlane version before running build (turtle-cli).
-### Changed
-- Updated iOS shell app for SDK 32 to fix AppAuth issue.
-- Babel replaced by ttypescript.
-- Updated xdl to 53.5.3 and @expo/spawn-async to 1.4.2, so that error stack traces should be more informative now.
-### Fixed
-- Brought back `jobID` and `experienceName` fields to GCloud logs.
-### Removed
-- `buidAndroidTarballLocally.sh` script (it has been moved to expo repository - [expo/expo#4022](https://github.com/expo/expo/pull/4022)).
-
-## [0.6.0] - 2019-04-09
-### Changed
-- Removed Branch module from Android shell apps for all SDK versions.
-
-## [0.5.15] - 2019-04-03
-### Added
-- Turtle smoke tests are now being executed on CircleCI from the context of this repository.
-### Changed
-- Updated iOS shell app for SDK 32 (fixes [this loading issue for slow connections](https://github.com/expo/expo/issues/3574)).
-- Minor infra changes (doesn't affect users).
-- Error logs format - error objects are now passed in an object being passed as the first argument to logger function.
-### Removed
-- Sending logs to loggly.
-
-## [0.5.14] - 2019-03-22
-### Added
-- `--config` parameter for turtle-cli commands, which allows to specify a custom path to app.json file
-### Changed
-- Updated iOS shell app for SDK 32 (fixes [this notifications issue](https://github.com/expo/expo/issues/3663)).
-
-## [0.5.13] - 2019-03-12
-### Added
-- Android SDK version support validation.
-### Changed
-- iOS Enterprise builds don't compile bitcode now.
-
-## [0.5.12] - 2019-02-26
-### Added
-- Google Cloud logger (as a bunyan stream).
-### Changed
-- Android builder passes the manifest from a build job message if it's available.
-
-## [0.5.11] - 2019-02-22
-### Added
-- Builder for iOS client apps.
-
-## [0.5.10] - 2019-02-19
-### Added
-- 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.
-
-## [0.5.9] - 2019-02-06
-- Update iOS shell app for SDK 32 (fixes bare notifications [issue](https://github.com/expo/expo/issues/3223)).
-
-## [0.5.7] - 2019-01-31
-- Update Android shell app for SDK 32 to fix bundled assets issue.
-
-## [0.5.6] - 2019-01-25
-- Update iOS shell app for SDK 30, 31 and 32 (built with xcode 10.1).
-
-## [0.5.5] - 2019-01-24
-### Added
-- Sending build duration in AWS SQS messages (of `FINISHED` and `ERRORED` types).
-
-## [0.5.4] - 2019-01-22
-### Changed
-- Update iOS shell app for SDK32 to [`expo/expo#0847c10`](https://github.com/expo/expo/commit/0847c1073d38c366866f3d9279ddd662da47dc9b), i.e. v2.10.3 with fixed WebView navigation scheme and upgraded Facebook SDK.
-
-## [0.5.3] - 2019-01-21
-### Fixed
-- Building Android standalone apps ([not accepted license issue](https://github.com/expo/expo/issues/3266)) - updated Android build tools (`build-tools;28.0.3`, `platforms;android-28`).
-
-## [0.5.2] - 2019-01-18
-### Added
-- The link (in README) to the repository containing `turtle-cli` usage example.
-- [Contributing guide](CONTRIBUTING.md).
-- [Code of Conduct](CODE_OF_CONDUCT.md).
-### Removed
-- `eslint`
-### Changed
-- Fix all `tslint` errors.
-
-## [0.5.1] - 2019-01-16
-### Changed
-- Update Android shell app for SDK32 that includes `[email protected]`.
-
-## [0.5.0] - 2019-01-16
-### Added
-- Turtle version is added to the `onFinish` and `onError` build messages.
-### Changed
-- A version property value being sent to the queue. It's now the version number
-from `package.json` instead of `new`/`old` indicator.
-### Removed
-- `--push-p12-path` parameter for `turtle build:ios` command,
-a Push Notifications Certificate is no longer required to perform a successful
-iOS standalone app build.
-
-## [0.4.3] - 2019-01-09
-### Changed
-- Update iOS shell app for SDK32.
-- Update Android shell app for SDK32.

CODE_OF_CONDUCT.md

@@ -1,7 +0,0 @@
-# Community Code of Conduct
-
-The Expo team is committed to fostering an open and welcoming environment.
-
-**Our Community Guidelines can be found here:**
-
-https://expo.io/guidelines

CONTRIBUTING.md

@@ -1,33 +0,0 @@
-# Contributing to Turtle CLI
-
-## How to contribute
-You can contribute to Turtle CLI in various ways, including:
-- [Reporting bugs or issues](https://github.com/expo/turtle/issues/new) on GitHub. Please make sure to fill in all the details suggested by the template to make sure the issue can be addressed as quickly as possible.
-- [Submitting improvements to the documentation](https://github.com/expo/expo/tree/master/docs). Updates, enhancements, new guides, spelling fixes…
-- Helping other people on [Expo Forums](https://forums.expo.io/) and on [Expo Developers Slack](http://slack.expo.io).
-- Looking at existing [issues](https://github.com/expo/turtle/issues) and adding more information, particularly helping to reproduce the issues.
-- [Submitting a pull request](#submitting-a-pull-request) with a bug fix or an improvement.
-
-## Turtle CLI repository
-
-### Codebase
-This repository contains the codebase for the `turtle-cli` NPM package. The same codebase is used to run standalone app builders on the Expo servers.
-
-### Branches
-The `master` branch of the repository should be kept releasable at any time. This way we can continuously release fixes and improvements without costly managing of different branches and issues will be noticed and fixed quickly. This also ensures other contributors can check out the latest version from GitHub and work on it with minimal disruption from other features in progress.
-
-## Setting up the repository for development
-*TODO*
-
-## Submitting a pull request
-To submit a pull request:
-1. Fork the [repository](https://github.com/expo/turtle) and create a feature branch. (Existing contributors can create feature branches without forking. Prefix the branch name with `@your-github-username/`.)
-2. Write the description of your pull request. Make sure to include a test plan and test your changes.
-3. Make sure all tests pass on CircleCI.
-4. Wait for a review and adjust the code if necessary.
-
-## Publishing a release
-- To release a new version of `turtle-cli`, run `yarn release` command.
-- If you wish to release a new *beta* version of `turtle-cli`, run `yarn release:beta` instead.
-- Update [Changelog](CHANGELOG.md).
-- In a terminal, `cd` into [expo/turtle-cli-example](https://github.com/expo/turtle-cli-example) repository, run `yarn update-turtle-cli-version` (this script updates `turtle-cli` version number in CI configuration files and commits the changes) and then run `git push`. Thanks!

Dockerfile

@@ -36,34 +36,30 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
 # Download and untar SDK
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
 RUN mkdir -p ${ANDROID_HOME} && \
   curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
   cd ${ANDROID_HOME} && \
   unzip -qq sdk.zip && \
   rm sdk.zip && \
+  # prevents warnings about missing repo config
   mkdir -p ${HOME}/.android && \
   touch ${HOME}/.android/repositories.cfg
 
 ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
-ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
+ENV PATH ${ANDROID_HOME}/build-tools/25.0.0/:${PATH}
 
 RUN yes | sdkmanager --licenses > /dev/null
-RUN yes | sdkmanager \
+
+# Install Android SDK components
+RUN sdkmanager \
+  "platform-tools" \
   "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 \
+  "build-tools;25.0.0" \
   "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"
+  "extras;google;m2repository"
 
 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e
@@ -99,19 +95,25 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
 
+# Install Gulp
+RUN npm install -g gulp-cli
+
+# Install Git
+RUN echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -t wheezy-backports install git-core && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+
 ADD . /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 \
+      mv exponent-package.json package.json \
     ; done
 
 WORKDIR /app

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,39 +1,13 @@
 # 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)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/expo/turtle/blob/master/LICENSE)
+Turtle CLI is a command line interface for building Expo standalone apps. You can use it both on your CI and your private computer.
 
-[![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/)
+### Glossary
 
-Turtle CLI is a command line interface for building Expo standalone apps.
-You can use it both on your CI and your private computer.
-
-- [Changelog](CHANGELOG.md)
-- [Contributing to Turtle CLI](CONTRIBUTING.md)
-- [Code of Conduct](CODE_OF_CONDUCT.md)
-
-## Glossary
 - **Turtle** - script which takes a shell app, fills it with user's code and produces a standalone app
 - **Shell app** — precompiled (in case of iOS builds) Expo app which doesn't have user's code
 - **Standalone app** - .ipa/.apk file, a user uploads standalone apps to the Google Play Store/Apple App Store
 
 ## Installation
+
 [Installation instructions and documentation here.](https://docs.expo.io/versions/latest/distribution/turtle-cli)
-
-## Usage example
-See the [expo/turtle-cli-example](https://github.com/expo/turtle-cli-example) repository to learn how to use Turtle CLI in order to build Expo standalone apps on your CI.
-
-## Do you need help?
-- Make sure you've read [the Expo Docs](https://docs.expo.io/), especially [Building Standalone Apps on Your CI
-](https://docs.expo.io/versions/latest/distribution/turtle-cli) and [Building Standalone Apps](https://docs.expo.io/versions/latest/distribution/building-standalone-apps) guides.
-- Search for existing GitHub issues [in this repository](https://github.com/expo/turtle/issues) and in [expo/expo](https://github.com/expo/expo/issues) repository.
-- Ask for help in **one** of the following ways:
-  * create [a GitHub issue](https://github.com/expo/turtle/issues/new).
-  * create a new topic on [Expo Forums](https://forums.expo.io/).
-  * ask a question on [Expo Developers Slack](http://slack.expo.io).
-
-## License
-The Turtle CLI source code is made available under the [MIT license](LICENSE).
-Some of the dependencies are licensed differently, with the BSD license, for example.

bin/turtle.js

@@ -1,15 +1,6 @@
 #!/usr/bin/env node
 'use strict';
 
-const subcommand = process.argv[2];
-if (subcommand) {
-  const [, platform] = subcommand.split(':');
-  if (platform === 'ios' || platform === 'android') {
-    // so that logs have correct platform set
-    process.env.PLATFORM = platform;
-  }
-}
-
 require('source-map-support').install();
 require('../build/bin/env').initOfflineEnv();
 require('../build/bin/index').run('turtle');

gulpfile.js

@@ -0,0 +1,91 @@
+'use strict';
+
+const childProcess = require('child_process');
+const util = require('util');
+const path = require('path');
+
+const gulp = require('gulp');
+const babel = require('gulp-babel');
+const changed = require('gulp-changed');
+const nodemon = require('gulp-nodemon');
+const plumber = require('gulp-plumber');
+const sourcemaps = require('gulp-sourcemaps');
+const ts = require('gulp-typescript');
+const rimraf = require('rimraf');
+
+const rimrafAsync = util.promisify(rimraf);
+
+const tsProject = ts.createProject('tsconfig.json');
+
+gulp.task('clean', async () => {
+  console.log(`Removing build directories...`);
+  await rimrafAsync('build');
+});
+
+gulp.task('build:server', () => {
+  console.log(`Compiling the Node.js server JavaScript...`);
+  return tsProject
+    .src()
+    .pipe(plumber())
+    .pipe(changed('build'))
+    .pipe(sourcemaps.init())
+    .pipe(tsProject())
+    .pipe(babel())
+    .pipe(
+      sourcemaps.write('.', {
+        includeContent: false,
+        sourceRoot: '../src',
+      })
+    )
+    .pipe(gulp.dest('build'));
+});
+
+gulp.task('watch:source', async () => {
+  console.log(`Watching for changes to the Node.js server JavaScript...`);
+  gulp.watch('src/**/*.(t|j)s', gulp.series('build:server'));
+});
+
+gulp.task('watch:local', createWatchTask('development'));
+gulp.task('watch:server', createWatchTask('production'));
+
+function createWatchTask(nodeEnv) {
+  return async () => {
+    console.log(`Starting the Node.js server and watching for changes (NODE_ENV=${nodeEnv})...`);
+    // Run nodemon in a separate process to isolate its side effects on stdio streams
+    let nodeCmd = 'node';
+    if (nodeEnv === 'development') {
+      nodeCmd += ' --inspect=:9315';
+    }
+    nodemon({
+      script: './build/server.js',
+      execMap: {
+        js: nodeCmd,
+      },
+      env: {
+        NODE_ENV: nodeEnv,
+      },
+
+      watch: ['./build'],
+      stdout: false,
+      readable: false,
+    }).on('readable', function() {
+      const bunyan = childProcess.fork(
+        path.join('.', 'node_modules', '.bin', 'bunyan'),
+        ['-o', 'short', '-l', 'debug', '--color'],
+        { silent: true }
+      );
+
+      bunyan.stdout.pipe(process.stdout);
+      bunyan.stderr.pipe(process.stderr);
+      this.stdout.pipe(bunyan.stdin);
+      this.stderr.pipe(bunyan.stdin);
+    });
+  };
+}
+
+gulp.task(
+  'watch',
+  gulp.series('clean', 'build:server', gulp.parallel('watch:source', 'watch:local'))
+);
+
+gulp.task('default', gulp.series('watch'));

jest/integration-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testRegex": "(test|spec)\\.ts$",
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

jest/smoke-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testMatch": [ "**/__smoke__/*.test.ts" ],
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

jest/unit-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testMatch": [ "**/__tests__/*.ts" ],
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

jsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es2017",
+    "allowSyntheticDefaultImports": false,
+    "baseUrl": "./",
+    "paths": {
+      "turtle/*": ["src/*"],
+    }
+  },
+  "exclude": ["node_modules", "dist", "build"]
+}

k8s/android/turtle-deployment.template.yml

@@ -50,6 +50,8 @@ spec:
             value: exp-shell-app-assets
           - name: AWS_S3_REGION
             value: us-west-1
+          - name: LOGGLY_SUBDOMAIN
+            value: exponent
           - name: TURTLE_TEMPORARY_FILES_DIR
             value: /tmp/turtle
           # vars from k8s secrets
@@ -98,6 +100,11 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: aws_cloudwatch_region
+          - name: LOGGLY_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: loggly_token
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

nix/all-packages.nix

@@ -1,5 +0,0 @@
-self: super:
-
-{
-  nodejs = super.nodejs-8_x;
-}

nix/android-shell.nix

@@ -1,50 +0,0 @@
-with (import ./default.nix {});
-
-let
-
-   ndk = androidenv.androidndk_17c.override { fullNDK = true; };
-   ndk_root = "${ndk}/libexec/${ndk.name}";
-   sdk_path = if stdenv.isDarwin
-     then "/Library/Android/sdk"
-     else "/Android/Sdk"; # intentional Capital S
-
-in
-
-mkShell rec {
-
-  LANG="en_US.UTF-8";
-  JAVA_HOME=openjdk8;
-
-  ANDROID_SDK_ROOT=builtins.getEnv("HOME") + sdk_path;
-  ANDROID_NDK_ROOT="${ANDROID_SDK_ROOT}/ndk-bundle";
-  ANDROID_HOME=ANDROID_SDK_ROOT;
-  ANDROID_NDK=ANDROID_NDK_ROOT;
-
-  nativeBuildInputs = [
-    awscli
-    curl
-    git
-    nodejs-8_x
-    openjdk8
-    yarn
-  ];
-
-  passthru = { inherit ndk; };
-
-  shellHook = ''
-    ${./install-ndk-17c.sh} ${ndk} ${ndk_root}
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --licenses --sdk_root="$ANDROID_SDK_ROOT"
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platforms;android-28" | grep -v =
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "build-tools;28.0.3" | grep -v =
-    ${lib.optionalString stdenv.isLinux ''
-      for dep in lib lib64; do
-        if [ -L /$dep ] || [ ! -e /$dep ]; then
-          echo "Creating /$dep"
-          ln -s ${stdenv.cc.libc}/$dep /$dep
-        else
-          echo "Using existing /$dep"
-        fi
-      done
-    ''}
-  '';
-}

nix/default.nix

@@ -1,19 +0,0 @@
-let
-  pin = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
-
-  nixpkgs = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs-channels/archive/${pin.rev}.tar.gz";
-    inherit (pin) sha256;
-  };
-
-in
-
-{ ... } @ args:
-
-  import nixpkgs (args // {
-    config = {
-      allowUnfree = true;
-      android_sdk.accept_license = true;
-    };
-    overlays = [ (import ./all-packages.nix) ];
-  })

nix/install-ndk-17c.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-scriptdir="$(dirname ${BASH_SOURCE[0]})"
-shellnix="$scriptdir/android-shell.nix"
-
-ndk=${1:-$(nix-build "$shellnix" -A ndk --no-out-link)}
-ndkRoot=${2:-$(nix eval --file "$shellnix" --raw ANDROID_NDK_ROOT)}
-
-mkdir -p "$ANDROID_NDK_ROOT" # Create full path if necessary
-
-# Replace any existing link or directory with link
-rm -r "$ANDROID_NDK_ROOT"
-ln -sn "$ndkRoot" "$ANDROID_NDK_ROOT"

nix/nixpkgs.json

@@ -1,7 +0,0 @@
-{
-  "url": "https://github.com/NixOS/nixpkgs-channels.git",
-  "rev": "80738ed9dc0ce48d7796baed5364eef8072c794d",
-  "date": "2018-11-17T11:18:10+01:00",
-  "sha256": "0anmvr6b47gbbyl9v2fn86mfkcwgpbd5lf0yf3drgm8pbv57c1dc",
-  "fetchSubmodules": false
-}

nodemon.json

@@ -1,6 +0,0 @@
-{
-  "watch": ["src"],
-  "ext": "ts",
-  "ignore": ["src/**/*.test.ts"],
-  "exec": "ts-node -r tsconfig-paths/register --files src/server.ts"
-}

package.json

@@ -1,21 +1,23 @@
 {
   "name": "turtle-cli",
-  "version": "0.7.2",
+  "version": "0.4.3",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
-    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv nodemon | bunyan -o short -l debug --color",
+    "start": "EXPENV_OVERRIDES=local-common,local expenv gulp",
     "start:ios": "PLATFORM=ios yarn start",
     "start:android": "PLATFORM=android yarn start",
+    "watch": "EXPENV_OVERRIDES=local-common,local expenv gulp watch:source",
     "bin:turtle": "./bin/turtle.js",
-    "lint": "tslint -c tslint.json 'src/**/*.ts'",
-    "lint:fix": "yarn lint --fix",
-    "prepare": "rimraf ./build && yarn build",
-    "build": "ttsc",
+    "lint": "eslint src",
+    "prepare": "yarn build",
+    "build": "gulp build:server",
     "build:production": "./scripts/build.sh",
-    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
-    "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
-    "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
+    "build:android-tarball:local": "./scripts/android/buildAndroidTarballLocally.sh",
+    "init-workingdir:local": "./scripts/initLocalWorkingdir.sh",
+    "init-workingdir:remote": "yarn init-workingdir:remote-android && yarn init-workingdir:remote-ios",
+    "init-workingdir:remote-android": "./scripts/android/fetchRemoteAndroidTarball.sh",
+    "init-workingdir:remote-ios": "./scripts/ios/fetchRemoteIosTarball.sh",
     "docker:pull": "retry5 gcloud docker -- pull gcr.io/exponentjs/turtle-android:latest",
     "docker:pull:tag": "retry5 gcloud docker -- pull gcr.io/exponentjs/turtle-android:${TAG}",
     "docker:build": "yarn build:production android && gcloud docker -- build -t gcr.io/exponentjs/turtle-android:latest -t gcr.io/exponentjs/turtle-android:${TAG} .",
@@ -25,29 +27,16 @@
     "test:integration": "yarn test --config jest/integration-config.json",
     "test:unit": "yarn test --config jest/unit-config.json",
     "test:smoke": "yarn test --config jest/smoke-config.json --forceExit",
-    "test:smoke:android": "PLATFORM=android yarn test:smoke --testNamePattern=android",
+    "test:smoke:android": "yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "release": "./scripts/release.sh",
-    "release:beta": "./scripts/releaseBeta.sh",
+    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
     "ssh:android:pods-names": "./scripts/ssh/findAndroidPods.sh",
     "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
     "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",
     "set-priorities": "yarn set-priorities:local",
-    "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"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.ts": [
-      "yarn lint:fix",
-      "git add"
-    ]
+    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local expenv babel-node scripts/setConfigurations.js",
+    "set-priorities:staging": "expenv babel-node scripts/setConfigurations.js",
+    "set-priorities:production": "EXPENV_OVERRIDES=prod expenv babel-node scripts/setConfigurations.js"
   },
   "bin": {
     "turtle": "./bin/turtle.js"
@@ -71,9 +60,6 @@
     "url": "https://github.com/expo/turtle/issues"
   },
   "homepage": "https://github.com/expo/turtle#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
   "devDependencies": {
     "@types/decompress": "^4.2.3",
     "@types/fs-extra": "^5.0.4",
@@ -83,34 +69,41 @@
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
     "@types/request": "^2.47.1",
-    "@types/semver": "^6.0.0",
     "@types/sharp": "^0.17.8",
     "@types/tar": "^4.0.0",
     "@types/uuid": "^3.4.3",
     "@types/which": "^1.3.1",
-    "husky": "^1.3.1",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
+    "babel-jest": "^23.6.0",
+    "babel-plugin-module-resolver": "^3.1.1",
+    "babel-preset-env": "^1.6.1",
+    "eslint": "^4.19.1",
+    "eslint-config-universe": "^1.0.7",
+    "eslint-import-resolver-babel-module": "^4.0.0",
+    "gulp": "github:gulpjs/gulp#4.0",
+    "gulp-babel": "^7.0.1",
+    "gulp-changed": "^3.2.0",
+    "gulp-nodemon": "^2.4.1",
+    "gulp-plumber": "^1.2.0",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-typescript": "^4.0.2",
     "jest": "^23.6.0",
-    "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
-    "nodemon": "^1.18.11",
-    "release-it": "^10.0.0",
+    "nodemon": "^1.18.7",
     "rimraf": "^2.6.2",
+    "source-map-loader": "^0.2.3",
     "ts-jest": "^23.10.4",
-    "ts-node": "^8.0.3",
-    "ts-transformer-imports": "^0.4.1",
-    "tsconfig-paths": "^3.8.0",
     "tslint": "^5.10.0",
-    "tslint-eslint-rules": "^5.4.0",
-    "ttypescript": "^1.5.6",
-    "typescript": "^3.4.2"
+    "typescript": "^3.0.1"
   },
   "dependencies": {
-    "@expo/spawn-async": "^1.4.2",
-    "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
     "bunyan": "^1.8.12",
     "bunyan-debug-stream": "^1.0.8",
+    "bunyan-loggly": "^1.3.4",
     "bunyan-sentry-stream": "^1.2.1",
     "commander": "^2.15.1",
     "copy": "^0.3.1",
@@ -124,15 +117,11 @@
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
-    "semver": "^6.0.0",
     "sharp": "^0.21.0",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1",
-    "xdl": "53.5.4"
-  },
-  "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.9.4"
+    "xdl": "52.0.14-alpha.6+371be041"
   }
 }

scripts/android/buildAndroidTarballLocally.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -xeo pipefail
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
+ARTIFACTS_DIR="$ROOT_DIR/artifacts"
+TEMP_DIR="/tmp/android-shell-app"
+
+mkdir -p $ARTIFACTS_DIR
+rm -rf $TEMP_DIR
+mkdir -p $TEMP_DIR
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/tools-public $TEMP_DIR/tools-public
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/secrets $TEMP_DIR/secrets
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/template-files $TEMP_DIR/template-files
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/android $TEMP_DIR/android
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/package.json $TEMP_DIR/package.json
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/expokit-npm-package $TEMP_DIR/expokit-npm-package
+ln -s ${EXPO_UNIVERSE_DIR}/exponent/packages $TEMP_DIR/packages
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/eslint-config-universe $TEMP_DIR/eslint-config-universe
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/json-file $TEMP_DIR/json-file
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/osascript $TEMP_DIR/osascript
+ln -s ${EXPO_UNIVERSE_DIR}/libraries/schemer $TEMP_DIR/schemer
+ln -s ${EXPO_UNIVERSE_DIR}/package.json $TEMP_DIR/universe-package.json
+
+# generate dynamic macros
+mkdir -p $TEMP_DIR/android/expoview/src/main/java/host/exp/exponent/generated/
+cd $TEMP_DIR/tools-public
+./generate-dynamic-macros-android.sh
+rm -rf $TEMP_DIR/secrets
+
+cd $TEMP_DIR; tar -czhf $ARTIFACTS_DIR/android-shell-builder.tar.gz .
+rm -rf $TEMP_DIR

scripts/android/fetchRemoteAndroidTarball.sh

@@ -1,4 +1,18 @@
 #!/usr/bin/env bash
 
+set -xeo pipefail
+
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-$ROOT_DIR/scripts/fetchRemoteTarballs.sh android
+ARTIFACTS_DIR="$ROOT_DIR/artifacts"
+WORKING_DIR="$ROOT_DIR/workingdir/android"
+ANDROID_SHELL_TARBALLS_DIRECTORY="$ROOT_DIR/shellTarballs/android"
+
+mkdir -p $ARTIFACTS_DIR
+
+for SDK_VERSION in `ls $ANDROID_SHELL_TARBALLS_DIRECTORY`; do
+  mkdir -p $WORKING_DIR/$SDK_VERSION
+  TARBALL_URI=$(head -n 1 $ANDROID_SHELL_TARBALLS_DIRECTORY/$SDK_VERSION)
+  run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  tar zxf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz -C $WORKING_DIR/$SDK_VERSION
+  rm -rf $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
+done

scripts/build.sh

@@ -2,8 +2,6 @@
 
 set -xeo pipefail
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
 if [ -z "$1" ]; then
   echo "Please specify a platform to build"
   exit 1
@@ -13,12 +11,7 @@ PLATFORM=$1
 
 yarn
 yarn run build
-if [ "$PLATFORM" = "android" ]; then
-  $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
-elif [ "$PLATFORM" = "ios" ]; then
-  $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
-fi
-
+yarn init-workingdir:remote-$PLATFORM
 
 if [[ -z "${TARBALL}" ]]; then
   echo "TARBALL is not set, building tarball skipped"

scripts/cli/configureAndroidSdk.sh

@@ -1,12 +1,9 @@
 #!/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 \
+yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses > /dev/null
+$ANDROID_HOME/tools/bin/sdkmanager \
+  "platform-tools" \
+  "platforms;android-23" \
+  "build-tools;25.0.0" \
   "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services"
+  "extras;google;m2repository"

scripts/fetchRemoteTarballs.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeo pipefail
-
-PLATFORM=$1
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-ARTIFACTS_DIR="$ROOT_DIR/artifacts"
-WORKING_DIR="$ROOT_DIR/workingdir/$PLATFORM"
-SHELL_TARBALLS_DIRECTORY="$ROOT_DIR/shellTarballs/$PLATFORM"
-
-mkdir -p $ARTIFACTS_DIR
-
-convert_s3_to_https() {
-  BUCKET=`echo $1 | sed 's/s3:\/\/\([^/]*\).*/\1/'`
-  KEY=`echo $1 | sed 's/s3:\/\/[^/]*\/\(.*\)/\1/'`
-  echo "https://s3.amazonaws.com/$BUCKET/$KEY"
-}
-
-download_shell_app() {
-  SDK_VERSION=$1
-  mkdir -p $WORKING_DIR/$SDK_VERSION
-  TARBALL_S3_URL=$(head -n 1 $SHELL_TARBALLS_DIRECTORY/$SDK_VERSION)
-  TARBALL_HTTPS_URL=$(convert_s3_to_https $TARBALL_S3_URL)
-  curl -s $TARBALL_HTTPS_URL -o $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
-  tar zxf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz -C $WORKING_DIR/$SDK_VERSION
-  rm -rf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
-}
-
-if [[ -z "$SDK_VERSION" ]]; then
-  for SDK_VERSION in `ls $SHELL_TARBALLS_DIRECTORY`; do
-    download_shell_app $SDK_VERSION
-  done
-else
-  if [ ! -d "$WORKING_DIR/$SDK_VERSION" ]; then
-    download_shell_app $SDK_VERSION
-  fi
-fi

scripts/initLocalWorkingdir.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+ensure_link_exists() {
+  if [ ! -L "$2" ]; then
+    ln -s $1 $2
+    echo "$2 link created"
+  fi
+}
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+WORKINGDIR="$ROOT_DIR/workingdir/local"
+
+if [ ! -d "$WORKINGDIR" ]; then
+  mkdir -p $WORKINGDIR
+  echo "$WORKINGDIR directory created"
+fi
+
+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"
+done

scripts/initPrivateSecrets.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-if [ -z "$EXPO_UNIVERSE_DIR" ]; then
-  echo "You need to specify EXPO_UNIVERSE_DIR to use this script. Alternatively you can create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
-  exit 1
-fi
-
 if [ -z "$1" ]; then
   echo "Please specify a nickname you used to create AWS SQS queues"
   exit 1
@@ -17,9 +12,12 @@ ANDROID=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.a
 IOS=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in | head -1 | cut -d"=" -f2 | xargs`
 OUT=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_out | head -1 | cut -d"=" -f2 | xargs`
 
-cat << EOF > $TURTLE_DIR/.secrets.local-queue
+cat << EOF > $TURTLE_DIR/.secrets.local
 AWS_SQS_ANDROID_QUEUE_URL="$ANDROID"
 AWS_SQS_IOS_QUEUE_URL="$IOS"
 AWS_SQS_OUT_QUEUE_URL="$OUT"
+TURTLE_FAKE_UPLOAD="1"
+TURTLE_FAKE_UPLOAD_DIR="/Users/$USER/Downloads"
+TURTLE_WORKING_DIR_PATH="$EXPO_UNIVERSE_DIR/server/turtle/workingdir"
+TURTLE_USE_LOCAL_WORKING_DIR="1"
 EOF
-

scripts/ios/fetchRemoteIosTarball.sh

@@ -1,4 +1,18 @@
 #!/usr/bin/env bash
 
+set -xeo pipefail
+
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-$ROOT_DIR/scripts/fetchRemoteTarballs.sh ios
+ARTIFACTS_DIR="$ROOT_DIR/artifacts"
+WORKING_DIR="$ROOT_DIR/workingdir/ios"
+IOS_SHELL_TARBALLS_DIRECTORY="$ROOT_DIR/shellTarballs/ios"
+
+mkdir -p $ARTIFACTS_DIR
+
+for SDK_VERSION in `ls $IOS_SHELL_TARBALLS_DIRECTORY`; do
+  mkdir -p $WORKING_DIR/$SDK_VERSION
+  TARBALL_URI=$(head -n 1 $IOS_SHELL_TARBALLS_DIRECTORY/$SDK_VERSION)
+  run expo.s3env --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --command retry5 aws s3 cp $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz --no-progress
+  tar zxf $ARTIFACTS_DIR/$SDK_VERSION.tar.gz -C $WORKING_DIR/$SDK_VERSION
+  rm -rf $TARBALL_URI $ARTIFACTS_DIR/$SDK_VERSION.tar.gz
+done

scripts/release.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
-$ROOT_DIR/node_modules/.bin/release-it
-echo
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "!!!! PLEASE REMEMBER TO UPDATE CHANGELOG !!!!"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

scripts/releaseBeta.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
-$ROOT_DIR/node_modules/.bin/release-it -c $ROOT_DIR/.release-it.beta.json --preRelease=beta

scripts/setConfigurations.js

@@ -1,13 +1,12 @@
-
+import { env } from 'turtle/utils/env';
+import { connect, RedisClient } from 'turtle/utils/redis';
 import { PLATFORMS } from 'turtle/constants';
-import logger from 'turtle/logger';
 import {
   createConfigurationsKey,
   createDefaultConfigurationKey,
   HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 } from 'turtle/utils/priorities';
-import { connect, RedisClient } from 'turtle/utils/redis';
 
 const TIMEOUT = 3000;
 
@@ -26,34 +25,36 @@ const TIMEOUT = 3000;
 // they should come back to using configurations no. 1 and 2.
 // If there are no more available configurations from the table, the default configuration is used.
 
+
 const AVAILABLE_CONFIGURATIONS_IOS = [
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
   HIGH_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];
 
 const AVAILABLE_CONFIGURATIONS_ANDROID = [
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_ONLY_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
   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,
+  NORMAL_CONFIGURATION,
+  NORMAL_CONFIGURATION,
 ];
 
+
 const DEFAULT_CONFIGURATION = HIGH_CONFIGURATION;
 
 async function run() {
@@ -67,8 +68,6 @@ async function run() {
   redis.disconnect();
 }
 
-if (require.main === module) {
-  run()
-    .then(() => logger.info('All done'))
-    .catch((err) => logger.error('Error:', err));
-}
+run()
+  .then(() => console.log('All done'))
+  .catch(err => console.error('Error:', err));

scripts/setWorkingdirMode.sh

@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-
-DOWNLOAD_DIR="${EXPO_DOWNLOAD_DIR:-$HOME/Downloads}"
-
-mkdir -p $DOWNLOAD_DIR
-
-if [ ! -f "$ROOT_DIR/.secrets.local-queue" ]; then 
-  echo "You need to run \"yarn secrets:init-private [SQS_NAME]\" or create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
-  exit 1
-fi
-
-setup_local() {
-  ensure_link_exists() {
-    if [ ! -L "$2" ]; then
-      ln -s $1 $2
-      echo "$2 link created"
-    fi
-  }
-  WORKINGDIR="$ROOT_DIR/workingdir/local"
-  
-  if [[ -d $WORKINGDIR ]]; then
-    echo "Local workingdir already prepared"
-    return
-  fi
-
-  if [[ -z "$EXPO_UNIVERSE_DIR" ]]; then
-    echo "EXPO_UNIVERSE_DIR needs to be set"
-    exit -1
-  fi
-
-  cd $EXPO_UNIVERSE_DIR/exponent && yarn
-  cd $EXPO_UNIVERSE_DIR/exponent/tools-public && yarn && ./generate-dynamic-macros-android.sh
-
-  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")
-
-  for LINKNAME in ${LINKS[@]}; do
-    ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
-  done
-}
-
-setup_remote() {
-  if [[ -d $ROOT_DIR/workingdir/android && -d $ROOT_DIR/workingdir/ios ]]; then
-    echo "Shell apps already fetched"
-  else
-    echo "Fetching shell apps"
-    if [ "$PLATFORM" != 'ios' ]; then
-      $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
-    fi
-    if [ "$PLATFORM" != 'android' ]; then
-      $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
-    fi
-  done
-}
-
-switch_local() {
-cat << EOF > $ROOT_DIR/.secrets.local
-TURTLE_FAKE_UPLOAD="1"
-TURTLE_FAKE_UPLOAD_DIR="$HOME/Downloads"
-TURTLE_WORKING_DIR_PATH="$ROOT_DIR/workingdir"
-TURTLE_USE_LOCAL_WORKING_DIR="1"
-EOF
-}
-
-switch_remote() {
-cat << EOF > $ROOT_DIR/.secrets.local
-TURTLE_FAKE_UPLOAD="1"
-TURTLE_FAKE_UPLOAD_DIR="$HOME/Downloads"
-TURTLE_WORKING_DIR_PATH="$ROOT_DIR/workingdir"
-EOF
-}
-
-if [ "$1" == "local" ]; then
-  setup_local
-  switch_local
-elif [ "$1" == "remote" ]; then
-  setup_remote
-  switch_remote
-else
-  echo "You need to pass remote or local as argument"
-  exit -1
-fi

shellTarballs/android/sdk26

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz

shellTarballs/android/sdk27

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz

shellTarballs/android/sdk28

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz

shellTarballs/android/sdk29

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz

shellTarballs/android/sdk30

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz
+s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz

shellTarballs/android/sdk31

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-89b2d24c86737d5a489c6a18467e31b2f9ce9005.tar.gz
+s3://exp-artifacts/android-shell-builder-5c339ff7bab6f2161d378cc70e1bf04d32ad98dd.tar.gz

shellTarballs/android/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-0cab68670fc50ce1dc16b7d86ca7976870062c39.tar.gz
+s3://exp-artifacts/android-shell-builder-55e2cc952dc8bae3ebba8aaaab6eb1199ac7b0d0.tar.gz

shellTarballs/ios/client

@@ -1 +0,0 @@
-s3://exp-artifacts/ios-expo-client-15bb883c22173d5b01df19421580170e776041d0.tar.gz

shellTarballs/ios/sdk30

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-30-6863276e6b9605e31228c845a047387571959e9b.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-30-7d017a96d00fbf18ee7e5581ea47528b9cc78afd.tar.gz

shellTarballs/ios/sdk31

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

shellTarballs/ios/sdk32

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

src/__smoke__/smoke.test.ts

@@ -3,13 +3,14 @@ import fs from 'fs-extra';
 import nock from 'nock';
 
 import config from 'turtle/config';
-import { PLATFORMS } from 'turtle/constants';
 import * as jobManager from 'turtle/jobManager';
 import logger from 'turtle/logger';
+import { PLATFORMS } from 'turtle/constants';
+
 
 jest.mock('../builders/utils/uploader.ts', () => ({
   uploadBuildToS3: jest.fn(() => {
-    logger.debug('Faking uploading build');
+    console.log('Faking uploading build');
     return 'legit_path';
   }),
 }));
@@ -67,11 +68,11 @@ function mockFinish() {
     .post('/', (body: any) => {
       const keys = Object.keys(body);
       if (keys.includes('MessageBody')) {
-        const mb = JSON.parse(body.MessageBody);
+        const mb = JSON.parse(body['MessageBody']);
         if (mb.status === 'finished') {
           return true;
         } else if (mb.status === 'errored') {
-          fail('Build ended with error');
+          fail('Build ended with error')
         }
       }
       return false;

src/aws/cloudwatch/index.ts

@@ -1,22 +1,16 @@
 import aws from 'aws-sdk';
 import _ from 'lodash';
 
-import { EXTRA_DIMENSIONS, GROUP_HASH } from 'turtle/aws/cloudwatch/constants';
-import calculateStatistics from 'turtle/aws/cloudwatch/statistics';
-import {
-  IMetric,
-  IMetricConfiguration,
-  IMetricData,
-  IMetricsChunk,
-  MetricRegistrationObject,
-} from 'turtle/aws/cloudwatch/types';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
+import calculateStatistics from 'turtle/aws/cloudwatch/statistics';
+import { EXTRA_DIMENSIONS, GROUP_HASH } from 'turtle/aws/cloudwatch/constants';
+import { Metric, MetricData, MetricConfiguration, MetricRegistrationObject, MetricsChunk } from 'turtle/aws/cloudwatch/types';
 
-interface IState {
-  metrics: IMetric[];
+interface State {
+  metrics: Array<Metric>;
   registeredMetrics: {
-    [key: string]: IMetricConfiguration;
+    [key: string]: MetricConfiguration;
   };
   intervalId: NodeJS.Timer | null;
 }
@@ -25,7 +19,7 @@ const SUCCESS_SUFFIX = '.success';
 const FAIL_SUFFIX = '.fail';
 const CHUNK_SIZE = 20;
 
-const state: IState = {
+const state: State = {
   metrics: [],
   registeredMetrics: {},
   intervalId: null,
@@ -52,7 +46,7 @@ export function addMetricData({
   success = true,
   explicitName = false,
   extraDimensions = [],
-}: IMetricData) {
+}: MetricData) {
   if (config.cloudwatch.disabled) {
     return;
   }
@@ -63,7 +57,7 @@ export function addMetricData({
     return;
   }
   const { unit } = registeredMetric;
-  const metric: IMetric = {
+  const metric: Metric = {
     MetricName: metricName,
     Unit: unit,
     Value: value,
@@ -120,7 +114,7 @@ function _dumpMetrics() {
   logger.trace(
     '[cloudwatch] lenghts for state.metrics=%d, state.registeredMetrics=%d',
     state.metrics.length,
-    Object.keys(state.registeredMetrics).length,
+    Object.keys(state.registeredMetrics).length
   );
 
   _addEmptyMetrics(state.metrics);
@@ -130,7 +124,7 @@ function _dumpMetrics() {
   state.metrics = [];
 }
 
-function _addEmptyMetrics(metrics: IMetric[]) {
+function _addEmptyMetrics(metrics: Array<Metric>) {
   const seenMetrics = metrics.reduce((acc, i) => {
     if (!acc.has(i.MetricName)) {
       acc.add(i.MetricName);
@@ -140,46 +134,46 @@ function _addEmptyMetrics(metrics: IMetric[]) {
 
   const nonEmptyMetrics = _.omitBy(state.registeredMetrics, ({ addEmpty }) => !addEmpty);
   const toAdd = _.difference(Object.keys(nonEmptyMetrics), Array.from(seenMetrics));
-  toAdd.forEach((name) => addMetricData({ name, value: 0, explicitName: true }));
+  toAdd.forEach(name => addMetricData({ name, value: 0, explicitName: true }));
 }
 
-function _formatMetrics(metrics: IMetric[]) {
+function _formatMetrics(metrics: Array<Metric>) {
   const reducedMetrics = _reduceMetrics(metrics);
-  const metricsWithDimensions = reducedMetrics.map((metric) => {
+  const metricsWithDimensions = reducedMetrics.map(metric => {
     const { dimensions } = state.registeredMetrics[metric.MetricName];
     const joinedDimensions = [...dimensions, ...metric[EXTRA_DIMENSIONS]];
-    return joinedDimensions.map((i) => Object.assign({}, metric, { Dimensions: i }));
+    return joinedDimensions.map(i => Object.assign({}, metric, { Dimensions: i }));
   });
   const metricData = _.flatten(metricsWithDimensions);
   const chunks = _.chunk(metricData, CHUNK_SIZE);
-  return chunks.map((chunk) => ({
+  return chunks.map(chunk => ({
     Namespace: config.cloudwatch.namespace,
     MetricData: chunk,
   }));
 }
 
-function _reduceMetrics(metrics: IMetric[]) {
+function _reduceMetrics(metrics: Array<Metric>) {
   const grouped = _.groupBy(metrics, GROUP_HASH);
   return _.reduce(
     grouped,
-    (acc: IMetric[], val: any) => {
-      const { MetricName: key } = val[0] as IMetric;
+    (acc: Array<Metric>, val: any) => {
+      const { MetricName: key } = val[0] as Metric;
       const { reducer, statistics } = state.registeredMetrics[key];
       const reduced = reducer ? reducer(val) : val;
       const withStats = statistics ? calculateStatistics(reduced) : reduced;
       acc.push(...withStats);
       return acc;
     },
-    [],
+    []
   );
 }
 
-function _pushMetrics(metrics: IMetricsChunk[]) {
+function _pushMetrics(metrics: Array<MetricsChunk>) {
   logger.trace('[cloudwatch] pushing metrics', JSON.stringify(metrics, null, '\t'));
-  metrics.forEach((metricsChunk) => {
-    cloudWatch.putMetricData(metricsChunk, (err) => {
+  metrics.forEach(metricsChunk => {
+    cloudWatch.putMetricData(metricsChunk, err => {
       if (err) {
-        logger.warn({ err }, '[cloudwatch]');
+        logger.warn('[cloudwatch]', err);
       }
     });
   });

src/aws/cloudwatch/reducers.ts

@@ -1,13 +1,13 @@
-import { IMetric } from 'turtle/aws/cloudwatch/types';
+import { Metric } from 'turtle/aws/cloudwatch/types';
 
-export function sum(metrics: IMetric[]) {
+export function sum(metrics: Array<Metric>) {
   if (metrics.length === 0) {
     return [];
   }
-  const reduced = metrics.reduce((acc: IMetric | null, i: IMetric) => {
+  const reduced = metrics.reduce((acc: Metric | null, i: Metric) => {
     let result = acc;
     if (!result) {
-      result = { ...i };
+      result = {...i};
     } else {
       result.Value += i.Value;
     }
@@ -16,12 +16,12 @@ export function sum(metrics: IMetric[]) {
   return [reduced];
 }
 
-export function avg(metrics: IMetric[]) {
+export function avg(metrics: Array<Metric>) {
   if (!metrics.length) {
     return [];
   }
 
-  const metric = sum(metrics)[0] as IMetric;
+  const metric = sum(metrics)[0] as Metric;
   metric.Value = metric.Value / metrics.length;
   return [metric];
 }

src/aws/cloudwatch/statistics.ts

@@ -1,11 +1,11 @@
-import { IMetric, MetricWithStats } from 'turtle/aws/cloudwatch/types';
+import { Metric, MetricWithStats } from 'turtle/aws/cloudwatch/types';
 
-export default function calculateStatistics(metrics: IMetric[]) {
+export default function calculateStatistics(metrics: Array<Metric>) {
   if (!metrics.length) {
     return [];
   }
 
-  const reduced = metrics.reduce((acc: MetricWithStats | null, i: IMetric) => {
+  const reduced = metrics.reduce((acc: MetricWithStats | null, i: Metric) => {
     let result = acc;
     if (!result) {
       result = Object.assign({}, i, {

src/aws/cloudwatch/types.ts

@@ -1,6 +1,6 @@
 import { EXTRA_DIMENSIONS, GROUP_HASH } from 'turtle/aws/cloudwatch/constants';
 
-export interface IMetric {
+export interface Metric {
   MetricName: string;
   Unit: string;
   Value: number;
@@ -11,8 +11,8 @@ export interface IMetric {
     SampleCount: number;
     Sum: number;
   };
-  [EXTRA_DIMENSIONS]: any;
-  [GROUP_HASH]: string;
+  [EXTRA_DIMENSIONS]: any,
+  [GROUP_HASH]: string,
 }
 
 export type MetricWithStats = {
@@ -21,10 +21,10 @@ export type MetricWithStats = {
     Minimum: number;
     SampleCount: number;
     Sum: number;
-  },
-} & IMetric;
+  }
+} & Metric;
 
-export interface IMetricData {
+export interface MetricData {
   name: string;
   value: number;
   success?: boolean;
@@ -32,17 +32,17 @@ export interface IMetricData {
   extraDimensions?: any;
 }
 
-export interface IMetricConfiguration {
+export interface MetricConfiguration {
   unit: string;
   statistics?: boolean;
   reducer?: any;
   addEmpty?: boolean;
   dimensions?: any;
-}
+};
 
-export type MetricRegistrationObject = { metricName: string, explicitName?: boolean } & IMetricConfiguration;
+export type MetricRegistrationObject = { metricName: string, explicitName?: boolean } & MetricConfiguration;
 
-export interface IMetricsChunk {
+export interface MetricsChunk {
   Namespace: string;
-  MetricData: IMetric[];
-}
+  MetricData: Array<Metric>;
+};

src/aws/s3.ts

@@ -1,10 +1,10 @@
 import AWS from 'aws-sdk';
-import fs from 'fs-extra';
 import _ from 'lodash';
+import fs from 'fs-extra';
 
 import config from 'turtle/config';
 
-interface IFileUploadParams {
+interface FileUploadParams {
   bucketName?: string;
   key: string;
   srcPath: string;
@@ -17,7 +17,7 @@ const s3 = new AWS.S3({
 
 export default s3;
 
-export async function uploadFile({ bucketName = config.s3.bucket, key, srcPath }: IFileUploadParams) {
+export async function uploadFile({ bucketName = config.s3.bucket, key, srcPath }: FileUploadParams) {
   return await s3
     .upload({
       Bucket: bucketName,

src/aws/sqs.ts

@@ -2,11 +2,11 @@ import retry from 'async-retry';
 import AWS from 'aws-sdk';
 import _ from 'lodash';
 
-import { OUTPUT_QUEUE_URL, QUEUE_URL } from 'turtle/aws/utils';
 import config from 'turtle/config';
 import { JOB_UPDATE_TYPE } from 'turtle/constants/build';
 import logger from 'turtle/logger';
 import { getCurrentJobId } from 'turtle/turtleContext';
+import { QUEUE_URL, OUTPUT_QUEUE_URL } from 'turtle/aws/utils';
 
 const sqs = new AWS.SQS({
   apiVersion: '2012-11-05',
@@ -26,7 +26,7 @@ export async function receiveMessage(priority: string) {
     return sqs
       .receiveMessage(params)
       .promise()
-      .then((data) => {
+      .then(data => {
         if (data.Messages) {
           logger.info(`Received a message`);
           return data.Messages[0];
@@ -35,8 +35,8 @@ export async function receiveMessage(priority: string) {
           return null;
         }
       })
-      .catch((err) => {
-        logger.error({ err }, 'Receive error');
+      .catch(err => {
+        logger.error('Receive error', err);
         throw err;
       });
   });
@@ -62,13 +62,13 @@ export async function changeMessageVisibility(priority: string, receiptHandle: s
 }
 
 // Every VISIBILITY_TIMEOUT_SEC / 3 seconds we are telling AWS SQS
-// that we're still processing the message, so it does not
+// that we're still proccessing the message, so it does not
 // send the build job to another turtle agent
 export function changeMessageVisibilityRecurring(priority: string, receiptHandle: string, jobId: string) {
   return setInterval(() => {
     if (getCurrentJobId() === jobId) {
-      changeMessageVisibility(priority, receiptHandle).catch((err) => {
-        logger.warn({ err }, 'Error at change msg visibility');
+      changeMessageVisibility(priority, receiptHandle).catch(err => {
+        logger.warn('Error at change msg visibility', err);
       });
     }
   }, (VISIBILITY_TIMEOUT_SEC * 1000) / 3);
@@ -86,6 +86,6 @@ export async function sendMessage(jobId: string, status: JOB_UPDATE_TYPE, data =
       return await sqs.sendMessage(params).promise();
     });
   } catch (err) {
-    logger.error({ err }, `Error sending SQS message: ${JSON.stringify(params)}}`);
+    logger.error(`Error sending SQS message: ${JSON.stringify(params)}}`, err);
   }
 }

src/bin/commands/ErrorWithCommandHelp.ts

@@ -1,2 +0,0 @@
-export class ErrorWithCommandHelp extends Error {
-}

src/bin/commands/ErrorWithProgramHelp.ts

@@ -1,2 +0,0 @@
-export class ErrorWithProgramHelp extends Error {
-}

src/bin/commands/build/android.ts

@@ -1,11 +1,11 @@
-import fs from 'fs-extra';
 import _ from 'lodash';
+import fs from 'fs-extra';
 import uuid from 'uuid';
 
-import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
-import { createBuilderAction } from 'turtle/bin/utils/builder';
 import builder from 'turtle/builders/android';
+import { ErrorWithCommandHelp } from 'turtle/bin/commands/errors';
 import { PLATFORMS } from 'turtle/constants';
+import { createBuilderAction } from 'turtle/bin/utils/builder';
 
 export default (program: any, setCommonCommandOptions: any) => {
   const command = program.command('build:android [project-dir]');
@@ -14,12 +14,11 @@ export default (program: any, setCommonCommandOptions: any) => {
     .alias('ba')
     .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)',
+      'path to your Keystore (please provide Keystore password and Key password as EXPO_ANDROID_KEYSTORE_PASSWORD and EXPO_ANDROID_KEY_PASSWORD env variables)'
     )
     .option('--keystore-alias <alias>', 'keystore Alias')
     .description(
-      'Build a standalone APK for your project, signed and ready for submission to the Google Play Store.',
+      'Build a standalone APK for your project, signed and ready for submission to the Google Play Store.'
     )
     .asyncAction(
       createBuilderAction({
@@ -30,7 +29,7 @@ export default (program: any, setCommonCommandOptions: any) => {
         builder,
         platform: PLATFORMS.ANDROID,
         os: ['darwin', 'linux'],
-      }),
+      })
     );
 };
 
@@ -58,7 +57,7 @@ const prepareCredentials = async (cmd: any) => {
   if (!credentialsExist) {
     if (someCredentialsExist) {
       throw new ErrorWithCommandHelp(
-        'Please provide all required credentials - Keystore (with password), Keystore alias and Key password',
+        'Please provide all required credentials - Keystore (with password), Keystore alias and Key password'
       );
     } else {
       return null;

src/bin/commands/build/index.ts

@@ -1,5 +1,5 @@
-import { default as buildAndroid } from 'turtle/bin/commands/build/android';
 import { default as buildIOS } from 'turtle/bin/commands/build/ios';
+import { default as buildAndroid } from 'turtle/bin/commands/build/android';
 
 function createCommand(builder: any) {
   return (program: any) => {
@@ -15,16 +15,15 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps).',
+      'the URL of an externally hosted manifest (for self-hosted apps).'
     )
     .option(
       '--release-channel <channel-name>',
-      'pull from specified release channel (default: default)',
-    )
-    .option('-c --config <config-file>', 'specify a path to app.json');
+      'pull from specified release channel (default: default)'
+    );
 }
 
 export default {
   ios: createCommand(buildIOS),
   android: createCommand(buildAndroid),
-};
+}

src/bin/commands/build/ios.ts

@@ -1,11 +1,11 @@
-import fs from 'fs-extra';
 import _ from 'lodash';
 import uuid from 'uuid';
+import fs from 'fs-extra';
 
-import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
-import { createBuilderAction } from 'turtle/bin/utils/builder';
 import builder from 'turtle/builders/ios';
+import { ErrorWithCommandHelp } from 'turtle/bin/commands/errors';
 import { IOS, PLATFORMS } from 'turtle/constants';
+import { createBuilderAction } from 'turtle/bin/utils/builder';
 
 export default (program: any, setCommonCommandOptions: any) => {
   const command = program.command('build:ios [project-dir]');
@@ -16,16 +16,16 @@ export default (program: any, setCommonCommandOptions: any) => {
       '-t --type <build>',
       'type of build: archive|simulator',
       /^(archive|simulator)$/i,
-      'archive',
+      'archive'
     )
     .option('--team-id <apple-teamId>', 'Apple Team ID')
     .option(
       '--dist-p12-path <dist.p12>',
-      'path to your Distribution Certificate P12 (please provide password as EXPO_IOS_DIST_P12_PASSWORD env variable)',
+      'path to your Distribution Certificate P12 (please provide password as EXPO_IOS_DIST_P12_PASSWORD env variable)'
     )
     .option('--provisioning-profile-path <.mobileprovision>', 'path to your Provisioning Profile')
     .description(
-      'Build a standalone IPA for your project, signed and ready for submission to the Apple App Store.',
+      'Build a standalone IPA for your project, signed and ready for submission to the Apple App Store.'
     )
     .asyncAction(
       createBuilderAction({
@@ -36,7 +36,7 @@ export default (program: any, setCommonCommandOptions: any) => {
         builder,
         platform: PLATFORMS.IOS,
         os: 'darwin',
-      }),
+      })
     );
 };
 
@@ -68,8 +68,7 @@ const prepareCredentials = async (cmd: any) => {
 
   if (!credentialsExist) {
     throw new ErrorWithCommandHelp(
-      'Please provide all required credentials'
-      + '- Apple Team ID, Distribution Certificate P12 (with password) and Provisioning Profile',
+      'Please provide all required credentials - Apple Team ID, Distribution Certificate P12 (with password) and Provisioning Profile'
     );
   }
 

src/bin/commands/errors.ts

@@ -0,0 +1,2 @@
+export class ErrorWithProgramHelp extends Error {}
+export class ErrorWithCommandHelp extends Error {}

src/bin/commands/setup.ts

@@ -1,12 +1,11 @@
 import _ from 'lodash';
 
-import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
-import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
-import setup from 'turtle/bin/setup/setup';
-import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';
+import setup from 'turtle/bin/setup/setup';
+import { ErrorWithCommandHelp, ErrorWithProgramHelp } from 'turtle/bin/commands/errors';
+import { PLATFORMS } from 'turtle/constants';
 
-const l = logger.child({ buildPhase: 'setting up environment' });
+const l = logger.withFields({ buildPhase: 'setting up environment' });
 
 function createSetupCommand(platform: string, os?: string) {
   return (program: any) => {
@@ -17,7 +16,7 @@ function createSetupCommand(platform: string, os?: string) {
       .description(`Setup environment for building ${_.capitalize(platform)} standalone apps.`)
       .option(
         '--sdk-version <sdk-version>',
-        'version of Expo SDK shell app to download (optional)',
+        'version of Expo SDK shell app to download (optional)'
       )
       .asyncAction(async (cmd: any) => await setupAction(program, cmd, platform, os));
   };
@@ -31,9 +30,10 @@ async function setupAction(program: any, cmd: any, platform: string, os?: string
 
     const { sdkVersion } = cmd;
     await setup(platform, sdkVersion);
-    l.info('it\'s all set!');
+    l.info('it\'s all set!')
   } catch (err) {
-    logger.error({ err }, `Failed to setup environment for ${platform} builds`);
+    logger.error(`Failed to setup environment for ${platform} builds`);
+    logger.error(err.stack);
     if (err instanceof ErrorWithCommandHelp) {
       cmd.help();
     } else if (err instanceof ErrorWithProgramHelp) {

src/bin/env.ts

@@ -1,5 +1,5 @@
-import os from 'os';
 import path from 'path';
+import os from 'os';
 
 import _ from 'lodash';
 
@@ -16,8 +16,8 @@ const resolveEnv = () => {
 };
 
 const currentEnv = resolveEnv();
-const isLocal = (envName: string) => envName === 'local';
-const isStaging = (envName: string) => envName === 'staging';
+const isLocal = (env: string) => env === 'local';
+const isStaging = (env: string) => env === 'staging';
 
 const apiConfig = {
   protocol: 'https',

src/bin/index.ts

@@ -1,13 +1,11 @@
-import path from 'path';
-
-import program, { Command } from 'commander';
-import fs from 'fs-extra';
 import { LoggerDetach, ModuleVersion } from 'xdl';
+import program, { Command } from 'commander';
+import _ from 'lodash';
 
-import * as commands from 'turtle/bin/commands';
 import logger from 'turtle/logger';
+import * as commands from 'turtle/bin/commands';
 
-const { name, version } = JSON.parse(fs.readFileSync(path.join(__dirname, '../../package.json'), 'utf-8'));
+const { name, version } = require('../../package.json');
 
 const ModuleVersionChecker = ModuleVersion.createModuleVersionChecker(name, version);
 
@@ -17,38 +15,36 @@ Command.prototype.asyncAction = function asyncAction(asyncFn: (...asyncFnArgs: a
   return this.action(async (...args) => {
     try {
       await checkForUpdateAsync();
-    } catch (err) {
-      logger.warn({ err }, 'Failed to check for turtle-cli update.');
-    }
+    } catch (e) {}
     return await asyncFn(...args);
   });
-};
+}
 
 export function run(programName: string) {
-  runAsync(programName).catch((err) => {
-    logger.error({ err }, 'Uncaught Error');
+  runAsync(programName).catch(e => {
+    logger.error('Uncaught Error', e);
     process.exit(1);
   });
 }
 
 async function runAsync(programName: string) {
   program.version(version);
-  Object.values(commands).forEach((command) => registerCommand(program, command));
+  Object.values(commands).forEach(command => registerCommand(program, command));
   program.parse(process.argv);
 
   const subCommand = process.argv[2];
   if (subCommand) {
-    const commandNames = program.commands.reduce((acc: string[], command: any) => {
-      acc.push(command._name);
-      const alias = command._alias;
+    const commands = program.commands.reduce((acc: Array<string>, command: any) => {
+      acc.push(command['_name']);
+      const alias = command['_alias'];
       if (alias) {
         acc.push(alias);
       }
       return acc;
     }, []);
-    if (!commandNames.includes(subCommand)) {
+    if (!_.includes(commands, subCommand)) {
       logger.error(
-        `"${subCommand}" is not an ${programName} command. See "${programName} --help" for the full list of commands.`,
+        `"${subCommand}" is not an ${programName} command. See "${programName} --help" for the full list of commands.`
       );
     }
   } else {
@@ -64,7 +60,7 @@ async function checkForUpdateAsync() {
     logger.warn(
       `There is a new version of ${name} available (${latest}).
 You are currently using ${name} ${current}
-Run \`npm install -g ${name}\` to get the latest version`,
+Run \`npm install -g ${name}\` to get the latest version`
     );
   }
 }

src/bin/setup/android/index.ts

@@ -2,20 +2,20 @@ import path from 'path';
 import util from 'util';
 
 import fs from 'fs-extra';
-import _which from 'which';
 import { ExponentTools } from 'xdl';
+import _which from 'which';
 
-import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
-import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
-import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
-import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
-import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
-import config from 'turtle/config';
-import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';
+import config from 'turtle/config';
+import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
+import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
+import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
+import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
+import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
+import { PLATFORMS } from 'turtle/constants';
 
 const which = util.promisify(_which);
-const REQUIRED_TOOLS: IToolDefinition[] = [
+const REQUIRED_TOOLS: Array<IToolDefinition> = [
   {
     command: 'bash',
     missingDescription: 'Please install bash',
@@ -31,17 +31,17 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
         'javac',
         ['-version'],
-        { stdio: 'pipe' },
+        { stdio: 'pipe' }
       );
       if (stdout.match(/no java runtime present/i)) {
         return false;
       }
       return status === 0;
-    },
+    }
   },
 ];
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);
 
 export default async function setup(sdkVersion?: string) {
   await checkSystem(REQUIRED_TOOLS);
@@ -50,7 +50,7 @@ export default async function setup(sdkVersion?: string) {
     await ensureShellAppIsPresent(
       sdkVersion,
       { formatShellAppDirectory, formatShellAppTarballUriPath },
-      _shellAppPostDownloadAction,
+      _shellAppPostDownloadAction
     );
   }
 }
@@ -107,7 +107,7 @@ function _setEnvVars(envVars: object) {
     .forEach(([key, value]) => process.env[key] = value);
 }
 
-function _alterPath(newPaths: string[]) {
+function _alterPath(newPaths: Array<string>) {
   const currentPaths = process.env.PATH ? process.env.PATH.split(':') : [];
   const paths = [...newPaths, ...currentPaths];
   process.env.PATH = paths.join(':');

src/bin/setup/android/ndk.ts

@@ -4,15 +4,15 @@ import path from 'path';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-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';
+import download from 'turtle/bin/setup/utils/downloader';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 
 const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;
 
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);
 
 export default async function ensureAndroidNDKIsPresent() {
   const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
@@ -24,7 +24,7 @@ export default async function ensureAndroidNDKIsPresent() {
       l.info('Downloading Android NDK');
       await fs.ensureDir(config.directories.artifactsDir);
       await download(ANDROID_NDK_URL, androidNdkDownloadPath);
-      l.info('Decompressing Android NDK');
+      l.info('Decompressing Android NDK')
       await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
       l.info('Android NDK installed successfully');
     } catch (err) {
@@ -47,5 +47,5 @@ function _createEnvVars(androidNdkDir: string) {
 }
 
 function _createPaths(androidNdkDir: string) {
-  return [androidNdkDir];
+  return [androidNdkDir]
 }

src/bin/setup/android/sdk.ts

@@ -5,15 +5,15 @@ import decompress from 'decompress';
 import fs from 'fs-extra';
 import { ExponentTools } from 'xdl';
 
-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';
+import download from 'turtle/bin/setup/utils/downloader';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 
-const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';
+const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip';
 
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
+const l = logger.withFields(LOGGER_FIELDS);
 
 export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
@@ -26,7 +26,7 @@ export default async function ensureAndroidSDKIsPresent() {
       await fs.ensureDir(config.directories.artifactsDir);
       await download(ANDROID_SDK_URL, androidSdkDownloadPath);
       await fs.ensureDir(androidSdkDir);
-      l.info('Decompressing Android SDK');
+      l.info('Decompressing Android SDK')
       await decompress(androidSdkDownloadPath, androidSdkDir);
       await fs.remove(androidSdkDownloadPath);
       l.info('Configuring Android SDK, this may take a while');
@@ -73,6 +73,6 @@ function _createPaths(androidSdkDir: string) {
     path.join(androidSdkDir, 'platform-tools'),
     path.join(androidSdkDir, 'tools'),
     path.join(androidSdkDir, 'tools/bin'),
-    path.join(androidSdkDir, 'build-tools/28.0.3'),
+    path.join(androidSdkDir, 'build-tools/25.0.0'),
   ];
 }

src/bin/setup/ios.ts

@@ -1,17 +1,14 @@
-import last from 'lodash/last';
-import trim from 'lodash/trim';
 import path from 'path';
-import semver from 'semver';
 
 import { ExponentTools } from 'xdl';
 
+import config from 'turtle/config';
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
 import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
-import config from 'turtle/config';
 import { PLATFORMS } from 'turtle/constants';
 
-const REQUIRED_TOOLS: IToolDefinition[] = [
+const REQUIRED_TOOLS: Array<IToolDefinition> = [
   {
     command: 'bash',
     missingDescription: 'Please install bash',
@@ -19,21 +16,6 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'fastlane',
     missingDescription: 'Please check https://docs.fastlane.tools/getting-started/ios/setup/',
-    versionCheckFn: async () => {
-      const MINIMAL_VERSION = '2.99.0';
-
-      const { stdout } = await ExponentTools.spawnAsyncThrowError(
-        'fastlane',
-        ['--version'],
-        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1', LC_ALL: 'en_US.UTF-8' } },
-      );
-      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}.`,
-        );
-      }
-    },
   },
   {
     command: 'xcode',
@@ -42,13 +24,13 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
         'xcodebuild',
         ['-version'],
-        { stdio: 'pipe' },
+        { stdio: 'pipe' }
       );
       if (stdout.match(/requires xcode/i)) {
         return false;
       }
       return status === 0;
-    },
+    }
   },
 ];
 
@@ -65,11 +47,3 @@ export default async function setup(sdkVersion?: string) {
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.IOS, `sdk${sdkMajorVersion}`);
 }
-
-function parseFastlaneVersion(stdout: string) {
-  const lastLine = last(trim(stdout).split('\n'));
-  if (!lastLine) {
-    return null;
-  }
-  return last(lastLine.split(' ')) || null;
-}

src/bin/setup/setup.ts

@@ -1,7 +1,7 @@
 import isSemver from 'is-semver';
 
-import setupAndroid from 'turtle/bin/setup/android';
 import setupIos from 'turtle/bin/setup/ios';
+import setupAndroid from 'turtle/bin/setup/android';
 import { PLATFORMS } from 'turtle/constants';
 
 export default async function setup(platform: string, sdkVersion?: string) {

src/bin/setup/utils/common.ts

@@ -1,34 +1,30 @@
 import path from 'path';
 
+import { ExponentTools } from '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';
-import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
+import { IToolDefinition, ensureToolsAreInstalled } from 'turtle/bin/setup/utils/toolsDetector';
 
-const l = logger.child({ buildPhase: 'setting up environment' });
+import download from 'turtle/bin/setup/utils/downloader';
+
+const l = logger.withFields({ buildPhase: 'setting up environment' });
 
 interface IShellAppFormaters {
-  formatShellAppDirectory: (config: IShellAppDirectoryConfig) => string;
+  formatShellAppDirectory: (sdkVersion: string) => string;
   formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }
 
 type PostDownloadAction = (workingdir: string) => void;
 
-export async function checkSystem(requiredTools: IToolDefinition[]) {
+export async function checkSystem(requiredTools: Array<IToolDefinition>) {
   await ensureToolsAreInstalled(requiredTools);
 }
 
-export async function ensureShellAppIsPresent(
-  sdkVersion: string,
-  formatters: IShellAppFormaters,
-  postDownloadAction?: PostDownloadAction,
-) {
-  const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
+export async function ensureShellAppIsPresent(sdkVersion: string, formatters: IShellAppFormaters, postDownloadAction?: PostDownloadAction) {
+  const workingdir = formatters.formatShellAppDirectory(sdkVersion);
   if (await fs.pathExists(workingdir)) {
     return;
   }
@@ -49,11 +45,12 @@ async function _downloadShellApp(sdkVersion: string, targetDirectory: string, fo
   l.info('extracting shell app (this may take a while)...');
   await tar.x({
     file: tarballDownloadTargetPath,
-    C: targetDirectory,
+    C: targetDirectory
   });
   l.info('shell app extracted');
 }
 
+
 export function formatArtifactDownloadPath(uri: string) {
   const { base } = path.parse(uri);
   return path.join(config.directories.artifactsDir, base);

src/bin/setup/utils/downloader.ts

@@ -1,9 +1,9 @@
-import fs from 'fs';
 import { URL } from 'url';
+import fs from 'fs';
 
-import ProgressBar from 'progress';
 import request from 'request';
 import requestProgress from 'request-progress';
+import ProgressBar from 'progress';
 
 const S3_PROTOCOL = 's3:';
 const PROGRESS_BAR_CONFIG = {
@@ -38,6 +38,7 @@ export default async function download(url: string, destPath: string) {
   });
 }
 
+
 function convertS3ToHttpsUrl(s3UrlRaw: string) {
   const { host: s3Bucket, pathname: s3Path, protocol } = new URL(s3UrlRaw);
   if (protocol !== S3_PROTOCOL) {

src/bin/setup/utils/toolsDetector.ts

@@ -4,18 +4,17 @@ import _which from 'which';
 import logger from 'turtle/logger';
 
 const which = util.promisify(_which);
-const l = logger.child({ buildPhase: 'setting up environment' });
+const l = logger.withFields({ buildPhase: 'setting up environment' });
 
 export interface IToolDefinition {
   command: string;
   missingDescription: string;
   testFn?: () => Promise<boolean>;
-  versionCheckFn?: () => void;
 }
 
-export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
+export async function ensureToolsAreInstalled(tools: Array<IToolDefinition>) {
   let isAnyToolMissing = false;
-  for (const { command, missingDescription, testFn, versionCheckFn } of tools) {
+  for (const { command, missingDescription, testFn } of tools) {
     try {
       if (testFn) {
         if (!await testFn()) {
@@ -27,17 +26,9 @@ export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
     } catch (err) {
       isAnyToolMissing = true;
       if (!testFn) {
-        l.error({ err }, `${command} is missing in your $PATH`);
-      }
-      l.error({ err }, missingDescription);
-    }
-    if (versionCheckFn) {
-      try {
-        await versionCheckFn();
-      } catch (err) {
-        isAnyToolMissing = true;
-        l.error({ err }, `wrong version of ${command} installed`);
+        l.error(`${command} is missing in your $PATH`);
       }
+      l.error(missingDescription);
     }
   }
   if (isAnyToolMissing) {

src/bin/utils/builder.ts

@@ -1,12 +1,11 @@
 import _ from 'lodash';
 
-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 logger from 'turtle/logger';
 import { sanitizeJob } from 'turtle/validator';
+import * as UserUtils from 'turtle/bin/utils/user';
+import * as ProjectUtils from 'turtle/bin/utils/project';
+import { ErrorWithCommandHelp, ErrorWithProgramHelp } from 'turtle/bin/commands/errors';
+import setup from 'turtle/bin/setup/setup';
 
 export function createBuilderAction({
   program,
@@ -30,9 +29,7 @@ export function createBuilderAction({
       }
 
       if (cmd.buildDir && cmd.output) {
-        throw new ErrorWithCommandHelp(
-          'You can\'t provide both --build-dir and --output parameters, please choose one',
-        );
+        throw new ErrorWithCommandHelp('You can\'t provide both --build-dir and --output parameters, please choose one');
       }
 
       const userData = {
@@ -47,11 +44,10 @@ export function createBuilderAction({
           throw new ErrorWithCommandHelp('You must provide both Expo username and password');
         }
       } else if (!cmd.publicUrl) {
-        throw new ErrorWithCommandHelp(
-          'You must provide your Expo username and password unless you specify --public-url to your project manifest.',
-        );
+        throw new ErrorWithCommandHelp('You must provide your Expo username and password unless you specify --public-url to your project manifest.');
       }
 
+
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,
@@ -60,7 +56,7 @@ export function createBuilderAction({
         publicUrl: cmd.publicUrl,
       };
 
-      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
+      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg);
       const sdkVersion = _.get(appJSON, 'expo.sdkVersion');
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
@@ -72,7 +68,8 @@ export function createBuilderAction({
       const job = await sanitizeJob(rawJob);
       await builder(job);
     } catch (err) {
-      logger.error({ err }, 'Failed to build standalone app');
+      logger.error(`Failed to build standalone app: ${err.message}`);
+      logger.error(err.stack);
       if (err instanceof ErrorWithCommandHelp) {
         command.help();
       } else if (err instanceof ErrorWithProgramHelp) {

src/bin/utils/project.ts

@@ -1,17 +1,12 @@
-import fs from 'fs-extra';
 import path from 'path';
+import fs from 'fs-extra';
 
-export async function loadAppJSON(projectDirArg: string, config: string | null) {
-  let appJSONPath;
-  if (config) {
-    appJSONPath = resolveAbsoluteDir(config);
-  } else {
-    const projectDir = resolveAbsoluteDir(projectDirArg);
-    appJSONPath = path.join(projectDir, 'app.json');
-  }
+export async function loadAppJSON(projectDirArg: string) {
+  const projectDir = resolveAbsoluteDir(projectDirArg);
+  const appJSONPath = path.join(projectDir, 'app.json');
   const appJSONExists = await fs.pathExists(appJSONPath);
   if (!appJSONExists) {
-    throw new Error(`Couldn't find app.json.`);
+    throw new Error(`Couldn't find app.json in ${projectDir} directory.`);
   } else {
     return require(appJSONPath);
   }

src/bin/utils/user.ts

@@ -1,6 +1,6 @@
 import { User as UserManager } from 'xdl';
 
-import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
+import { ErrorWithProgramHelp } from 'turtle/bin/commands/errors';
 
 interface IUserData {
   username?: string;

src/builders/BuildError.ts

@@ -1,17 +0,0 @@
-class BuildError extends Error {
-  public reason: BuildErrorReason;
-
-  constructor(reason: BuildErrorReason, message: string) {
-    super(message);
-    this.name = 'BuildError';
-    this.reason = reason;
-  }
-}
-
-enum BuildErrorReason {
-  SESSION_EXPIRED = 'session-expired',
-  PROVISIONING_PROFILE_MISSING = 'provisioning-profile-missing',
-}
-
-export default BuildError;
-export { BuildErrorReason };

src/builders/android.ts

@@ -2,23 +2,19 @@ import path from 'path';
 
 import fs from 'fs-extra';
 import _ from 'lodash';
-import semver from 'semver';
-import uuidv4 from 'uuid/v4';
 import { AndroidShellApp, ImageUtils } from 'xdl';
+import uuidv4 from 'uuid/v4';
 
 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';
-import { IAndroidCredentials, IJob, IJobResult } from 'turtle/job';
 import logger from 'turtle/logger';
+import { IAndroidCredentials, IJob, IJobResult } from 'turtle/job';
+import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 
 export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
-  await ensureCanBuildSdkVersion(jobData);
   const credentials = await getOrCreateCredentials(jobData);
   const apkFilePath = await runShellAppBuilder(jobData, credentials);
   const randomHex = uuidv4().replace(/-/g, '');
@@ -29,10 +25,7 @@ export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
     uploadPath: apkFilePath,
     s3FileKey,
     ...config.builder.fakeUpload && {
-      fakeUploadBuildPath:
-        jobData.fakeUploadBuildPath
-        ? jobData.fakeUploadBuildPath
-        : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename),
+      fakeUploadBuildPath: jobData.fakeUploadBuildPath ? jobData.fakeUploadBuildPath : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename)
     },
   });
 
@@ -64,29 +57,22 @@ async function runShellAppBuilder(
 
   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, manifest.dependencies)
-    : null;
+  const { manifest: { sdkVersion: sdkVersionFromManifest = null } = {}, sdkVersion: sdkVersionFromJob } = jobData;
+  const sdkVersion = sdkVersionFromJob || sdkVersionFromManifest;
+  const workingDir = formatShellAppDirectory(sdkVersion);
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
       url: commonUtils.getExperienceUrl(jobData),
-      sdkVersion,
+      sdkVersion: _.get(jobData, 'manifest.sdkVersion') || jobData.sdkVersion,
       keystore: tempKeystorePath,
-      manifest,
       alias: credentials.keystoreAlias,
       keystorePassword: credentials.keystorePassword,
       keyPassword: credentials.keyPassword,
       privateConfigFile: tempShellAppConfigPath,
-      releaseChannel: jobConfig.releaseChannel,
+      releaseChannel: jobData.config.releaseChannel,
       workingDir,
       outputFile: outputFilePath,
-      modules: enabledModules,
     });
   } catch (err) {
     commonUtils.logErrorOnce(err);

src/builders/index.ts

@@ -1,5 +1,5 @@
-import buildAndroid from './android';
 import buildIOS from './ios';
+import buildAndroid from './android';
 
 export default {
   ios: buildIOS,

src/builders/ios/archive.ts

@@ -1,13 +1,13 @@
 import _ from 'lodash';
 import { IosIPABuilder as createIPABuilder } from 'xdl';
 
-import { IContext } from 'turtle/builders/ios/context';
+import runShellAppBuilder from 'turtle/builders/utils/ios/shellAppBuilder';
 import { logErrorOnce } from 'turtle/builders/utils/common';
 import * as fileUtils from 'turtle/builders/utils/file';
 import * as keychain from 'turtle/builders/utils/ios/keychain';
-import runShellAppBuilder from 'turtle/builders/utils/ios/shellAppBuilder';
-import { IJob } from 'turtle/job';
 import logger from 'turtle/logger/index';
+import { IContext } from 'turtle/builders/ios/context';
+import { IJob } from 'turtle/job';
 
 export default async function buildArchive(ctx: IContext, job: IJob) {
   let keychainInfo;
@@ -29,16 +29,16 @@ export default async function buildArchive(ctx: IContext, job: IJob) {
 }
 
 async function buildAndSignIPA(ctx: IContext, job: IJob, keychainPath: string, manifest: any) {
-  const l = logger.child({ buildPhase: 'building and signing IPA' });
+  const l = logger.withFields({ buildPhase: 'building and signing IPA' });
   l.info('building and signing IPA');
 
   const {
-    credentials: { provisioningProfile, certPassword, teamId },
-    config: { bundleIdentifier: bundleIdentifierFromConfig },
+    credentials: { provisioningProfile, certPassword, teamId, password },
+    config: { bundleIdentifier: _bundleIdentifierFromConfig },
   } = job;
 
-  const bundleIdentifierFromManifest = _.get(manifest, 'ios.bundleIdentifier');
-  const bundleIdentifier = bundleIdentifierFromConfig || bundleIdentifierFromManifest;
+  const _bundleIdentifierFromManifest = _.get(manifest, 'ios.bundleIdentifier');
+  const bundleIdentifier = _bundleIdentifierFromConfig || _bundleIdentifierFromManifest;
 
   const { provisioningProfilePath } = ctx;
   await fileUtils.writeBase64ToBinaryFile(provisioningProfilePath, provisioningProfile as string);
@@ -51,8 +51,9 @@ async function buildAndSignIPA(ctx: IContext, job: IJob, keychainPath: string, m
     certPath: ctx.tempCertPath,
     certPassword,
     teamID: teamId,
+    password,
     bundleIdentifier,
-    workspacePath: ctx.workspacePath,
+    workingDir: ctx.workingDir,
     manifest,
   });
   await ipaBuilder.build();

src/builders/ios/context.ts

@@ -3,10 +3,10 @@ import * as path from 'path';
 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, PLATFORMS } from 'turtle/constants/index';
 import { IJob } from 'turtle/job';
+import { formatShellAppDirectory } from 'turtle/builders/utils/ios/workingdir';
 
 export interface IContext {
   appDir: string;
@@ -22,26 +22,18 @@ export interface IContext {
   tempCertPath: string;
   uploadPath: string;
   workingDir: string;
-  workspacePath: string;
-  applicationFilesSrc: string;
 }
 
-const { EXPOKIT_APP, EXPONENT_APP } = IosShellApp;
+const { DEFAULT_EXPOKIT_WORKSPACE_NAME } = IosShellApp;
 const { BUILD_TYPES } = IOS;
 
 export function createBuilderContext(job: IJob): IContext {
   const { join } = path;
   const appUUID = uuidv4();
-  const {
-    manifest: {
-      sdkVersion: sdkVersionFromManifest = null,
-    } = {},
-    sdkVersion: sdkVersionFromJob,
-    config: { buildType },
-  } = job;
+  const { manifest: { sdkVersion: _sdkVersionFromManifest = null } = {}, sdkVersion: _sdkVersionFromJob, config: { buildType } } = job;
 
-  const sdkVersion = sdkVersionFromJob || sdkVersionFromManifest;
-  const workingDir = formatShellAppDirectory({ sdkVersion, buildType: buildType! });
+  const sdkVersion = _sdkVersionFromJob || _sdkVersionFromManifest;
+  const workingDir = formatShellAppDirectory(sdkVersion);
 
   const context: any = {
     appDir: join(config.directories.temporaryFilesRoot, appUUID),
@@ -52,68 +44,29 @@ export function createBuilderContext(job: IJob): IContext {
   context.provisioningProfileDir = join(context.appDir, 'provisioning');
   context.provisioningProfilePath = join(
     context.provisioningProfileDir,
-    `${appUUID}.mobileprovision`,
+    `${appUUID}.mobileprovision`
   );
   context.tempCertPath = join(context.appDir, 'cert.p12');
   context.baseArchiveDir = join(context.appDir, 'archive');
 
-  if (buildType === BUILD_TYPES.CLIENT) {
-    context.applicationFilesSrc = join(
-      workingDir,
-      'expo-client-build',
-      '**',
-      '*',
-    );
-  } else {
-    context.applicationFilesSrc = join(
-      workingDir,
-      'shellAppBase-builds',
-      buildType as string,
-      '**',
-      '*',
-    );
-  }
-
-  if (buildType === BUILD_TYPES.ARCHIVE) {
-    context.outputPath = join(context.appDir, 'archive.xcarchive');
-    context.uploadPath = join(context.buildDir, 'archive.ipa');
-    context.archiveDir = join(
-      context.baseArchiveDir,
-      'Release',
-      `${EXPOKIT_APP}.xcarchive`,
-      'Products',
-      'Applications',
-      `${EXPOKIT_APP}.app`,
-    );
-    context.workspacePath = path.join(
-      workingDir,
-      'shellAppWorkspaces',
-      'ios',
-      'default',
-      `${EXPOKIT_APP}.xcworkspace`,
-    );
-  } else if (buildType === BUILD_TYPES.CLIENT) {
-    context.outputPath = join(context.appDir, 'archive.xcarchive');
-    context.uploadPath = join(context.buildDir, 'archive.ipa');
-    context.archiveDir = join(
-      context.baseArchiveDir,
-      `${EXPONENT_APP}.xcarchive`,
-      'Products',
-      'Applications',
-      `${EXPONENT_APP}.app`,
-    );
-    context.workspacePath = path.join(
-      workingDir,
-      'ios',
-      `${EXPONENT_APP}.xcworkspace`,
-    );
-  } else if (buildType === BUILD_TYPES.SIMULATOR) {
+  if (buildType === BUILD_TYPES.SIMULATOR) {
     context.outputPath = join(context.appDir, 'archive.tar.gz');
     context.uploadPath = join(context.appDir, 'archive.tar.gz');
     context.archiveDir = join(
       context.baseArchiveDir,
       'Release',
-      `${EXPOKIT_APP}.app`,
+      `${DEFAULT_EXPOKIT_WORKSPACE_NAME}.app`
+    );
+  } else if (buildType === BUILD_TYPES.ARCHIVE) {
+    context.outputPath = join(context.appDir, 'archive.xcarchive');
+    context.uploadPath = join(context.buildDir, 'archive.ipa');
+    context.archiveDir = join(
+      context.baseArchiveDir,
+      'Release',
+      `${DEFAULT_EXPOKIT_WORKSPACE_NAME}.xcarchive`,
+      'Products',
+      'Applications',
+      `${DEFAULT_EXPOKIT_WORKSPACE_NAME}.app`
     );
   }
 
@@ -121,9 +74,7 @@ export function createBuilderContext(job: IJob): IContext {
   const s3Filename = `${job.experienceName}-${appUUID}-${buildType}.${s3FileExtension}`;
   if (config.builder.fakeUpload) {
     const fakeUploadFilename = s3Filename.replace('/', '\\');
-    context.fakeUploadBuildPath = job.fakeUploadBuildPath
-      ? job.fakeUploadBuildPath
-      : join(job.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename);
+    context.fakeUploadBuildPath = job.fakeUploadBuildPath ? job.fakeUploadBuildPath : join(job.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename);
   } else {
     context.s3FileKey = join(PLATFORMS.IOS, s3Filename);
   }

src/builders/ios/index.ts

@@ -1,23 +1,24 @@
+import path from 'path';
+
 import fs from 'fs-extra';
 import pick from 'lodash/pick';
+import { ExponentTools } from 'xdl';
 
 import buildArchive from 'turtle/builders/ios/archive';
 import { createBuilderContext, IContext } from 'turtle/builders/ios/context';
 import buildSimulator from 'turtle/builders/ios/simulator';
 import { logErrorOnce } from 'turtle/builders/utils/common';
-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 } from 'turtle/constants/index';
+import { IOS, PLATFORMS } from 'turtle/constants/index';
 import { IJob, IJobResult } from 'turtle/job';
 
 const { BUILD_TYPES } = IOS;
 
+let SUPPORTED_SDK_VERSIONS: Array<number>;
+
 export default async function iosBuilder(job: IJob): Promise<IJobResult> {
-  if (job.config.buildType !== BUILD_TYPES.CLIENT) {
-    await ensureCanBuildSdkVersion(job);
-  }
+  await ensureCanBuildSdkVersion(job);
 
   const ctx = createBuilderContext(job);
 
@@ -25,15 +26,10 @@ export default async function iosBuilder(job: IJob): Promise<IJobResult> {
     await initBuilder(ctx);
 
     const { buildType } = job.config;
-
-    if (buildType === BUILD_TYPES.CLIENT) {
-      await prepareAdHocBuildCredentials(job);
-    }
-
-    if ([BUILD_TYPES.ARCHIVE, BUILD_TYPES.CLIENT].includes(buildType!)) {
-      await buildArchive(ctx, job);
-    } else if (buildType === BUILD_TYPES.SIMULATOR) {
+    if (buildType === BUILD_TYPES.SIMULATOR) {
       await buildSimulator(ctx, job);
+    } else if (buildType === BUILD_TYPES.ARCHIVE) {
+      await buildArchive(ctx, job);
     } else {
       throw new Error(`Unsupported iOS build type: ${buildType}`);
     }
@@ -64,3 +60,25 @@ async function cleanup(ctx: IContext) {
 
 const getTemporaryDirs = (ctx: IContext) =>
   Object.values(pick(ctx, ['appDir', 'provisioningProfileDir']));
+
+async function ensureCanBuildSdkVersion(job: IJob) {
+  if (config.builder.useLocalWorkingDir) {
+    return;
+  }
+
+  if (!SUPPORTED_SDK_VERSIONS) {
+    SUPPORTED_SDK_VERSIONS = await findSupportedSdkVersions();
+  }
+
+  const targetMajorSdkVersion = ExponentTools.parseSdkMajorVersion(job.sdkVersion || job.manifest.sdkVersion);
+  if (!SUPPORTED_SDK_VERSIONS.includes(targetMajorSdkVersion)) {
+    throw new Error(`Unsupported SDK Version!`);
+  }
+}
+
+async function findSupportedSdkVersions(): Promise<Array<number>> {
+  const SDK_DIR_PREFIX = 'sdk';
+  const files = await fs.readdir(path.join(config.directories.workingDir, PLATFORMS.IOS));
+  const sdks = files.filter(file => file.startsWith(SDK_DIR_PREFIX));
+  return sdks.map(sdk => parseInt(sdk.substr(SDK_DIR_PREFIX.length)));
+}

src/builders/ios/simulator.ts

@@ -1,10 +1,10 @@
-import { IContext } from 'turtle/builders/ios/context';
 import runShellAppBuilder from 'turtle/builders/utils/ios/shellAppBuilder';
-import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
+import { IContext } from 'turtle/builders/ios/context';
+import { IJob } from 'turtle/job';
 
 export default async function buildSimulator(ctx: IContext, job: IJob) {
-  const l = logger.child({ buildPhase: 'running simulator builder' });
+  const l = logger.withFields({ buildPhase: 'running simulator builder' });
   l.info('running simulator build');
   await runShellAppBuilder(ctx, job);
   l.info('build complete');

src/builders/utils/android/credentials.ts

@@ -1,18 +1,18 @@
 import path from 'path';
 
-import fs from 'fs-extra';
 import uuidv4 from 'uuid/v4';
-import { Credentials } from 'xdl';
+import fs from 'fs-extra';
+import { AndroidKeystore } from 'xdl';
 
 import * as sqs from 'turtle/aws/sqs';
 import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
-import { IAndroidCredentials, IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 import { isOffline } from 'turtle/turtleContext';
+import { IAndroidCredentials, IJob } from 'turtle/job';
 
 async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredentials> {
   if (!jobData.credentials) {
-    const l = logger.child({ buildPhase: 'generating keystore' });
+    const l = logger.withFields({ buildPhase: 'generating keystore' });
     const credentials: any = {};
     l.info('Creating keystore');
     const keystoreFilename = `/tmp/keystore-${jobData.id}.tmp.jks`;
@@ -21,15 +21,13 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
     credentials.keystoreAlias = Buffer.from(jobData.experienceName).toString('base64');
     const androidPackage = jobData.manifest.android.package;
 
-    await Credentials.Android.createKeystore(
-      {
-        keystorePath: keystoreFilename,
-        keystorePassword: credentials.keystorePassword,
-        keyPassword: credentials.keyPassword,
-        keyAlias: credentials.keystoreAlias,
-      },
+    await AndroidKeystore.createKeystore({
+      keystorePassword: credentials.keystorePassword,
+      keyPassword: credentials.keyPassword,
+      keystoreFilename,
+      keystoreAlias: credentials.keystoreAlias,
       androidPackage,
-    );
+    });
 
     credentials.keystore = (await fs.readFile(keystoreFilename)).toString('base64');
     l.info('Keystore created successfully');
@@ -44,6 +42,7 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
     } else {
       await sqs.sendMessage(jobData.id, UPDATE_CREDENTIALS, {
         ...credentials,
+        turtleVersion: jobData.config.turtleVersion,
       });
       l.info('Keystore sent to storage successfully');
     }

src/builders/utils/android/workingdir.ts

@@ -1,12 +1,9 @@
 import path from 'path';
-
-import { ExponentTools } from 'xdl';
-
-import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
+import { ExponentTools } from 'xdl';
 import { PLATFORMS } from 'turtle/constants';
 
-export function formatShellAppDirectory({ sdkVersion }: IShellAppDirectoryConfig) {
+export function formatShellAppDirectory(sdkVersion: string) {
   const majorSdkVersion = ExponentTools.parseSdkMajorVersion(sdkVersion);
   return config.builder.useLocalWorkingDir
     ? path.join(config.directories.workingDir, 'local')

src/builders/utils/common.ts

@@ -1,8 +1,8 @@
 import * as url from 'url';
 
 import config from 'turtle/config';
-import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
+import { IJob } from 'turtle/job';
 
 export function getExperienceUrl(job: IJob) {
   const { experienceName, config: jobConfig } = job;

src/builders/utils/image.ts

@@ -18,15 +18,15 @@ export async function resizeIconWithSharpAsync(iconSizePx: number, iconFilename:
   await fs.writeFile(filename, buffer);
 }
 
-export async function getImageDimensionsWithSharpAsync(dirname: string, filename: string) {
-  const filepath = path.join(dirname, filename);
+export async function getImageDimensionsWithSharpAsync(basename: string, dirname: string) {
+  const filename = path.join(dirname, basename);
 
   // PLEASE DON'T REMOVE THE FOLLOWING LINE (sharp caches files taking path as the cache key)
   sharp.cache(false);
 
   try {
-    const { width, height } = await sharp(filepath).metadata();
-    return { width, height };
+    const meta = await sharp(filename).metadata();
+    return [meta.width, meta.height];
   } catch (e) {
     return null;
   }

src/builders/utils/ios/adhocBuild.ts

@@ -1,99 +0,0 @@
-import path from 'path';
-
-import spawnAsync from '@expo/spawn-async';
-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';
-import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
-import { IJob } from 'turtle/job';
-import logger from 'turtle/logger';
-import { isOffline } from 'turtle/turtleContext';
-
-// tslint:disable-next-line:no-var-requires
-const travelingFastlane = process.platform === 'darwin' ? require('@expo/traveling-fastlane-darwin')() : null;
-
-async function prepareAdHocBuildCredentials(job: IJob) {
-  if (process.platform !== 'darwin') {
-    throw new Error('This function should be called only on macOS!');
-  }
-
-  const { bundleIdentifier } = job.config;
-  const { certP12, certPassword, teamId, appleSession, udids } = job.credentials;
-
-  const certSerialNumber = IosCodeSigning.findP12CertSerialNumber(certP12, certPassword);
-  const args = [
-    teamId,
-    udids!.join(','),
-    bundleIdentifier,
-    certSerialNumber || '__last__',
-  ];
-
-  try {
-    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 (isOffline()) {
-      const provisioningProfilePath = path.join(job.projectDir, `adhoc.mobileprovision`);
-      await fs.writeFile(provisioningProfilePath, Buffer.from(credentials.provisioningProfile, 'base64'));
-      logger.info(`Saved provisioning profile to ${provisioningProfilePath}`);
-    } else {
-      await sqs.sendMessage(job.id, UPDATE_CREDENTIALS, {
-        provisioningProfileId: credentials.provisioningProfileId,
-        provisioningProfile: credentials.provisioningProfile,
-      });
-      logger.info('Ad Hoc provisioning profile sent to storage successfully');
-    }
-  } catch (e) {
-    if (e instanceof BuildError) {
-      logger.error('Apple Session expired! Please authenticate again using expo-cli.');
-    }
-    throw e;
-  }
-}
-
-async function runFastlaneAction(action: string, args: string[], { env }: any) {
-  const { stderr } = await spawnAsync(
-    action,
-    args,
-    {
-      stdio: ['inherit', 'pipe', 'pipe'],
-      env: { ...process.env, ...env },
-    },
-  );
-  const { result, ...rest } = JSON.parse(stderr.trim());
-  if (result === 'failure') {
-    const { reason, rawDump, type } = rest;
-    let errorMsg = `Reason: ${reason}`;
-    if (rawDump) {
-      errorMsg += `, raw: ${JSON.stringify(rawDump)}`;
-    }
-    if (type === 'session-expired') {
-      throw new BuildError(BuildErrorReason.SESSION_EXPIRED, errorMsg);
-    } else {
-      throw new Error(errorMsg);
-    }
-  } else {
-    return rest;
-  }
-}
-
-export default prepareAdHocBuildCredentials;

src/builders/utils/ios/keychain.ts

@@ -1,28 +1,29 @@
 import { IosKeychain } from 'xdl';
 
-import { IContext } from 'turtle/builders/ios/context';
 import * as fileUtils from 'turtle/builders/utils/file';
 import logger from 'turtle/logger';
+import { IContext } from 'turtle/builders/ios/context';
 
 interface IKeychain {
   path: string;
 }
 
+
 export async function create(ctx: IContext): Promise<IKeychain> {
-  const l = logger.child({ buildPhase: 'creating keychain' });
+  const l = logger.withFields({ buildPhase: 'creating keychain' });
   try {
     l.info('creating keychain...');
     const keychainInfo = await IosKeychain.createKeychain(ctx.appUUID, false);
     l.info('done creating keychain');
     return keychainInfo;
   } catch (err) {
-    l.error({ err }, 'unable to create keychain');
+    l.error('unable to create keychain');
     throw err;
   }
 }
 
 export async function remove(ctx: IContext, keychainPath: string) {
-  const l = logger.child({ buildPhase: 'deleting keychain' });
+  const l = logger.withFields({ buildPhase: 'deleting keychain' });
   try {
     l.info('delete keychain...');
     const keychainInfo = await IosKeychain.deleteKeychain({
@@ -32,7 +33,7 @@ export async function remove(ctx: IContext, keychainPath: string) {
     l.info('done deleting keychain');
     return keychainInfo;
   } catch (err) {
-    l.error({ err }, 'unable to delete keychain');
+    l.error('unable to delete keychain');
     throw err;
   }
 }
@@ -49,7 +50,7 @@ export async function importCert(
     certPassword,
   }: { keychainPath: string; certP12: string; certPassword: string },
 ) {
-  const l = logger.child({ buildPhase: 'importing certificate into keychain' });
+  const l = logger.withFields({ buildPhase: 'importing certificate into keychain' });
   try {
     l.info('importing distribution certificate into keychain...');
     const { tempCertPath: certPath } = ctx;
@@ -57,7 +58,7 @@ export async function importCert(
     await IosKeychain.importIntoKeychain({ keychainPath, certPath, certPassword });
     l.info('done importing distribution certificate into keychain');
   } catch (err) {
-    l.error({ err }, 'unable to import distribution certificate into keychain');
+    l.error('unable to import distribution certificate into keychain');
     throw err;
   }
 }

src/builders/utils/ios/shellAppBuilder.ts

@@ -2,24 +2,30 @@ import path from 'path';
 import util from 'util';
 
 import copy from 'copy';
-import _ from 'lodash';
 import { ImageUtils, IosShellApp } from 'xdl';
+import _ from 'lodash';
 
-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 } from 'turtle/constants/index';
-import { IJob } from 'turtle/job';
 import logger from 'turtle/logger/index';
+import { IContext } from 'turtle/builders/ios/context';
+import { IJob } from 'turtle/job';
+import { PLATFORMS } from 'turtle/constants';
 
 const copyAsync = util.promisify(copy);
 
 export default async function runShellAppBuilder(ctx: IContext, job: IJob): Promise<any> {
-  const { config: jobConfig, manifest, sdkVersion: sdkVersionFromJob } = job;
+  const { config: jobConfig, manifest, sdkVersion: _sdkVersionFromJob } = job;
   const { buildType, releaseChannel } = jobConfig;
-  const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
-
-  await copyAsync(ctx.applicationFilesSrc, ctx.baseArchiveDir);
+  const sdkVersion = _.get(manifest, 'sdkVersion', _sdkVersionFromJob);
+  const applicationFilesSrc = path.join(
+    ctx.workingDir,
+    'shellAppBase-builds',
+    buildType as string,
+    '**',
+    '*',
+  );
+  await copyAsync(applicationFilesSrc, ctx.baseArchiveDir);
 
   logger.info(
     { buildPhase: 'icons setup' },
@@ -28,26 +34,18 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
   ImageUtils.setResizeImageFunction(imageHelpers.resizeIconWithSharpAsync);
   ImageUtils.setGetImageDimensionsFunction(imageHelpers.getImageDimensionsWithSharpAsync);
   const shellAppParams = {
+    url: commonUtils.getExperienceUrl(job),
+    sdkVersion,
     action: 'configure',
     type: buildType,
+    releaseChannel,
     archivePath: ctx.archiveDir,
     privateConfigData: job.config,
-    expoSourcePath: path.join(ctx.workingDir, 'ios'),
-    manifest,
-    output: ctx.outputPath,
     verbose: true,
+    output: ctx.outputPath,
+    expoSourcePath: path.join(ctx.workingDir, PLATFORMS.IOS),
+    manifest,
   };
-  if (buildType === IOS.BUILD_TYPES.CLIENT) {
-    Object.assign(shellAppParams, {
-      workspacePath: path.join(ctx.workingDir, 'ios'),
-    });
-  } else {
-    Object.assign(shellAppParams, {
-      url: commonUtils.getExperienceUrl(job),
-      releaseChannel,
-      sdkVersion,
-    });
-  }
 
   logger.info({ buildPhase: 'configuring NSBundle' }, 'configuring NSBundle...');
   return await IosShellApp.configureAndCopyArchiveAsync(shellAppParams);

src/builders/utils/ios/workingdir.ts

@@ -1,19 +1,11 @@
 import path from 'path';
-
 import { ExponentTools } from 'xdl';
-
-import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
-import { IOS, PLATFORMS } from 'turtle/constants';
+import { PLATFORMS } from 'turtle/constants';
 
-export function formatShellAppDirectory({ sdkVersion, buildType }: IShellAppDirectoryConfig) {
-  const { workingDir } = config.directories;
-  if (buildType === IOS.BUILD_TYPES.CLIENT) {
-    return path.join(workingDir, PLATFORMS.IOS, 'client');
-  } else if (config.builder.useLocalWorkingDir) {
-    return path.join(workingDir, 'local');
-  } else {
-    const majorVersion = ExponentTools.parseSdkMajorVersion(sdkVersion);
-    return path.join(workingDir, PLATFORMS.IOS, `sdk${majorVersion}`);
-  }
+export function formatShellAppDirectory(sdkVersion: string) {
+  const majorVersion = ExponentTools.parseSdkMajorVersion(sdkVersion);
+  return config.builder.useLocalWorkingDir
+    ? path.join(config.directories.workingDir, 'local')
+    : path.join(config.directories.workingDir, PLATFORMS.IOS, `sdk${majorVersion}`);
 }

src/builders/utils/unimodules.ts

@@ -1,167 +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');
-  if (await fs.pathExists(pkgJsonPath)) {
-    const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    return keys(packageJson.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;
-}

src/builders/utils/uploader.ts

@@ -12,14 +12,14 @@ interface IUploadCtx {
 
 export async function uploadBuildToS3(ctx: IUploadCtx) {
   if (config.builder.fakeUpload) {
-    const l = logger.child({ buildPhase: 'copying build artifact' });
+    const l = logger.withFields({ buildPhase: 'copying build artifact' });
     const { fakeUploadBuildPath, uploadPath } = ctx;
     l.info('copying build to fake upload directory');
     await fs.copy(uploadPath, fakeUploadBuildPath as string);
     l.info(`copied build to ${fakeUploadBuildPath}`);
     return fakeUploadBuildPath as string;
   } else {
-    const l = logger.child({ buildPhase: 'uploading to S3' });
+    const l = logger.withFields({ buildPhase: 'uploading to S3' });
     l.info('uploading build artifact to S3');
     const { Location: fileLocation } = await uploadFile({
       key: ctx.s3FileKey as string,

src/builders/utils/version.ts

@@ -1,30 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { ExponentTools } from 'xdl';
-
-import config from 'turtle/config';
-import { IJob } from 'turtle/job';
-
-let SUPPORTED_SDK_VERSIONS: number[];
-
-export async function ensureCanBuildSdkVersion(job: IJob) {
-  if (config.builder.useLocalWorkingDir) {
-    return;
-  }
-
-  if (!SUPPORTED_SDK_VERSIONS) {
-    SUPPORTED_SDK_VERSIONS = await findSupportedSdkVersions(job.platform);
-  }
-
-  const targetMajorSdkVersion = ExponentTools.parseSdkMajorVersion(job.sdkVersion || job.manifest.sdkVersion);
-  if (!SUPPORTED_SDK_VERSIONS.includes(targetMajorSdkVersion)) {
-    throw new Error(`Unsupported SDK Version!`);
-  }
-}
-
-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));
-}