run lint before building turtle

.circleci/config.yml

@@ -1,139 +1,4 @@
-version: 2.1
-
-executors:
-  nix: &nix
-    docker:
-      - image: lnl7/nix:2.1.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.direnv \
-              nixpkgs.findutils \
-              nixpkgs.gawk \
-              nixpkgs.git \
-              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 >>"
+version: 2
 
 jobs:
   build:
@@ -144,68 +9,17 @@ jobs:
       - run: yarn
       - run: yarn lint
       - run: yarn build
-
-  unit_tests:
-    executor: nix
+  test:
+    docker:
+      - image: circleci/node:8.12
     steps:
-      - setup
-      - restore_yarn_cache
+      - checkout
       - run: yarn
-      - save_yarn_cache
-      - run:
-          name: Run iOS smoke 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

@@ -15,6 +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
-fi
+PATH_add $EXPO_TURTLE_TOOLS_DIR/bin

.gitignore

@@ -1,13 +1,8 @@
 !/src/node_modules
 
-node_modules
-yarn-error.log
-
 /build/
 /workingdir/*
 /artifacts/*
 shell.apk
+node_modules
 .secrets*
-
-*.swp
-*.swo

.ignore

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

.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

@@ -5,96 +5,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Changed
-- Updated iOS shell app for SDK 32 to fix AppAuth issue
-
-## [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]`.
+- Update Android shell app for SDK32 that includes react-native-screens@1.0.0-alpha.22
 
 ## [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.
+- Turtle version is added to onFinish and onError build messages.
 ### 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.
+- new/old Turtle version build argument
 
 ## [0.4.3] - 2019-01-09
 ### Changed

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
@@ -102,6 +98,13 @@ 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 \

README.md

@@ -1,39 +1,25 @@
 # 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)
-
-[![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/)
+[![NPM](https://img.shields.io/npm/v/turtle-cli/latest.svg)](https://rubygems.org/gems/fastlane)
+[![CircleCI](https://img.shields.io/circleci/project/github/expo/turtle/master.svg)](https://circleci.com/gh/expo/turtle)
 
 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
 
-## 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.

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
-}

package.json

@@ -1,23 +1,23 @@
 {
   "name": "turtle-cli",
-  "version": "0.6.0",
+  "version": "0.5.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
-    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp",
+    "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,local-queue expenv gulp watch:source",
+    "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": "yarn build",
     "build": "gulp build:server",
     "build:production": "./scripts/build.sh",
     "build:android-tarball:local": "./scripts/android/buildAndroidTarballLocally.sh",
-    "secrets:init-private": "./scripts/initPrivateSecrets.sh",
-    "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
-    "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
+    "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} .",
@@ -27,29 +27,17 @@
     "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:local": "EXPENV_OVERRIDES=local-common,local,local-queue expenv babel-node scripts/setConfigurations.js",
+    "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"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.ts": [
-      "yarn lint:fix",
-      "git add"
-    ]
-  },
   "bin": {
     "turtle": "./bin/turtle.js"
   },
@@ -72,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",
@@ -100,26 +85,21 @@
     "gulp-plumber": "^1.2.0",
     "gulp-sourcemaps": "^2.6.4",
     "gulp-typescript": "^4.0.2",
-    "husky": "^1.3.1",
     "jest": "^23.6.0",
-    "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
     "nodemon": "^1.18.7",
-    "release-it": "^10.0.0",
     "rimraf": "^2.6.2",
     "source-map-loader": "^0.2.3",
     "ts-jest": "^23.10.4",
     "tslint": "^5.10.0",
-    "tslint-eslint-rules": "^5.4.0",
     "typescript": "^3.0.1"
   },
   "dependencies": {
-    "@expo/spawn-async": "^1.4.0",
-    "@google-cloud/logging-bunyan": "^0.10.1",
     "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",
@@ -138,9 +118,6 @@
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1",
-    "xdl": "53.1.6-alpha.2"
-  },
-  "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "^1.8.1"
+    "xdl": "52.0.14-alpha.6+371be041"
   }
 }

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/setWorkingdirMode.sh

@@ -1,86 +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")
-
-  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
-}
-
-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-cb03fdc12dc74f699a6d3f22219cbcd30e01ac46.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

@@ -34,7 +34,7 @@ async function performSmokeTest(recording: string) {
     });
   }
 
-  await jobManager.doJob(logger);
+  await jobManager.doJob();
   if (!fixtureExists) {
     await fs.writeFile(recording, JSON.stringify(nock.recorder.play()));
   }

src/aws/cloudwatch/index.ts

@@ -11,6 +11,7 @@ import {
   MetricRegistrationObject,
 } from 'turtle/aws/cloudwatch/types';
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 
 interface IState {
   metrics: IMetric[];
@@ -37,12 +38,12 @@ const cloudWatch = new aws.CloudWatch({
   secretAccessKey: config.aws.secretAccessKey,
 });
 
-export function init(logger: any) {
+export function init() {
   if (config.cloudwatch.disabled) {
     return;
   }
 
-  state.intervalId = setInterval(_dumpMetrics(logger), config.cloudwatch.intervalMs);
+  state.intervalId = setInterval(_dumpMetrics, config.cloudwatch.intervalMs);
 }
 
 export function addMetricData({
@@ -110,25 +111,23 @@ function _calculateGroupHash(metricName: string, extraDimensions: any[]) {
   return `${metricName}${dimString}`;
 }
 
-function _dumpMetrics(logger: any) {
-  return () => {
-    if (!state.metrics.length && Object.keys(state.registeredMetrics).length < 0) {
-      // empty metrics list, skipping
-      return;
-    }
+function _dumpMetrics() {
+  if (!state.metrics.length && Object.keys(state.registeredMetrics).length < 0) {
+    // empty metrics list, skipping
+    return;
+  }
 
-    logger.trace(
-      '[cloudwatch] lengths for state.metrics=%d, state.registeredMetrics=%d',
-      state.metrics.length,
-      Object.keys(state.registeredMetrics).length,
-    );
+  logger.trace(
+    '[cloudwatch] lenghts for state.metrics=%d, state.registeredMetrics=%d',
+    state.metrics.length,
+    Object.keys(state.registeredMetrics).length,
+  );
 
-    _addEmptyMetrics(state.metrics);
-    const formattedMetrics = _formatMetrics(state.metrics);
-    _pushMetrics(formattedMetrics, logger);
+  _addEmptyMetrics(state.metrics);
+  const formattedMetrics = _formatMetrics(state.metrics);
+  _pushMetrics(formattedMetrics);
 
-    state.metrics = [];
-  };
+  state.metrics = [];
 }
 
 function _addEmptyMetrics(metrics: IMetric[]) {
@@ -175,12 +174,12 @@ function _reduceMetrics(metrics: IMetric[]) {
   );
 }
 
-function _pushMetrics(metrics: IMetricsChunk[], logger: any) {
+function _pushMetrics(metrics: IMetricsChunk[]) {
   logger.trace('[cloudwatch] pushing metrics', JSON.stringify(metrics, null, '\t'));
   metrics.forEach((metricsChunk) => {
     cloudWatch.putMetricData(metricsChunk, (err) => {
       if (err) {
-        logger.warn({ err }, '[cloudwatch]');
+        logger.warn('[cloudwatch]', err);
       }
     });
   });

src/aws/cloudwatch/reducers.ts

@@ -7,7 +7,7 @@ export function sum(metrics: IMetric[]) {
   const reduced = metrics.reduce((acc: IMetric | null, i: IMetric) => {
     let result = acc;
     if (!result) {
-      result = { ...i };
+      result = {...i};
     } else {
       result.Value += i.Value;
     }

src/aws/sqs.ts

@@ -5,6 +5,7 @@ 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';
 
 const sqs = new AWS.SQS({
@@ -15,7 +16,7 @@ const sqs = new AWS.SQS({
 
 const VISIBILITY_TIMEOUT_SEC = 30;
 
-export async function receiveMessage(priority: string, logger: any) {
+export async function receiveMessage(priority: string) {
   const params = {
     MaxNumberOfMessages: 1,
     QueueUrl: QUEUE_URL(priority),
@@ -35,7 +36,7 @@ export async function receiveMessage(priority: string, logger: any) {
         }
       })
       .catch((err) => {
-        logger.error({ err }, 'Receive error');
+        logger.error('Receive error', err);
         throw err;
       });
   });
@@ -61,19 +62,19 @@ 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, logger: any) {
+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');
+        logger.warn('Error at change msg visibility', err);
       });
     }
   }, (VISIBILITY_TIMEOUT_SEC * 1000) / 3);
 }
 
-export async function sendMessage(jobId: string, status: JOB_UPDATE_TYPE, data = {}, logger: any) {
+export async function sendMessage(jobId: string, status: JOB_UPDATE_TYPE, data = {}) {
   const params = {
     MessageBody: JSON.stringify({ jobId, status, ...data }),
     QueueUrl: OUTPUT_QUEUE_URL(),
@@ -85,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/build/index.ts

@@ -2,8 +2,8 @@ import { default as buildAndroid } from 'turtle/bin/commands/build/android';
 import { default as buildIOS } from 'turtle/bin/commands/build/ios';
 
 function createCommand(builder: any) {
-  return (logger: any) => (program: any) => {
-    return builder(program, setCommonCommandOptions, logger);
+  return (program: any) => {
+    return builder(program, setCommonCommandOptions);
   };
 }
 
@@ -20,8 +20,7 @@ function setCommonCommandOptions(cmd: any) {
     .option(
       '--release-channel <channel-name>',
       'pull from specified release channel (default: default)',
-    )
-    .option('-c --config <config-file>', 'specify a path to app.json');
+    );
 }
 
 export default {

src/bin/commands/index.ts

@@ -1,9 +1,8 @@
 import builders from 'turtle/bin/commands/build';
 import setup from 'turtle/bin/commands/setup';
 
-export default {
-  setupIOS: setup.ios,
-  setupAndroid: setup.android,
-  buildIOS: builders.ios,
-  buildAndroid: builders.android,
-};
+export const setupIOS = setup.ios;
+export const setupAndroid = setup.android;
+
+export const buildIOS = builders.ios;
+export const buildAndroid = builders.android;

src/bin/commands/setup.ts

@@ -4,6 +4,9 @@ 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';
+
+const l = logger.withFields({ buildPhase: 'setting up environment' });
 
 function createSetupCommand(platform: string, os?: string) {
   return (program: any) => {
@@ -20,19 +23,18 @@ function createSetupCommand(platform: string, os?: string) {
   };
 }
 
-async function setupAction(program: any, cmd: any, platform: string, logger: any, os?: string) {
+async function setupAction(program: any, cmd: any, platform: string, os?: string) {
   try {
     if (os && process.platform !== os) {
       throw new Error('We don\'t support running standalone app builds for this platform on your operating system');
     }
 
     const { sdkVersion } = cmd;
-    const l = logger.child({ buildPhase: 'setting up environment' });
-
-    await setup(platform, l, sdkVersion);
+    await setup(platform, sdkVersion);
     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/index.ts

@@ -4,7 +4,7 @@ import program, { Command } from 'commander';
 import fs from 'fs-extra';
 import { LoggerDetach, ModuleVersion } from 'xdl';
 
-import commands from 'turtle/bin/commands';
+import * as commands from 'turtle/bin/commands';
 import logger from 'turtle/logger';
 
 const { name, version } = JSON.parse(fs.readFileSync(path.join(__dirname, '../../package.json'), 'utf-8'));
@@ -17,23 +17,23 @@ 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) {
+      logger.warn('Failed to check for turtle-cli update.');
     }
     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).map((command) => command(logger)).forEach((command) => registerCommand(program, command));
+  Object.values(commands).forEach((command) => registerCommand(program, command));
   program.parse(process.argv);
 
   const subCommand = process.argv[2];

src/bin/setup/android/index.ts

@@ -12,6 +12,7 @@ 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';
 
 const which = util.promisify(_which);
 const REQUIRED_TOOLS: IToolDefinition[] = [
@@ -39,24 +40,25 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
     },
   },
 ];
+const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
+const l = logger.withFields(LOGGER_FIELDS);
 
-export default async function setup(logger: any, sdkVersion?: string) {
-  await checkSystem(REQUIRED_TOOLS, logger);
-  await prepareAndroidEnv(logger);
+export default async function setup(sdkVersion?: string) {
+  await checkSystem(REQUIRED_TOOLS);
+  await prepareAndroidEnv();
   if (sdkVersion) {
     await ensureShellAppIsPresent(
       sdkVersion,
       { formatShellAppDirectory, formatShellAppTarballUriPath },
-      logger,
       _shellAppPostDownloadAction,
     );
   }
 }
 
-async function prepareAndroidEnv(logger: any) {
+async function prepareAndroidEnv() {
   await fs.ensureDir(config.directories.androidDependenciesDir);
-  const sdkConfig = await ensureAndroidSDKIsPresent(logger);
-  const ndkConfig = await ensureAndroidNDKIsPresent(logger);
+  const sdkConfig = await ensureAndroidSDKIsPresent();
+  const ndkConfig = await ensureAndroidNDKIsPresent();
   _setEnvVars({ ...sdkConfig.envVars, ...ndkConfig.envVars });
   _alterPath([...sdkConfig.path, ...sdkConfig.path]);
 }
@@ -65,23 +67,21 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }
 
-async function _shellAppPostDownloadAction(workingdir: string, logger: any) {
+async function _shellAppPostDownloadAction(workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
   await fs.move(inWorkingdir('package.json'), inWorkingdir('exponent-package.json'));
   await fs.move(inWorkingdir('universe-package.json'), inWorkingdir('package.json'));
-  await _installNodeModules(workingdir, logger);
+  await _installNodeModules(workingdir);
   await fs.move(inWorkingdir('package.json'), inWorkingdir('universe-package.json'));
   await fs.move(inWorkingdir('exponent-package.json'), inWorkingdir('package.json'));
 
   // TODO: remove following lines after upgrading android shell app
   const toolsPublicDir = path.join(workingdir, 'tools-public');
-  await _installNodeModules(toolsPublicDir, logger);
+  await _installNodeModules(toolsPublicDir);
 }
 
-async function _installNodeModules(cwd: string, logger: any) {
-  const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-  const l = logger.child(LOGGER_FIELDS);
+async function _installNodeModules(cwd: string) {
   l.info(`installing dependencies in ${cwd} directory...`);
   const command = await _shouldUseYarnOrNpm();
   await ExponentTools.spawnAsyncThrowError(command, ['install'], {

src/bin/setup/android/ndk.ts

@@ -7,17 +7,20 @@ 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';
 
 const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;
 
-export default async function ensureAndroidNDKIsPresent(logger: any) {
+const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
+const l = logger.withFields(LOGGER_FIELDS);
+
+export default async function ensureAndroidNDKIsPresent() {
   const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
   if (!(await fs.pathExists(androidNdkDir))) {
     await fs.ensureDir(androidNdkDir);
     const androidNdkDownloadPath = formatArtifactDownloadPath(ANDROID_NDK_URL);
 
     try {
-      const l = logger.child({ buildPhase: 'setting up environment' });
       l.info('Downloading Android NDK');
       await fs.ensureDir(config.directories.artifactsDir);
       await download(ANDROID_NDK_URL, androidNdkDownloadPath);

src/bin/setup/android/sdk.ts

@@ -8,17 +8,20 @@ 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';
+
+const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip';
 
-const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-export default async function ensureAndroidSDKIsPresent(logger: any) {
+const l = logger.withFields(LOGGER_FIELDS);
+
+export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
   if (!(await fs.pathExists(androidSdkDir))) {
     await fs.ensureDir(androidSdkDir);
     const androidSdkDownloadPath = formatArtifactDownloadPath(ANDROID_SDK_URL);
 
     try {
-      const l = logger.child(LOGGER_FIELDS);
       l.info('Downloading Android SDK');
       await fs.ensureDir(config.directories.artifactsDir);
       await download(ANDROID_SDK_URL, androidSdkDownloadPath);
@@ -70,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

@@ -34,13 +34,13 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   },
 ];
 
-export default async function setup(logger: any, sdkVersion?: string) {
-  await checkSystem(REQUIRED_TOOLS, logger);
+export default async function setup(sdkVersion?: string) {
+  await checkSystem(REQUIRED_TOOLS);
   if (sdkVersion) {
     await ensureShellAppIsPresent(sdkVersion, {
       formatShellAppDirectory,
       formatShellAppTarballUriPath,
-    }, logger);
+    });
   }
 }
 

src/bin/setup/setup.ts

@@ -4,15 +4,15 @@ import setupAndroid from 'turtle/bin/setup/android';
 import setupIos from 'turtle/bin/setup/ios';
 import { PLATFORMS } from 'turtle/constants';
 
-export default async function setup(platform: string, logger: any, sdkVersion?: string) {
+export default async function setup(platform: string, sdkVersion?: string) {
   if (sdkVersion && !isSemver(sdkVersion)) {
     throw new Error('SDK version is not valid.');
   }
 
   if (platform === PLATFORMS.IOS) {
-    return await setupIos(logger, sdkVersion);
+    return await setupIos(sdkVersion);
   } else if (platform === PLATFORMS.ANDROID) {
-    return await setupAndroid(logger, sdkVersion);
+    return await setupAndroid(sdkVersion);
   } else {
     throw new Error('This should never happen :(');
   }

src/bin/setup/utils/common.ts

@@ -6,56 +6,51 @@ 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';
+
+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, logger: any) => void;
+type PostDownloadAction = (workingdir: string) => void;
 
-export async function checkSystem(requiredTools: IToolDefinition[], logger: any) {
-  await ensureToolsAreInstalled(requiredTools, logger);
+export async function checkSystem(requiredTools: IToolDefinition[]) {
+  await ensureToolsAreInstalled(requiredTools);
 }
 
 export async function ensureShellAppIsPresent(
   sdkVersion: string,
   formatters: IShellAppFormaters,
-  logger: any,
   postDownloadAction?: PostDownloadAction,
 ) {
-  const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
-  const l = logger.child({ buildPhase: 'setting up environment' });
+  const workingdir = formatters.formatShellAppDirectory(sdkVersion);
   if (await fs.pathExists(workingdir)) {
     return;
   }
   l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
-  await _downloadShellApp(sdkVersion, workingdir, formatters, l);
+  await _downloadShellApp(sdkVersion, workingdir, formatters);
   if (postDownloadAction) {
-    await postDownloadAction(workingdir, logger);
+    await postDownloadAction(workingdir);
   }
 }
 
-async function _downloadShellApp(
-  sdkVersion: string,
-  targetDirectory: string,
-  formatters: IShellAppFormaters,
-  logger: any,
-) {
+async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
   const shellAppTarballS3Uri = await _readShellAppTarballS3Uri(sdkVersion, formatters);
   const tarballDownloadTargetPath = formatArtifactDownloadPath(shellAppTarballS3Uri);
   await fs.ensureDir(config.directories.artifactsDir);
   await download(shellAppTarballS3Uri, tarballDownloadTargetPath);
-  logger.info('shell app has been downloaded');
+  l.info('shell app has been downloaded');
   await fs.ensureDir(targetDirectory);
-  logger.info('extracting shell app (this may take a while)...');
+  l.info('extracting shell app (this may take a while)...');
   await tar.x({
     file: tarballDownloadTargetPath,
     C: targetDirectory,
   });
-  logger.info('shell app extracted');
+  l.info('shell app extracted');
 }
 
 export function formatArtifactDownloadPath(uri: string) {

src/bin/setup/utils/toolsDetector.ts

@@ -1,7 +1,10 @@
 import util from 'util';
 import _which from 'which';
 
+import logger from 'turtle/logger';
+
 const which = util.promisify(_which);
+const l = logger.withFields({ buildPhase: 'setting up environment' });
 
 export interface IToolDefinition {
   command: string;
@@ -9,7 +12,7 @@ export interface IToolDefinition {
   testFn?: () => Promise<boolean>;
 }
 
-export async function ensureToolsAreInstalled(tools: IToolDefinition[], logger: any) {
+export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
   let isAnyToolMissing = false;
   for (const { command, missingDescription, testFn } of tools) {
     try {
@@ -21,12 +24,11 @@ export async function ensureToolsAreInstalled(tools: IToolDefinition[], logger:
         await which(command);
       }
     } catch (err) {
-      const l = logger.child({ buildPhase: 'setting up environment' });
       isAnyToolMissing = true;
       if (!testFn) {
-        l.error({ err }, `${command} is missing in your $PATH`);
+        l.error(`${command} is missing in your $PATH`);
       }
-      l.error({ err }, missingDescription);
+      l.error(missingDescription);
     }
   }
   if (isAnyToolMissing) {

src/bin/utils/builder.ts

@@ -5,10 +5,10 @@ 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';
 
 export function createBuilderAction({
-  logger,
   program,
   command,
   prepareCredentials,
@@ -60,9 +60,9 @@ 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, logger, sdkVersion);
+      await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
         ...buildJobObject(appJSON, args, credentials),
@@ -72,7 +72,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';
 
-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/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

@@ -10,20 +10,18 @@ import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdi
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
 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';
 
-export default async function buildAndroid(jobData: IJob, logger: any): Promise<IJobResult> {
-  await ensureCanBuildSdkVersion(jobData);
-  const credentials = await getOrCreateCredentials(jobData, logger);
-  const apkFilePath = await runShellAppBuilder(jobData, credentials, logger);
+export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
+  const credentials = await getOrCreateCredentials(jobData);
+  const apkFilePath = await runShellAppBuilder(jobData, credentials);
   const randomHex = uuidv4().replace(/-/g, '');
   const s3Filename = `${jobData.experienceName}-${randomHex}-signed.apk`;
   const s3FileKey = `android/${s3Filename}`;
   const fakeUploadFilename = s3Filename.replace('/', '\\');
   const artifactUrl = await uploadBuildToS3({
-    logger,
     uploadPath: apkFilePath,
     s3FileKey,
     ...config.builder.fakeUpload && {
@@ -40,7 +38,6 @@ export default async function buildAndroid(jobData: IJob, logger: any): Promise<
 async function runShellAppBuilder(
   jobData: IJob,
   credentials: IAndroidCredentials,
-  logger: any,
 ): Promise<string> {
   const { temporaryFilesRoot } = config.directories;
   await fs.ensureDir(temporaryFilesRoot);
@@ -63,26 +60,25 @@ 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 });
+  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,
     });
   } catch (err) {
-    commonUtils.logErrorOnce(err, logger);
+    commonUtils.logErrorOnce(err);
     throw err;
   } finally {
     if (!config.builder.skipCleanup) {

src/builders/index.ts

@@ -1,10 +1,7 @@
-import { IJob, IJobResult } from 'turtle/job';
 import buildAndroid from './android';
 import buildIOS from './ios';
 
-const builders: { [index: string]: (job: IJob, logger: any) => Promise<IJobResult>} = {
+export default {
   ios: buildIOS,
   android: buildAndroid,
 };
-
-export default builders;

src/builders/ios/archive.ts

@@ -7,6 +7,7 @@ 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';
 
 export default async function buildArchive(ctx: IContext, job: IJob) {
   let keychainInfo;
@@ -18,7 +19,7 @@ export default async function buildArchive(ctx: IContext, job: IJob) {
     const manifest = await runShellAppBuilder(ctx, job);
     await buildAndSignIPA(ctx, job, keychainInfo.path, manifest);
   } catch (err) {
-    logErrorOnce(err, ctx.logger);
+    logErrorOnce(err);
     throw err;
   } finally {
     if (keychainInfo) {
@@ -28,11 +29,11 @@ export default async function buildArchive(ctx: IContext, job: IJob) {
 }
 
 async function buildAndSignIPA(ctx: IContext, job: IJob, keychainPath: string, manifest: any) {
-  ctx.logger = ctx.logger.child({ buildPhase: 'building and signing IPA' });
-  ctx.logger.info('building and signing IPA');
+  const l = logger.withFields({ buildPhase: 'building and signing IPA' });
+  l.info('building and signing IPA');
 
   const {
-    credentials: { provisioningProfile, certPassword, teamId },
+    credentials: { provisioningProfile, certPassword, teamId, password },
     config: { bundleIdentifier: bundleIdentifierFromConfig },
   } = job;
 
@@ -41,7 +42,7 @@ async function buildAndSignIPA(ctx: IContext, job: IJob, keychainPath: string, m
 
   const { provisioningProfilePath } = ctx;
   await fileUtils.writeBase64ToBinaryFile(provisioningProfilePath, provisioningProfile as string);
-  ctx.logger.info('saved provisioning profile to temporary path');
+  l.info('saved provisioning profile to temporary path');
 
   const ipaBuilder = createIPABuilder({
     keychainPath,
@@ -50,11 +51,12 @@ 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();
 
-  ctx.logger.info(`done building and signing IPA`);
+  l.info(`done building and signing IPA`);
 }

src/builders/ios/context.ts

@@ -15,7 +15,6 @@ export interface IContext {
   baseArchiveDir: string;
   buildDir: string;
   fakeUploadBuildPath?: string;
-  logger: any;
   outputPath: string;
   provisioningProfilePath: string;
   provisioningProfileDir: string;
@@ -23,14 +22,12 @@ 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, logger: any): IContext {
+export function createBuilderContext(job: IJob): IContext {
   const { join } = path;
   const appUUID = uuidv4();
   const {
@@ -42,13 +39,12 @@ export function createBuilderContext(job: IJob, logger: any): IContext {
   } = job;
 
   const sdkVersion = sdkVersionFromJob || sdkVersionFromManifest;
-  const workingDir = formatShellAppDirectory({ sdkVersion, buildType: buildType! });
+  const workingDir = formatShellAppDirectory(sdkVersion);
 
   const context: any = {
     appDir: join(config.directories.temporaryFilesRoot, appUUID),
     appUUID,
     workingDir,
-    logger,
   };
   context.buildDir = join(context.appDir, 'build');
   context.provisioningProfileDir = join(context.appDir, 'provisioning');
@@ -59,63 +55,24 @@ export function createBuilderContext(job: IJob, logger: any): IContext {
   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`,
     );
   }
 

src/builders/ios/index.ts

@@ -1,39 +1,35 @@
+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;
 
-export default async function iosBuilder(job: IJob, logger: any): Promise<IJobResult> {
-  if (job.config.buildType !== BUILD_TYPES.CLIENT) {
-    await ensureCanBuildSdkVersion(job);
-  }
+let SUPPORTED_SDK_VERSIONS: number[];
 
-  const ctx = createBuilderContext(job, logger);
+export default async function iosBuilder(job: IJob): Promise<IJobResult> {
+  await ensureCanBuildSdkVersion(job);
+
+  const ctx = createBuilderContext(job);
 
   try {
     await initBuilder(ctx);
 
     const { buildType } = job.config;
-
-    if (buildType === BUILD_TYPES.CLIENT) {
-      await prepareAdHocBuildCredentials(job, ctx.logger);
-    }
-
-    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}`);
     }
@@ -41,7 +37,7 @@ export default async function iosBuilder(job: IJob, logger: any): Promise<IJobRe
     const artifactUrl = await uploadBuildToS3(ctx);
     return { artifactUrl };
   } catch (err) {
-    logErrorOnce(err, ctx.logger);
+    logErrorOnce(err);
     throw err;
   } finally {
     await cleanup(ctx);
@@ -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<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), 10));
+}

src/builders/ios/simulator.ts

@@ -1,10 +1,11 @@
 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';
 
 export default async function buildSimulator(ctx: IContext, job: IJob) {
-  ctx.logger = ctx.logger.child({ buildPhase: 'running simulator builder' });
-  ctx.logger.info('running simulator build');
+  const l = logger.withFields({ buildPhase: 'running simulator builder' });
+  l.info('running simulator build');
   await runShellAppBuilder(ctx, job);
-  ctx.logger.info('build complete');
+  l.info('build complete');
 }

src/builders/utils/android/credentials.ts

@@ -2,16 +2,17 @@ import path from 'path';
 
 import fs from 'fs-extra';
 import uuidv4 from 'uuid/v4';
-import { Credentials } from 'xdl';
+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';
 
-async function getOrCreateCredentials(jobData: IJob, logger: any): Promise<IAndroidCredentials> {
+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`;
@@ -20,15 +21,13 @@ async function getOrCreateCredentials(jobData: IJob, logger: any): Promise<IAndr
     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');
@@ -43,7 +42,7 @@ async function getOrCreateCredentials(jobData: IJob, logger: any): Promise<IAndr
     } else {
       await sqs.sendMessage(jobData.id, UPDATE_CREDENTIALS, {
         ...credentials,
-      }, l);
+      });
       l.info('Keystore sent to storage successfully');
     }
     await fs.unlink(keystoreFilename);

src/builders/utils/android/workingdir.ts

@@ -2,11 +2,10 @@ import path from 'path';
 
 import { ExponentTools } from 'xdl';
 
-import { IShellAppDirectoryConfig } from 'turtle/builders/utils/workingdir';
 import config from 'turtle/config';
 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

@@ -2,6 +2,7 @@ import * as url from 'url';
 
 import config from 'turtle/config';
 import { IJob } from 'turtle/job';
+import logger from 'turtle/logger';
 
 export function getExperienceUrl(job: IJob) {
   const { experienceName, config: jobConfig } = job;
@@ -17,7 +18,7 @@ export function getExperienceUrl(job: IJob) {
 
 const alreadyLoggedError = Symbol('alreadyLoggedError');
 
-export function logErrorOnce(err: any, logger: any) {
+export function logErrorOnce(err: any) {
   if (!err[alreadyLoggedError]) {
     logger.error(err.stack);
     err[alreadyLoggedError] = true;

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,98 +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 { 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, logger: any) {
-  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);
-      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

@@ -2,26 +2,27 @@ import { IosKeychain } from 'xdl';
 
 import { IContext } from 'turtle/builders/ios/context';
 import * as fileUtils from 'turtle/builders/utils/file';
+import logger from 'turtle/logger';
 
 interface IKeychain {
   path: string;
 }
 
 export async function create(ctx: IContext): Promise<IKeychain> {
-  const l = ctx.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 = ctx.logger.child({ buildPhase: 'deleting keychain' });
+  const l = logger.withFields({ buildPhase: 'deleting keychain' });
   try {
     l.info('delete keychain...');
     const keychainInfo = await IosKeychain.deleteKeychain({
@@ -31,7 +32,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;
   }
 }
@@ -48,7 +49,7 @@ export async function importCert(
     certPassword,
   }: { keychainPath: string; certP12: string; certPassword: string },
 ) {
-  const l = ctx.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;
@@ -56,7 +57,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

@@ -8,8 +8,9 @@ import { ImageUtils, IosShellApp } from 'xdl';
 import { IContext } from 'turtle/builders/ios/context';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { IOS } from 'turtle/constants/index';
+import { PLATFORMS } from 'turtle/constants';
 import { IJob } from 'turtle/job';
+import logger from 'turtle/logger/index';
 
 const copyAsync = util.promisify(copy);
 
@@ -17,37 +18,35 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
   const { config: jobConfig, manifest, sdkVersion: sdkVersionFromJob } = job;
   const { buildType, releaseChannel } = jobConfig;
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
+  const applicationFilesSrc = path.join(
+    ctx.workingDir,
+    'shellAppBase-builds',
+    buildType as string,
+    '**',
+    '*',
+  );
+  await copyAsync(applicationFilesSrc, ctx.baseArchiveDir);
 
-  await copyAsync(ctx.applicationFilesSrc, ctx.baseArchiveDir);
-
-  ctx.logger.info(
+  logger.info(
     { buildPhase: 'icons setup' },
     'ImageUtils: setting image functions to alternative sharp implementations',
   );
   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,
-    });
-  }
 
-  ctx.logger.info({ buildPhase: 'configuring NSBundle' }, 'configuring NSBundle...');
+  logger.info({ buildPhase: 'configuring NSBundle' }, 'configuring NSBundle...');
   return await IosShellApp.configureAndCopyArchiveAsync(shellAppParams);
 }

src/builders/utils/ios/workingdir.ts

@@ -2,18 +2,12 @@ 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/uploader.ts

@@ -2,24 +2,24 @@ import * as fs from 'fs-extra';
 
 import { uploadFile } from 'turtle/aws/s3';
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 
 interface IUploadCtx {
   fakeUploadBuildPath?: string;
   s3FileKey?: string;
   uploadPath: string;
-  logger: any;
 }
 
 export async function uploadBuildToS3(ctx: IUploadCtx) {
   if (config.builder.fakeUpload) {
-    const l = ctx.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 = ctx.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));
-}

src/builders/utils/workingdir.ts

@@ -1,6 +0,0 @@
-import { IOS } from 'turtle/constants';
-
-export interface IShellAppDirectoryConfig {
-  sdkVersion: string;
-  buildType?: IOS.BUILD_TYPES;
-}

src/config.ts

@@ -8,7 +8,7 @@ export default {
   env: env('NODE_ENV'),
   hostname: env('HOSTNAME', os.hostname()),
   deploymentEnv: env('ENVIRONMENT'),
-  platform: env('PLATFORM', PLATFORMS.IOS) as PLATFORMS,
+  platform: env('PLATFORM', PLATFORMS.IOS),
   aws: {
     accessKeyId: env('AWS_ACCESS_KEY_ID'),
     secretAccessKey: env('AWS_SECRET_ACCESS_KEY'),
@@ -47,9 +47,11 @@ export default {
     client: {
       level: env('CLIENT_LOGGER_LEVEL', 'info'),
     },
-  },
-  google: {
-    credentials: env('GOOGLE_APPLICATION_CREDENTIALS', ''),
+    loggly: {
+      token: env('LOGGLY_TOKEN', ''),
+      subdomain: env('LOGGLY_SUBDOMAIN', ''),
+      buffer: envNum('LOGGLY_BUFFER', 100),
+    },
   },
   sentry: {
     dsn: env('SENTRY_DSN', ''),

src/constants/index.ts

@@ -1,9 +1,9 @@
 import * as BUILD from './build';
 import * as IOS from './ios';
 
-export enum PLATFORMS {
-  IOS = 'ios',
-  ANDROID = 'android',
-}
+export const PLATFORMS = {
+  IOS: 'ios',
+  ANDROID: 'android',
+};
 
 export { IOS, BUILD };

src/constants/ios.ts

@@ -1,5 +1,4 @@
-export enum BUILD_TYPES {
-  ARCHIVE = 'archive',
-  CLIENT = 'client',
-  SIMULATOR = 'simulator',
-}
+export const BUILD_TYPES = {
+  ARCHIVE: 'archive',
+  SIMULATOR: 'simulator',
+};

src/job.ts

@@ -1,5 +1,3 @@
-import { IOS } from 'turtle/constants';
-
 export interface IJob {
   platform: 'android' | 'ios';
   experienceName: string;
@@ -10,7 +8,7 @@ export interface IJob {
     releaseChannel: string;
     publicUrl?: string;
     // ios
-    buildType?: IOS.BUILD_TYPES;
+    buildType?: string;
     bundleIdentifier?: string;
   };
   credentials: {
@@ -18,14 +16,13 @@ export interface IJob {
     keystore?: string;
     keystoreAlias?: string;
     keystorePassword?: string;
-    keyPassword?: string;
     // ios
+    keyPassword?: string;
     certP12?: string;
     certPassword?: string;
     provisioningProfile?: string;
+    password?: string;
     teamId?: string;
-    appleSession?: string;
-    udids?: string[];
   };
   projectDir: string;
   fakeUploadDir?: string;

src/jobManager.ts

@@ -1,90 +1,94 @@
+import path from 'path';
+
+import fs from 'fs-extra';
 import _ from 'lodash';
 
 import * as sqs from 'turtle/aws/sqs';
 import builders from 'turtle/builders';
-import BuildError from 'turtle/builders/BuildError';
 import { logErrorOnce } from 'turtle/builders/utils/common';
 import config from 'turtle/config';
 import { BUILD } from 'turtle/constants/index';
+import logger from 'turtle/logger';
 import * as buildDurationMetric from 'turtle/metrics/buildDuration';
 import * as buildStatusMetric from 'turtle/metrics/buildStatus';
-import { checkShouldExit, setCurrentJobId, turtleVersion } from 'turtle/turtleContext';
+import { checkShouldExit, setCurrentJobId } from 'turtle/turtleContext';
 import { getPriorities } from 'turtle/utils/priorities';
 import * as redis from 'turtle/utils/redis';
 import { sanitizeJob } from 'turtle/validator';
 
-function _maybeExit(logger: any) {
+const { version: turtleVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf-8'));
+
+function _maybeExit() {
   if (checkShouldExit()) {
     logger.warn('Exiting due to previously received termination signal.');
     process.exit();
   }
 }
 
-export async function doJob(logger: any) {
-  const jobData = await getJob(logger);
-  await processJob(jobData, logger);
-  _maybeExit(logger);
+export async function doJob() {
+  const jobData = await getJob();
+  await processJob(jobData);
+  _maybeExit();
 }
 
-export async function getJob(logger: any) {
-  _maybeExit(logger);
+export async function getJob() {
+  _maybeExit();
   logger.info('Fetching job');
   while (true) {
     try {
       let job = null;
-      const priorities = await getPriorities(logger);
+      const priorities = await getPriorities();
       for (const priority of priorities) {
-        job = await sqs.receiveMessage(priority, logger);
-        _maybeExit(logger);
+        job = await sqs.receiveMessage(priority);
+        _maybeExit();
         if (job != null) {
           job.priority = priority;
           break;
         }
       }
-      _maybeExit(logger);
+      _maybeExit();
       if (job !== null) {
         return job;
       }
     } catch (err) {
-      logger.error({ err }, 'Error at receiving messages');
+      logger.error('Error at receiving messages', err);
     }
   }
 }
 
-async function processJob(jobData: any, logger: any) {
+async function processJob(jobData: any) {
   const receiptHandle = jobData.ReceiptHandle;
   const { priority } = jobData;
   let timeoutId;
   try {
     const rawJob = JSON.parse(jobData.Body);
-    timeoutId = failAfterMaxJobTime(priority, receiptHandle, rawJob, logger);
+    timeoutId = failAfterMaxJobTime(priority, receiptHandle, rawJob);
     const job = await sanitizeJob(rawJob);
 
     setCurrentJobId(job.id);
-    const pingerHandle = sqs.changeMessageVisibilityRecurring(priority, jobData.ReceiptHandle, job.id, logger);
+    const pingerHandle = sqs.changeMessageVisibilityRecurring(priority, jobData.ReceiptHandle, job.id);
 
     logger.info(`Doing job MessageId=${jobData.MessageId} BuildId=${job.id} ${Date.now()}`);
 
-    const cancelled = await redis.checkIfCancelled(job.id, logger);
+    const cancelled = await redis.checkIfCancelled(job.id);
     if (cancelled) {
       logger.info('The job has been cancelled');
     } else {
-      redis.registerListener(job.id, () => deleteMessage(priority, receiptHandle, logger), logger);
-      const startTimestamp = Date.now();
+      redis.registerListener(job.id, () => deleteMessage(priority, receiptHandle));
+      const startTimestamp = +new Date();
       let buildFailed = false;
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
-        const status = await build(job, logger);
-        buildStatusMetric.add(buildType, status);
-        buildFailed = !status;
+        const success = await build(job);
+        buildStatusMetric.add(buildType, success);
+        buildFailed = !success;
       } catch (err) {
         buildStatusMetric.add(buildType, false);
         buildFailed = true;
         throw err;
       } finally {
-        const endTimestamp = Date.now();
+        const endTimestamp = +new Date();
         const turtleBuildDurationSecs = Math.ceil((endTimestamp - startTimestamp) / 1000);
-        logger.info(`BuildID=${job.id} Build duration=${turtleBuildDurationSecs}`);
         buildDurationMetric.addTurtleDuration(buildType, turtleBuildDurationSecs, !buildFailed);
         if (job.messageCreatedTimestamp) {
           const totalBuildDurationSecs = Math.ceil(
@@ -92,13 +96,13 @@ async function processJob(jobData: any, logger: any) {
           );
           buildDurationMetric.addTotalDuration(buildType, totalBuildDurationSecs, !buildFailed);
         }
-        redis.unregisterListeners(logger);
+        redis.unregisterListeners();
       }
       logger.info(`Job done MessageId=${jobData.MessageId} BuildId=${job.id} ${Date.now()}`);
     }
     clearInterval(pingerHandle);
   } finally {
-    await deleteMessage(priority, receiptHandle, logger);
+    await deleteMessage(priority, receiptHandle);
     if (timeoutId) {
       logger.info('Clearing job failer timeout...');
       clearTimeout(timeoutId);
@@ -106,11 +110,11 @@ async function processJob(jobData: any, logger: any) {
   }
 }
 
-function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any, logger: any) {
+function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any) {
   return setTimeout(async () => {
     try {
-      sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion }, logger);
-      await deleteMessage(priority, receiptHandle, logger);
+      sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
+      await deleteMessage(priority, receiptHandle);
     } finally {
       logger.error('Going to terminate turtle agent, just in case...');
       process.exit(1);
@@ -118,48 +122,31 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any,
   }, config.builder.maxJobTimeMs);
 }
 
-async function build(job: any, logger: any) {
-  const startTimestamp = Date.now();
+async function build(job: any) {
   const s3Url = await logger.init(job);
-  const buildLogger = logger.child({ jobID: job.id, experienceName: job.experienceName });
-  const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);
 
   try {
     await sqs.sendMessage(job.id, BUILD.JOB_STATES.IN_PROGRESS, {
       logUrl: s3Url,
       logFormat: 'json',
-    }, buildLogger);
-    const result = await builders[job.platform](job, buildLogger);
-    const buildDuration = calculateBuildDuration();
-    sqs.sendMessage(job.id, BUILD.JOB_STATES.FINISHED, {
-      ...result,
-      turtleVersion,
-      buildDuration,
-    }, buildLogger);
+    });
+    const result = await (builders as any)[job.platform](job);
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.FINISHED, { ...result, turtleVersion });
     return true;
   } catch (err) {
-    logErrorOnce(err, buildLogger);
-    const buildDuration = calculateBuildDuration();
-    let reason;
-    if (err instanceof BuildError) {
-      reason = err.reason;
-    }
-    sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, {
-      turtleVersion,
-      buildDuration,
-      ...reason && { reason },
-    }, buildLogger);
+    logErrorOnce(err);
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
     return false;
   } finally {
     await logger.cleanup(job);
   }
 }
 
-async function deleteMessage(priority: string, receiptHandle: string, logger: any) {
+async function deleteMessage(priority: string, receiptHandle: string) {
   try {
     setCurrentJobId(null);
     await sqs.deleteMessage(priority, receiptHandle);
   } catch (err) {
-    logger.error({ err }, 'Error at deleting msg');
+    logger.error('Error at deleting msg', err);
   }
 }

src/jobsSchemas/ios.ts

@@ -12,13 +12,11 @@ export default baseJobSchema.concat(
     }),
     credentials: Joi.object()
       .keys({
-        certP12: Joi.string().required(),
-        certPassword: Joi.string().required(),
-        teamId: Joi.string().required(),
-        // it's not required for adhoc Expo Client builds
+        certP12: Joi.string(),
+        certPassword: Joi.string(),
+        teamId: Joi.string(),
         provisioningProfile: Joi.string(),
-        appleSession: Joi.string(),
-        udids: Joi.array().items(Joi.string()),
+        password: Joi.string(),
       })
       .when('config.buildType', {
         is: IOS.BUILD_TYPES.SIMULATOR,

src/logger/hackyLogglyStream.ts

@@ -0,0 +1,48 @@
+import EventEmitter from 'events';
+
+import BunyanLoggly from 'bunyan-loggly';
+
+import config from 'turtle/config';
+import * as constants from 'turtle/constants/logger';
+import { IJob } from 'turtle/job';
+
+export interface ILogglyConfig {
+  token: string;
+  subdomain: string;
+  tags: string[];
+}
+
+interface ILogglyExtraFields {
+  jobID: string;
+  experienceName: string;
+}
+
+export default class HackyLogglyStream extends EventEmitter {
+  private logglyStream: BunyanLoggly;
+  private extraFields: ILogglyExtraFields | null;
+
+  constructor(logglyConfig: ILogglyConfig) {
+    super();
+    this.logglyStream = new BunyanLoggly(logglyConfig, config.logger.loggly.buffer);
+    this.extraFields = null;
+  }
+  public init(job: IJob) {
+    this.extraFields = {
+      jobID: job.id,
+      experienceName: job.experienceName,
+    };
+  }
+  public cleanup() {
+    this.extraFields = null;
+  }
+  public write(rec: any) {
+    const { msg: message, hostname: host, level, ...other } = rec;
+    this.logglyStream.write({
+      message,
+      level: constants.LEVELS_MAPPING[level],
+      host,
+      ...other,
+      data: this.extraFields || {},
+    });
+  }
+}

src/logger/index.ts

@@ -4,15 +4,12 @@ import { SentryStream } from 'bunyan-sentry-stream';
 import { Client as RavenClient } from 'raven';
 
 import config from 'turtle/config';
+import * as constants from 'turtle/constants/logger';
 import { IJob } from 'turtle/job';
+import HackyLogglyStream from 'turtle/logger/hackyLogglyStream';
 import S3Stream from 'turtle/logger/s3Stream';
 import { isOffline } from 'turtle/turtleContext';
 
-// type error when using import
-// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
-// tslint:disable-next-line:no-var-requires
-const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
-
 interface IStream {
   stream: any;
   type?: string;
@@ -21,6 +18,7 @@ interface IStream {
 }
 
 export const s3logger = new S3Stream();
+let logglyStream: HackyLogglyStream;
 
 const streams: IStream[] = [];
 
@@ -49,34 +47,53 @@ if (config.sentry.dsn && config.deploymentEnv !== 'development') {
   });
 }
 
-if (config.google.credentials) {
-  const resource = {
-    type: 'generic_node',
-    labels: {
-      node_id: config.hostname,
-      location: '', // default value
-      namespace: '', // default value
-    },
+if (config.logger.loggly.token) {
+  const logglyConfig = {
+    token: config.logger.loggly.token,
+    subdomain: config.logger.loggly.subdomain,
+    // prettier-ignore
+    tags: [
+      'app-shell-apps',
+      `platform.${config.platform}`,
+      `environment.${config.deploymentEnv}`,
+    ],
   };
-  streams.push(new LoggingBunyan({ name: 'turtle', resource }).stream('info'));
+  logglyStream = new HackyLogglyStream(logglyConfig);
+  streams.push({
+    type: 'raw',
+    stream: logglyStream,
+  });
 }
 
 const logger = bunyan.createLogger({
   name: 'turtle',
   level: config.logger.level,
-  platform: config.platform,
-  environment: config.deploymentEnv,
   streams,
 });
 
+logger.withFields = (extraFields: any) => withFields(logger, extraFields);
+
 logger.init = async (job: IJob) => {
+  if (logglyStream) {
+    logglyStream.init(job);
+  }
   return await s3logger.init(job);
 };
 
 logger.cleanup = async () => {
   // a little hacky, but works
   logger.info({ lastBuildLog: true }, 'this is the last log from this build');
+  if (logglyStream) {
+    logglyStream.cleanup();
+  }
   await s3logger.waitForLogger();
 };
 
 export default logger;
+
+export function withFields(loggerObj: any, extraFields: any) {
+  return constants.LEVELS.reduce((obj, level) => {
+    obj[level] = (...args: any[]) => loggerObj[level](extraFields, ...args);
+    return obj;
+  }, {} as any);
+}

src/metrics/buildDuration.ts

@@ -1,10 +1,11 @@
 import * as cloudwatch from 'turtle/aws/cloudwatch';
 import { TYPE_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
+import logger from 'turtle/logger';
 
 const TURTLE_BUILD_DURATION_METRIC_NAME = 'turtleBuildDuration';
 const TOTAL_BUILD_DURATION_METRIC_NAME = 'totalBuildDuration';
 
-export function register(logger: any) {
+export function register() {
   for (const metricName of [TURTLE_BUILD_DURATION_METRIC_NAME, TOTAL_BUILD_DURATION_METRIC_NAME]) {
     logger.info(`Registered AWS Cloudwatch metric: ${metricName}`);
     cloudwatch.registerMetric({

src/metrics/buildStatus.ts

@@ -2,10 +2,11 @@ import * as cloudwatch from 'turtle/aws/cloudwatch';
 import { TYPE_DIMENSIONS } from 'turtle/aws/cloudwatch/dimensions';
 import * as reducers from 'turtle/aws/cloudwatch/reducers';
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 
 const BUILD_METRIC_NAME = 'build';
 
-export function register(logger: any) {
+export function register() {
   logger.info(`Registered AWS Cloudwatch metric: ${BUILD_METRIC_NAME}`);
   cloudwatch.registerMetric({
     metricName: BUILD_METRIC_NAME,

src/metrics/index.ts

@@ -1,11 +1,12 @@
 import * as cloudwatch from 'turtle/aws/cloudwatch';
+import logger from 'turtle/logger';
 import * as buildDuration from 'turtle/metrics/buildDuration';
 import * as buildStatus from 'turtle/metrics/buildStatus';
 
 const metricsToRegister = [buildStatus, buildDuration];
 
-export async function init(logger: any) {
+export async function init() {
   logger.info('Initializing Cloudwatch metrics');
-  await cloudwatch.init(logger);
-  metricsToRegister.forEach((metric) => metric.register(logger));
+  await cloudwatch.init();
+  metricsToRegister.forEach((metric) => metric.register());
 }

src/node_modules/bunyan-loggly/index.d.ts

@@ -0,0 +1,13 @@
+export = BunyanLoggly;
+
+declare class BunyanLoggly {
+  constructor(options: BunyanLoggly.IOptions, bufferLength?: number, bufferTimeout?: number, logglyCallback?: any);
+  public write(data: any): void;
+}
+
+declare namespace BunyanLoggly {
+  interface IOptions {
+    token: string;
+    subdomain: string;
+  }
+}

src/server.ts

@@ -4,12 +4,9 @@ import config from 'turtle/config';
 import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
-import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
+import { checkShouldExit, setShouldExit } from 'turtle/turtleContext';
 
-const REDIS_TURTLE_VERSION_KEY = 'turtle:version';
-
-process.on('unhandledRejection', (err) => logger.error({ err }, 'Unhandled promise rejection'));
+process.on('unhandledRejection', (err) => logger.error('Unhandled promise rejection:', err));
 
 function handleExit() {
   if (checkShouldExit()) {
@@ -31,27 +28,18 @@ async function main() {
   );
   LoggerDetach.configure(logger);
   if (setup[config.platform]) {
-    await setup[config.platform](logger);
+    await setup[config.platform]();
   }
-
-  try {
-    const redis = await getRedisClient(logger, RedisClient.Configuration);
-    await redis.set(REDIS_TURTLE_VERSION_KEY, turtleVersion);
-    logger.info(`Register Turtle version ${turtleVersion} in Redis`);
-  } catch (err) {
-    logger.error({ err }, 'Failed to register Turtle version in Redis');
-  }
-
   while (true) {
     try {
-      await doJob(logger);
+      await doJob();
     } catch (err) {
-      logger.error({ err }, 'Failed to do a job');
+      logger.error('Failed to do a job', err);
     }
   }
 }
 
 main()
   .then(() => logger.error('This should never happen...'))
-  .catch((err) => logger.error({ err }, 'Something went terribly wrong'))
+  .catch((err) => logger.error('Something went terribly wrong :(', err))
   .then(() => process.exit(1));

src/setup/android.ts

@@ -1,7 +1,8 @@
+import logger from 'turtle/logger';
 import commonSetup from 'turtle/setup/common';
 
-export default async function setup(logger: any) {
+export default async function setup() {
   logger.info('Setting up environment...');
-  await commonSetup(logger);
+  await commonSetup();
   logger.info('Finished setting up environment');
 }

src/setup/common.ts

@@ -3,8 +3,8 @@ import fs from 'fs-extra';
 import config from 'turtle/config';
 import * as metrics from 'turtle/metrics';
 
-export default async function commonSetup(logger: any) {
-  await metrics.init(logger);
+export default async function commonSetup() {
+  await metrics.init();
   await fs.remove(config.directories.temporaryFilesRoot);
   await fs.remove(config.directories.tempS3LogsDir);
 }

src/setup/ios.ts

@@ -3,6 +3,7 @@ import os from 'os';
 import path from 'path';
 
 import * as keychain from 'turtle/builders/utils/ios/keychain';
+import logger from 'turtle/logger';
 import commonSetup from 'turtle/setup/common';
 
 async function deleteProvisioningProfilesFromHomedir() {
@@ -16,10 +17,10 @@ async function deleteProvisioningProfilesFromHomedir() {
   }
 }
 
-export default async function setup(logger: any) {
+export default async function setup() {
   logger.info('Setting up environment...');
   await deleteProvisioningProfilesFromHomedir();
   await keychain.cleanUp();
-  await commonSetup(logger);
+  await commonSetup();
   logger.info('Finished setting up environment');
 }

src/turtleContext.ts

@@ -1,10 +1,5 @@
-import fs from 'fs-extra';
-import path from 'path';
 import config from 'turtle/config';
 
-const { version: turtleVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf-8'));
-export { turtleVersion };
-
 let shouldExit = false;
 let currentJobId: string | null = null;
 

src/utils/priorities.ts

@@ -2,6 +2,7 @@ import Joi from 'joi';
 import os from 'os';
 
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 
 export const NORMAL = 'normalPriority';
@@ -39,11 +40,7 @@ export function createDefaultConfigurationKey(platform = config.platform) {
   return `${configPrefix(platform)}:default`;
 }
 
-export async function getPriorities(logger: any) {
-  if (config.env === 'test') {
-    return NORMAL_CONFIGURATION;
-  }
-
+export async function getPriorities() {
   try {
     const redis = await getRedisClient(RedisClient.Configuration);
     if (redis.getConfig === undefined) {
@@ -59,23 +56,24 @@ export async function getPriorities(logger: any) {
       logger.debug(`Using configuration at index ${configurationsIndex} pulled from redis`);
       const { error, value: configValue } = configSchema.validate(configurations[configurationsIndex]);
       if (error) {
-        logger.warn({ err: error });
+        logger.warn(error);
         throw new Error('Received configuration is not valid');
       }
       return configValue;
     } catch (err) {
-      logger.warn({ err });
+      logger.warn(err);
       const defaultConfig = JSON.parse(await redis.get(createDefaultConfigurationKey()));
       const { error, value: defaultConfigValue } = configSchema.validate(defaultConfig);
       if (error) {
-        logger.warn({ err: error });
+        logger.warn(error);
         throw new Error('Received default configuration is not valid');
       }
       logger.warn('Using default configuration pulled from redis');
       return defaultConfigValue;
     }
   } catch (err) {
-    logger.warn({ err }, 'Using configuration chosen locally');
+    logger.warn(err);
+    logger.warn('Using configuration chosen locally');
     if (Math.random() < 0.7) {
       return HIGH_CONFIGURATION;
     } else {

src/utils/redis.ts

@@ -1,6 +1,7 @@
 import Redis from 'ioredis';
 
 import config from 'turtle/config';
+import logger from 'turtle/logger';
 
 const MILLIS_TO_UPLOAD_LOGS = 3000;
 export const MILLIS_CONNECTION_TIMEOUT = 10000;
@@ -46,31 +47,31 @@ const redisClients: IRedisClients = {
   [RedisClient.Configuration]: null,
 };
 
-export async function getRedisClient(logger: any, type = RedisClient.Default) {
+export async function getRedisClient(type = RedisClient.Default) {
   if (!redisClients[type]) {
     try {
       redisClients[type] = await connect(MILLIS_CONNECTION_TIMEOUT, type);
     } catch (err) {
-      logger.error({ err });
+      logger.error(err);
     }
   }
   return redisClients[type];
 }
 
-export async function checkIfCancelled(jobId: string, logger: any) {
+export async function checkIfCancelled(jobId: string) {
   try {
-    const redis = await getRedisClient(logger);
+    const redis = await getRedisClient();
     return await redis.get(`jobs:cancelled:${jobId}`);
   } catch (err) {
     if (config.deploymentEnv === 'development') {
       logger.warn('Did you turn on redis server? Run `yarn start-docker` in server/www');
     }
-    logger.error({ err });
+    logger.error(err);
     return false;
   }
 }
 
-export async function registerListener(jobId: string, deleteMessage: any, logger: any) {
+export async function registerListener(jobId: string, deleteMessage: any) {
   try {
     const redis = await getRedisClient(RedisClient.Subscriber);
     redis.subscribe('jobs:cancelled');
@@ -87,9 +88,9 @@ export async function registerListener(jobId: string, deleteMessage: any, logger
   }
 }
 
-export async function unregisterListeners(logger: any) {
+export async function unregisterListeners() {
   try {
-    const redis = await getRedisClient(logger);
+    const redis = await getRedisClient();
     redis.removeAllListeners('message');
   } catch (err) {
     logger.error(err);

test-ci-android.sh

@@ -1,25 +1,34 @@
 #!/usr/bin/env bash
 
-set -ueo pipefail
-
 export NODE_ENV=test
 
 export ENVIRONMENT="development"
 export AWS_ACCESS_KEY_ID="aws_id"
 export AWS_SECRET_ACCESS_KEY="secret"
-export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_android_in.fifo"
-export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_android_in_priority.fifo"
-export AWS_SQS_IOS_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in.fifo"
-export AWS_SQS_IOS_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in_priority.fifo"
-export AWS_SQS_OUT_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_out.fifo"
+export AWS_SQS_IOS_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_staging_ios_in.fifo"
+export AWS_SQS_IOS_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_staging_ios_in.fifo"
+export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_staging_android_in.fifo"
+export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_staging_android_in.fifo"
+export AWS_SQS_OUT_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_staging_out.fifo"
 export AWS_SQS_REGION="aws.west2"
 export AWS_S3_BUCKET="exp-shell-app-assets"
 export AWS_S3_REGION="us-west-1"
 export AWS_CLOUDWATCH_REGION="us-west-1"
 export API_PROTOCOL="http"
-export API_HOSTNAME="staging.expo.io"
-export API_PORT="443"
+export API_HOSTNAME="localhost"
+export API_PORT="3000"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
 yarn test:smoke:android
+smoke_result=$?
+
+yarn test:unit
+unit_result=$?
+
+[[ $smoke_result != 0 || $unit_result != 0 ]] && \
+	echo && \
+	echo "Tests failed." && \
+	exit -1
+
+exit 0