[changelog] Update CHANGELOG

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
     working_directory: ~/turtle
   mac:
     macos: # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: "11.1.0"
+      xcode: '10.1.0'
     working_directory: /Users/distiller/project
     shell: /bin/bash -leo pipefail
   android:
@@ -57,8 +57,8 @@ commands:
       - 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
+              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:
@@ -77,49 +77,6 @@ commands:
             EOF
             chmod +x /bin/rm
 
-  install_nodejs_mac:
-    parameters:
-      nodejs_version:
-        type: string
-        default: 12.16.1
-      yarn_version:
-        type: string
-        default: 1.22.0
-    steps:
-      - restore_cache:
-          key: "node-js-v1-darwin-archive-<< parameters.nodejs_version >>"
-      - run:
-          name: Uninstall yarn with brew
-          command: brew uninstall --force yarn
-      - install_node_and_yarn:
-          platform: darwin
-          nodejs_version: "<< parameters.nodejs_version >>"
-          yarn_version: "<< parameters.yarn_version >>"
-      - save_cache:
-          key: "node-js-v1-darwin-archive-<< parameters.nodejs_version >>"
-          paths:
-            - /private/tmp/nodejs.tar.xz
-
-  install_node_and_yarn:
-    parameters:
-      platform:
-        type: string
-      nodejs_version:
-        type: string
-      yarn_version:
-        type: string
-    steps:
-      - run:
-          name: Install node & yarn
-          command: |
-            NODEJS_ARCHIVE="/tmp/nodejs.tar.xz"
-            if [ ! -f "$NODEJS_ARCHIVE" ]; then
-              curl -o $NODEJS_ARCHIVE -SL "https://nodejs.org/dist/v<< parameters.nodejs_version >>/node-v<< parameters.nodejs_version >>-<< parameters.platform >>-x64.tar.xz"
-            fi
-            tar -xJf $NODEJS_ARCHIVE -C /usr/local --strip-components=1 --exclude CHANGELOG.md --exclude README.md --exclude LICENSE
-            ln -s /usr/local/bin/node /usr/local/bin/nodejs
-            npm install --global yarn@<< parameters.yarn_version >>
-
   decrypt_secrets_if_possible:
     steps:
       - run:
@@ -136,24 +93,18 @@ commands:
       workingdir:
         type: string
         default: .
-      platform:
-        type: string
-        default: linux
     steps:
       - restore_cache:
-          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
 
   save_yarn_cache:
     parameters:
       workingdir:
         type: string
         default: .
-      platform:
-        type: string
-        default: linux
     steps:
       - save_cache:
-          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v1-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
           paths:
             - ~/.cache/yarn # `yarn cache dir`
 
@@ -164,10 +115,10 @@ commands:
         default: ios
       sdk_version:
         type: string
-        default: sdk39
+        default: sdk32
     steps:
       - restore_cache:
-          key: "workingdir-v2-<< parameters.platform >>-<< parameters.sdk_version >>"
+          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
 
   save_workingdir_cache:
     parameters:
@@ -179,30 +130,13 @@ commands:
         default: ios
       sdk_version:
         type: string
-        default: sdk39
+        default: sdk32
     steps:
       - save_cache:
-          key: "workingdir-v2-<< parameters.platform >>-<< parameters.sdk_version >>"
+          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
           paths:
             - "<< parameters.workingdir >>/<< parameters.platform >>/<< parameters.sdk_version >>"
 
-  deploy_turtle:
-    parameters:
-      platform:
-        type: string
-      env:
-        type: string
-    steps:
-      - checkout
-      - run:
-          name: Install curl & jq
-          command: nix-env -iA nixpkgs.curl nixpkgs.jq
-      - run:
-          name: Schedule a Turtle deploy
-          command: |
-            echo "We're going to deploy << parameters.platform >> Turtles to << parameters.env >>"
-            ./scripts/deploy.sh "<< parameters.platform >>" "<< parameters.env >>"
-
 jobs:
   build:
     executor: nix
@@ -229,23 +163,20 @@ jobs:
     executor: mac
     steps:
       - install_nix
-      - install_nodejs_mac
       - setup
       - decrypt_secrets_if_possible
-      - restore_yarn_cache:
-          platform: darwin
+      - restore_yarn_cache
       - run: yarn
-      - save_yarn_cache:
-          platform: darwin
+      - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk39
+          sdk_version: sdk32
           platform: ios
       - run:
           name: Run iOS smoke tests
-          command: SDK_VERSION=sdk39 ./scripts/tests/runIOSSmokeTestsCI.sh
+          command: ./scripts/tests/runIOSSmokeTestsCI.sh
       - save_workingdir_cache:
           workingdir: /Users/distiller/project/workingdir
-          sdk_version: sdk39
+          sdk_version: sdk32
           platform: ios
 
   android_smoke_tests:
@@ -257,11 +188,11 @@ jobs:
       - run: yarn
       - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk39
+          sdk_version: sdk32
           platform: android
       - run:
           name: Fetch Android shell app
-          command: SDK_VERSION=sdk39 ./scripts/android/fetchRemoteAndroidTarball.sh
+          command: SDK_VERSION=sdk32 ./scripts/android/fetchRemoteAndroidTarball.sh
       - run:
           name: Run Android smoke tests
           command: |
@@ -269,37 +200,9 @@ jobs:
               --run "./scripts/tests/runAndroidSmokeTestsCI.sh"
       - save_workingdir_cache:
           workingdir: ~/turtle/workingdir
-          sdk_version: sdk39
+          sdk_version: sdk32
           platform: android
 
-  android_staging_deploy:
-    executor: nix
-    steps:
-      - deploy_turtle:
-          platform: android
-          env: staging
-
-  android_production_deploy:
-    executor: nix
-    steps:
-      - deploy_turtle:
-          platform: android
-          env: production
-
-  ios_staging_deploy:
-    executor: nix
-    steps:
-      - deploy_turtle:
-          platform: ios
-          env: staging
-
-  ios_production_deploy:
-    executor: nix
-    steps:
-      - deploy_turtle:
-          platform: ios
-          env: production
-
 workflows:
   checks:
     jobs:
@@ -307,25 +210,5 @@ workflows:
   tests:
     jobs:
       - unit_tests
-  deploy:
-    jobs:
-      - android_staging_approve_deploy:
-          type: approval
-      - android_staging_deploy:
-          requires:
-            - android_staging_approve_deploy
-      - android_production_approve_deploy:
-          type: approval
-      - android_production_deploy:
-          requires:
-            - android_production_approve_deploy
-      - ios_staging_approve_deploy:
-          type: approval
-      - ios_staging_deploy:
-          requires:
-            - ios_staging_approve_deploy
-      - ios_production_approve_deploy:
-          type: approval
-      - ios_production_deploy:
-          requires:
-            - ios_production_approve_deploy
+      - ios_smoke_tests
+      - android_smoke_tests

.envrc

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

.envrc.local.example

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

.github/ISSUE_TEMPLATE/BUG_REPORT.md

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

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

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

.github/ISSUE_TEMPLATE/QUESTION.md

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

.github/PULL_REQUEST_TEMPLATE

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

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

@@ -1,3 +1,5 @@
+!/src/node_modules
+
 node_modules
 yarn-error.log
 google-cloud-credentials.json
@@ -5,13 +7,8 @@ google-cloud-credentials.json
 /build/
 /workingdir/*
 /artifacts/*
-.history
-.vscode/
-
 shell.apk
 .secrets*
 
 *.swp
 *.swo
-
-.envrc.local

.nvmrc

@@ -1 +1 @@
-v12.16.1
+v8.15.1

.release-it.json

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

.secrets.local-common

@@ -6,4 +6,3 @@ SENTRY_DSN=""
 ENVIRONMENT="development"
 REDIS_URL="redis://localhost:6379/0"
 REDIS_CONFIG_URL="redis://localhost:6379/0"
-TURTLE_SDK_VERSIONS_SECRET_TOKEN="xeiw7yigha<a_r5aich!oW9Ik2eish8the9Na6Jae-ghoo5ua/t8nu5AeheiTew4"

CHANGELOG.md

@@ -1,875 +1,156 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
-
-- Add Android beta tarball for SDK 43
-- Add iOS beta tarball for SDK 43
-- Bump xdl to fix Android shell app for SDK 43
-
-# [0.22.6] - 2021-10-01
-
-- add `ACCESS_MEDIA_LOCATION` to blacklist for android permissions
-- disable automatic versioning in Xcode 13
-
-# [0.22.5] - 2021-09-09
-
-- Fix s3 logger stream close crash.
-- Update Android tarballs SDK 42, 41, 40, and 39 to include location workaround.
-- Update Android tarball to include a local assets fix on SDK 42.
-
-# [0.22.4] - 2021-07-27
-
-- Update iOS and Android tarballs for SDK 42.
-
-# [0.22.3] - 2021-07-02
-
-- Update Android tarball for SDK 42.
-
-# [0.22.1] - 2021-06-29
-
-- Update iOS and Android beta tarballs for SDK 42.
-
-# [0.22.0] - 2021-06-22
-
-- Add iOS and Android beta tarballs for SDK 42.
-
-# [0.21.9] - 2021-06-15
-
-- Update `sharp` package, fixes support for M1 macs.
-
-# [0.21.8] - 2021-05-25
-
-- Update Android SDK41 tarball.
-
-# [0.21.7] - 2021-05-21
-
-- Update iOS SDK41 tarball.
-- Update Android SDK41 tarball.
-
-# [0.21.6] - 2021-04-22
-
-- Update iOS SDK41 tarball.
-- Update Android SDK41 tarball.
-
-# [0.21.5] - 2021-04-15
-
-- Revert iOS client tarball for SDK 41, use the SDK 40 tarball. No longer supporting this feature in SDK 41+.
-- Update Android SDK 41 tarball.
-
-# [0.21.4] - 2021-04-13
-
-- Update iOS client tarball for SDK 41.
-
-# [0.21.3] - 2021-04-13
-
-- Update SDK 41 tarball for iOS and Android.
-
-# [0.21.2] - 2021-04-07
-
-- Update SDK 41 beta tarball for Android.
-
-# [0.21.1] - 2021-04-01
-
-- Update SDK 41 beta tarball for iOS.
-
-# [0.21.0] - 2021-03-29
-
-- Add SDK 41 beta tarballs.
-- Bump @expo/xdl to 59.1.0.
-
-# [0.20.7] - 2021-01-26
-
-- Remove Go suffix from android app name
-
-# [0.20.6] - 2021-01-25
-
-- Update tarballs for SDK 40 patch release (3e345dd)
-
-# [0.20.5] - 2020-12-23
-
+## [Unreleased]
 ### Changed
-
-- Updated SDK 40 Android tarball to fix `expo-location` background permissions on Android <9.
-
-# [0.20.4] - 2020-12-17
-
-### Changed
-
-- Updated SDK 40 iOS tarball to fix `expo-notifications` not emitting initial notification response.
-
-# [0.20.3] - 2020-12-10
-
-### Fixed
-
-- Verify jq installation before proceeding with release ([#281](https://github.com/expo/turtle/pull/281)).
-- Fixed the iOS build when running offline and user lacks elevated permissions.
-
-# [0.20.2] - 2020-12-09
-
-### Changed
-
-- Updated SDK 40 Android tarball to fix `expo-notifications` installation identifier changing as a bug.
-
-# [0.20.1] - 2020-12-08
-
-### Changed
-
-- Update SDK 40 iOS and Android tarballs for release
-
-# [0.20.0] - 2020-11-30
-
-- Add SDK 40 tarballs in preparation for SDK 40 beta
-
-# [0.19.1] - 2020-11-19
-
-### Fixed
-
-- Fixed the iOS build using Xcode 12.1 by runnig `xcrun simctl list` before the build phase.
-- Rebuild iOS tarballs (SDK 36, 37, 38, 39, Ad-Hoc Client) with Xcode 12.1 containing iOS 14 image fix.
-
-# [0.19.0] - 2020-11-13
-
-### Changed
-
-- Rebuild iOS tarballs (SDK 36, 37, 38, 39, Ad-Hoc Client) with Xcode 12.1.
-
-# [0.18.9] - 2020-11-09
-
-### Fixed
-
-- Updated xdl to 58.0.20 to fix an issue with updates.checkAutomatically not being applied properly to SDK 39 Android apps.
-
-# [0.18.8] - 2020-10-27
-
-### Fixed
-
-- Fix issues with Reanimated v2 in Android SDK 39 tarball.
-
-# [0.18.7] - 2020-10-23
-
-### Fixed
-
-- Fix issue with updates in self-hosted Android apps ([#10746](https://github.com/expo/expo/issues/10746)) in the SDK 39 tarball
-
-# [0.18.6] - 2020-10-22
-
-### Fixed
-
-- Fix issues with notifications ([10624](https://github.com/expo/expo/pull/10624) and [10608](https://github.com/expo/expo/pull/10608)) in the Android SDK 39 tarball.
-
-# [0.18.5] - 2020-10-07
-
-### Fixed
-
-- Always add expo-notifications for SDK >= 39 projects with android.enableDangerousExperimentalLeanBuilds enabled.
-
-# [0.18.4] - 2020-10-06
-
-### Fixed
-
-- Fixed an issue with notifications ([expo/expo#10562](https://github.com/expo/expo/issues/10562)) in the Android SDK 39 tarball.
-
-# [0.18.3] - 2020-10-03
-
-### Fixed
-
-- Update @expo/xdl to fix regression in SDK <= 39 splash
-
-# [0.18.2] - 2020-10-03
-
-### Fixed
-
-- Updated SDK 39 Android tarball.
-- Updated SDK 39 iOS tarball.
-- Updated iOS client tarball.
-- Update @expo/config and @expo/xdl. Temporarily bring in type definitions for color-string and xcode.
-
-## [0.18.1] - 2020-09-22
-
-### Fixed
-
-- Fix building apps using SDK 39 for Android.
-
-## [0.18.0] - 2020-09-21
-
-### Added
-
-- Added iOS and Android shell apps for SDK 39.
-
-### Removed
-
-- Dropped support for SDK 35.
-
-## [0.17.3] - 2020-09-14
-
-### Added
-
-- Added gradle 6.2 to `turtle-android-base`
-- Added `ANDROID_NDK_HOME` in `turtle-android-base`
-
-### Changed
-
-- Upgraded XDL so it processes root `build.gradle` of Android shell apps too
-
-## [0.17.2] - 2020-08-06
-
-### Changed
-
-- Updated iOS shell app for SDK 38 with fixed integer tagging in expo-gl for iOS 14. ([#245](https://github.com/expo/turtle/pull/245))
-
-## [0.17.1] - 2020-08-05
-
-### Changed
-
-- Updated Android shell app for SDK 38 with `targetSdkVersion` bumped to 29. ([#244](https://github.com/expo/turtle/pull/244))
-
-## [0.17.0] - 2020-07-16
-
-### Added
-
-- `--gradle-args` option for `turtle build:android` which makes it possible to specify custom Gradle arguments.
-
-### Changed
-
-- Gradle Wrapper doesn't print when dots when the appropriate version of Gradle is being downloaded.
-
-## [0.16.2] - 2020-07-01
-
-### Added
-
-- Added `--allow-non-https-public-url` to allow bypass of protocol validation on `--public-url`.
-- Added support for dynamic configs (`app.config.ts`, `app.config.js`).
-
-## [0.16.0] - 2020-06-25
-
-### Added
-
-- Added iOS shell app for Expo SDK38.
-- Added Android shell app for SDK 38.
-
-### Removed
-
-- Dropped support for SDK 34.
-
-## [0.15.1] - 2020-06-22
-
-### Changed
-
-- Configure Turtle to use the Redis CA certificate.
-
-### Fixed
-
-- Fix announcing supported SDK versions.
-
-## [0.15.0] - 2020-06-02
-
-### Changed
-
-- Updated `@expo/xdl` to 57.9.13 (added \*.bak files clean-up when building .ipa).
-
-## [0.14.12] - 2020-05-14
-
-### Changed
-
-- Update iOS custom client shell app with various fixes.
-
-## [0.14.11] - 2020-05-04
-
-### Changed
-
-- Update SDK 37 iOS shell app with various fixes.
-
-## [0.14.10] - 2020-05-01
-
-### Added
-
-- support for "android.enableDangerousExperimentalLeanBuilds" in app.json.
-
-## [0.14.9] - 2020-04-21
-
-### Changed
-
-- Updated `@expo/xdl` to 57.8.30 (scoped the build command so it only builds the `:app` Android sub-project and not all the sub-projects available, [PR](https://github.com/expo/expo-cli/pull/1937)).
-
-## [0.14.8] - 2020-04-20
-
-### Changed
-
-- Updated `@expo/xdl` to 57.8.29 (removed call to `check-dynamic-macros-android.sh`, [PR](https://github.com/expo/expo-cli/pull/1933)).
-
-## [0.14.7] - 2020-04-20
-
-### Changed
-
-- Turtle no longer installs all dependencies of shell apps projects — only the production dependencies are installed now.
-- Updated `@expo/xdl` to 57.8.25 (fixed unintuitive `google-services.json` handling for SDK37+, [PR](https://github.com/expo/expo-cli/pull/1897)).
-
-## [0.14.6] - 2020-04-09
-
-### Changed
-
-- Updated @expo/xdl to 57.8.17 (fixed downloading assets smaller than 10 bytes).
-
-## [0.14.5] - 2020-04-06
-
-### Changed
-
-- Made @expo/config error more meaningful.
-
-## [0.14.4] - 2020-04-06
-
-### Fixed
-
-- Determining SDK version for Expo apps using SDK >=37.
-
-## [0.14.3] - 2020-04-03
-
-### Fixed
-
-- A fix for Android SDK 37 - `check-dynamic-macros-android.sh` doesn't use `jq` anymore.
-
-## [0.14.1] - 2020-04-01
-
-### Changed
-
-- Updated iOS shell app for SDK 37 to remove unnecessary unimodules.
-
-## [0.14.0] - 2020-03-31
-
-### Added
-
-- Added iOS shell app for SDK 37.
-- Added Android shell app for SDK 37.
-
-### Changed
-
-- Updated iOS client shell app to support SDK 37.
-- Replace `/` with `__` in the artifact filename to fix a strange bug with selecting APK file in Android Studio.
-- Print currently using Java version if it's not 8.
-
-### Removed
-
-- Dropped support for SDK 33.
-
-## [0.13.10] - 2020-03-09
-
-### Added
-
-- Added validation for `--public-url`.
-
-### Changed
-
-- Changed the way of installing NDK - it's installed with `sdkmanager` now.
-- Upgraded NDK to 17.2.4988734.
-- Upgraded Node.js version to 12.16.1.
-
-### Fixed
-
-- A bug where the `platform` field in logs wasn't set correctly when using a shortcut command.
-- Removed all remaining instances of `UIWebView` in iOS app builds.
-
-### Removed
-
-- Dropped support for Node.js versions older than 10.
-- Dropped support for building Expo SDK 31 and 32 apps.
-
-## [0.13.9] - 2020-02-13
-
-### Fixed
-
-- Fixed Notifications.getDevicePushTokenAsync() erroring occasionally on iOS SDK 36.
-
-## [0.13.8] - 2020-01-27
-
-### Fixed
-
-- Fixed `react-native-maps` native module not being properly initialized (https://github.com/expo/expo/pull/6844)
-- Fixed Android standalone apps crashing on startup (https://github.com/expo/expo/pull/6825)
-
-## [0.13.7] - 2020-01-15
-
-### Added
-
-- Bumped `traveling-fastlane` to 1.11.4 to update CA certs
-
-## [0.13.6] - 2019-12-17
-
-### Fixed
-
-- Fixed issue with missing request handler for assets-library urls.
-
-## [0.13.4] - 2019-12-13
-
-### Added
-
-- Support for building iOS apps with a wildcard provisioning profile.
-
-## [0.13.3] - 2019-12-12
-
-### Fixed
-
-- Removed private API usage from iOS SDK 36 tarball
-
-## [0.13.2] - 2019-12-10
-
-### Fixed
-
-- Fixed Android App Bundle builds
-- Fixed issue with Root View Background Color and AppLoading on Android SDK 36 builds
-
-## [0.13.1] - 2019-12-09
-
-### Fixed
-
-- Fixed Android shell app for SDK 36
-
-## [0.13.0] - 2019-12-09
-
-### Added
-
-- Added iOS and Android shell apps for SDK 36
-
-### Changed
-
-- Updated iOS client shell app to support SDK 36
-
-## [0.12.12] - 2019-11-22
-
-### Fixed
-
-- A bug that caused `expo.owner` value not to be used if defined.
-
-## [0.12.11] - 2019-11-20
-
-### Added
-
-- Bumped `traveling-fastlane` to 1.11.0
-
-## [0.12.10] - 2019-11-15
-
-### Added
-
-- Add `shellAppSdkVersion` param to `IOSShellAppBuilder` so entitlement keys get properly added in (https://github.com/expo/turtle/pull/162)
-
-## [0.12.9] - 2019-11-14
-
-### Added
-
-- Support for customizing Facebook SDK behavior at buildtime (autoinitialization, logging app events, logging Advertiser ID) (https://github.com/expo/expo/pull/5924)
-
-## [0.12.8] - 2019-10-29
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix `Linking.openUrl` not opening app if it's already foregrounded (https://github.com/expo/expo/issues/6058)
-- Enforce Java 8 when using turtle-cli.
-
-## [0.12.7] - 2019-10-25
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix occasional crash in background due to GCM registration service (https://github.com/expo/expo/issues/4207)
-
-## [0.12.5] - 2019-10-18
-
-### Changed
-
-- Updated iOS shell app for SDK 35 to fix crash when calling `WebBrowser.dismissBrowser` on iOS 13 (https://github.com/expo/expo/issues/5742)
-
-## [0.12.4] - 2019-10-11
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix occasional crash on launch (https://github.com/expo/expo/issues/5917)
-
-## [0.12.3] - 2019-10-09
-
-### Changed
-
-- Updated iOS client shell app for SDK 35 to fix it from crashing on startup due to having an incomplete GoogleService-Info.plist file.
-
-## [0.12.2] - 2019-09-27
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix crash on Android <=7 due to battery module
-
-## [0.12.1] - 2019-09-20
-
-### Changed
-
-- Updated iOS shell apps for SDK 33 and 34 to fix iOS 13 issues with fishhook, notification tokens, and ShareSheet
-- Updated iOS shell app for SDK 35 with a minor fix
-
-## [0.12.0] - 2019-09-19
-
-### Added
-
-- Support for SDK 35 iOS and Android builds.
-
-### Removed
-
-- Support for SDK 27-30 iOS and Android builds.
-
-## [0.11.3] - 2019-09-19
-
-### Changed
-
-- Updated SDK34 Android shell app with `expo-branch` fixes.
-
-## [0.11.2] - 2019-08-21
-
-### Added
-
-- Support for GoogleService-Info.plist (>=34.0.0).
-
-## [0.11.1] - 2019-08-08
-
-### Changed
-
-- Updated iOS client shell app with the latest fixes (up to 2.12.3).
-
-## [0.11.0] - 2019-08-07
-
-### Changed
-
-- Enabled back optional modules support, but only for specific unimodules.
-- Updated SDK34 Android shell app with the latest fixes (up to 2.12.2).
-- Updated SDK34 iOS shell app with the latest fixes (up to 2.12.3).
-
-## [0.10.0] - 2019-08-01
-
-### Changed
-
-- Fully disabled optional modules on Android for now.
-- Updated iOS shell apps for SDK 33 and 34 to fix scoped permissions issue.
-- Updated Android shell app for SDK 34 to work after disabling optional modules.
-
-## [0.9.1] - 2019-07-29
-
-### Changed
-
-- `release-it` version to `12.3.4`.
-
-## [0.9.0] - 2019-07-29
-
-### Added
-
-- Android, iOS standalone shell apps and iOS Expo client shell app for SDK34.
-- Xcode license check for iOS builds.
-
-### Fixed
-
-- Setting `Constants.nativeAppVersion` for Android standalone builds (actually fixed in [expo/expo-cli#878](https://github.com/expo/expo-cli/pull/878)).
-- Passing `expo.android.config` object from `app.json` to the Android builder.
-- Fixed crash on launch for iOS standalone apps on iOS 13 (all SDK versions).
-- Fixed occasional issue on iOS (SDK 33) where the JS bundle cannot be found ("No cache exists for this resource: shell-app.bundle") and a reload would be required.
-
-## [0.8.11] - 2019-07-16
-
-### Fixed
-
-- Android debug builds.
-
-## [0.8.10] - 2019-07-16
-
-### Fixed
-
-- iOS simulator builds.
-
-## [0.8.9] - 2019-07-15
-
-### Fixed
-
-- User authentication.
-
-## [0.8.8] - 2019-07-11
-
-### Fixed
-
-- LocalAuthentication module on iOS (fixes [expo/expo#663](https://github.com/expo/expo/issues/663)).
-
-## [0.8.7] - 2019-07-05
-
-### Added
-
-- Adhoc Builds: use provisioningProfileId if specified.
-- Registering supported SDK versions in Redis.
-- Support for 64 bit builds in SDK33.
-
-## [0.8.6] - 2019-06-25
-
-### Added
-
-- Added support for Android build modes: debug or release.
-
-### Fixed
-
-- Upgrading the shell app for a given SDK version when the previous version is already downloaded (bug in `turtle-cli`).
-- Updated Android shell app for SDK33 to include `[email protected]` which fixes crashes on Android 9.0 when showing some Lottie animations.
-- Schema for `buildModes`.
-- Updated @expo/xdl to 55.0.7 (fixed reading from binary plist).
-
-## [0.8.4] - 2019-06-13
-
-### Changed
-
-- Upgraded `sharp` from `0.21.3` to `0.22.1`.
-- `gulp-cli` is no longer required to build an app with `turtle-cli`.
-
-## [0.8.3] - 2019-06-13
-
-### Added
-
-- Running Android Turtle process with `supervisor` (pod is restarted if there were 5 failures in the last 10 minutes).
-
-### Changed
-
-- `turtle-cli` is now fetching the app manifest before running the build.
-
-## [0.8.2] - 2019-06-11
-
-### Changed
-
 - Updated Android shell app for SDK33 to remove `expo-face-detector` and `expo-payments-stripe` from standalone builds.
-- Updated Android shell app for SDK33 to get rid of `node_modules` for `tools-public`.
-- From now on, `turtle-cli` installs dependencies for `tools-public` in shell apps for SDK versions < 33.
-
-### Fixed
-
-- Android builds with turtle-cli by installing all unmodules if `dependencies` is empty.
 
 ## [0.8.1] - 2019-06-10
-
 ### Changed
-
 - Add expo dependencies when resolving unimodules.
-
 ### Fixed
-
 - Support for Android tarballs without `universe-package.json`.
 
 ## [0.8.0] - 2019-06-07
-
 ### Added
-
 - Turtle CLI logo to the project (created by [@zularizal](https://github.com/zularizal))!
 - Shell apps for SDK 33.
-- Support for Android App Bundles (App bundles are built by default, use `-t apk` to build apk).
-
+- Support for Android App Bundles.
 ### Changed
-
 - Updated Android shell app for SDK 32 to fix AppAuth issue (https://github.com/expo/expo/pull/4115) and to fix a newer than expected JSC version.
 - Default value for build timeout to 15 minutes.
 - Added filtering of logs (strips out download progress) when downloading SDK tools.
 - `xdl` -> `@expo/xdl`, updated `@expo/xdl`.
-
 ### Fixed
-
 - Generating Android keystore in turtle when one is not passed to turtle-cli (https://github.com/expo/turtle/pull/65).
 - Upload logs to s3 if build has been canceled or timed out.
 - Unhandled exception on asset download (xdl).
 
 ## [0.7.2] - 2019-05-09
-
 ### Added
-
 - Support for Android tarballs without `universe-package.json`.
-
 ### Changed
-
 - Upgraded `@expo/traveling-fastlane-darwin` to 1.9.4 (fixes issues with generating provisioning profiles for ad-hoc builds).
-
 ### Removed
-
 - Support for `CLIENT_LOGGER_LEVEL` env variable.
 
 ## [0.7.1] - 2019-05-06
-
 ### Fixed
-
 - Resolving `fastlane` version when `LC_ALL` is not set.
 
 ## [0.7.0] - 2019-05-06
-
 ### Added
-
 - Support for custom Android builds.
-
 ### Changed
-
 - Refactored logger.
-
 ### Fixed
-
 - `platform` log field wrongly set to `ios` for Android builds (when using `turtle-cli`).
 - Brought back `jobID` and `experienceName` fields to Android logs.
 
 ## [0.6.1] - 2019-04-23
-
 ### Added
-
 - Checking fastlane version before running build (turtle-cli).
-
 ### Changed
-
 - Updated iOS shell app for SDK 32 to fix AppAuth issue.
 - Babel replaced by ttypescript.
 - Updated xdl to 53.5.3 and @expo/spawn-async to 1.4.2, so that error stack traces should be more informative now.
-
 ### Fixed
-
 - Brought back `jobID` and `experienceName` fields to GCloud logs.
-
 ### Removed
-
 - `buidAndroidTarballLocally.sh` script (it has been moved to expo repository - [expo/expo#4022](https://github.com/expo/expo/pull/4022)).
 
 ## [0.6.0] - 2019-04-09
-
 ### Changed
-
 - Removed Branch module from Android shell apps for all SDK versions.
 
 ## [0.5.15] - 2019-04-03
-
 ### Added
-
 - Turtle smoke tests are now being executed on CircleCI from the context of this repository.
-
 ### Changed
-
 - Updated iOS shell app for SDK 32 (fixes [this loading issue for slow connections](https://github.com/expo/expo/issues/3574)).
 - Minor infra changes (doesn't affect users).
 - Error logs format - error objects are now passed in an object being passed as the first argument to logger function.
-
 ### Removed
-
 - Sending logs to loggly.
 
 ## [0.5.14] - 2019-03-22
-
 ### Added
-
 - `--config` parameter for turtle-cli commands, which allows to specify a custom path to app.json file
-
 ### Changed
-
 - Updated iOS shell app for SDK 32 (fixes [this notifications issue](https://github.com/expo/expo/issues/3663)).
 
 ## [0.5.13] - 2019-03-12
-
 ### Added
-
 - Android SDK version support validation.
-
 ### Changed
-
 - iOS Enterprise builds don't compile bitcode now.
 
 ## [0.5.12] - 2019-02-26
-
 ### Added
-
 - Google Cloud logger (as a bunyan stream).
-
 ### Changed
-
 - Android builder passes the manifest from a build job message if it's available.
 
 ## [0.5.11] - 2019-02-22
-
 ### Added
-
 - Builder for iOS client apps.
 
 ## [0.5.10] - 2019-02-19
-
 ### Added
-
-- Registering Turtle version in Redis.
-
+- Register Turtle version in Redis.
 ### Changed
-
 - Update Android shell app for SDK 32 to fix [update](https://github.com/expo/expo/issues/3504) and [back button](https://github.com/expo/expo/issues/1786) issues.
 
 ## [0.5.9] - 2019-02-06
-
 - Update iOS shell app for SDK 32 (fixes bare notifications [issue](https://github.com/expo/expo/issues/3223)).
 
 ## [0.5.7] - 2019-01-31
-
 - Update Android shell app for SDK 32 to fix bundled assets issue.
 
 ## [0.5.6] - 2019-01-25
-
 - Update iOS shell app for SDK 30, 31 and 32 (built with xcode 10.1).
 
 ## [0.5.5] - 2019-01-24
-
 ### Added
-
 - Sending build duration in AWS SQS messages (of `FINISHED` and `ERRORED` types).
 
 ## [0.5.4] - 2019-01-22
-
 ### Changed
-
 - Update iOS shell app for SDK32 to [`expo/expo#0847c10`](https://github.com/expo/expo/commit/0847c1073d38c366866f3d9279ddd662da47dc9b), i.e. v2.10.3 with fixed WebView navigation scheme and upgraded Facebook SDK.
 
 ## [0.5.3] - 2019-01-21
-
 ### Fixed
-
 - Building Android standalone apps ([not accepted license issue](https://github.com/expo/expo/issues/3266)) - updated Android build tools (`build-tools;28.0.3`, `platforms;android-28`).
 
 ## [0.5.2] - 2019-01-18
-
 ### Added
-
 - The link (in README) to the repository containing `turtle-cli` usage example.
 - [Contributing guide](CONTRIBUTING.md).
 - [Code of Conduct](CODE_OF_CONDUCT.md).
-
 ### Removed
-
 - `eslint`
-
 ### Changed
-
 - Fix all `tslint` errors.
 
 ## [0.5.1] - 2019-01-16
-
 ### Changed
-
 - Update Android shell app for SDK32 that includes `[email protected]`.
 
 ## [0.5.0] - 2019-01-16
-
 ### Added
-
 - Turtle version is added to the `onFinish` and `onError` build messages.
-
 ### Changed
-
 - A version property value being sent to the queue. It's now the version number
-  from `package.json` instead of `new`/`old` indicator.
-
+from `package.json` instead of `new`/`old` indicator.
 ### Removed
-
 - `--push-p12-path` parameter for `turtle build:ios` command,
-  a Push Notifications Certificate is no longer required to perform a successful
-  iOS standalone app build.
+a Push Notifications Certificate is no longer required to perform a successful
+iOS standalone app build.
 
 ## [0.4.3] - 2019-01-09
-
 ### Changed
-
 - Update iOS shell app for SDK32.
 - Update Android shell app for SDK32.

CODE_OF_CONDUCT.md

@@ -4,4 +4,4 @@ The Expo team is committed to fostering an open and welcoming environment.
 
 **Our Community Guidelines can be found here:**
 
-https://expo.dev/guidelines
+https://expo.io/guidelines

CONTRIBUTING.md

@@ -1,37 +1,33 @@
 # 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.dev/) and on [Expo Developers Discord](http://chat.expo.dev).
+- 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
-
-- Make sure you have set `GITHUB_TOKEN` and `CIRCLE_API_USER_TOKEN` environment variables in `.envrc.local` file. If you don't have the file, run `cp .envrc.local.example .envrc.local` and edit the file.
 - To release a new version of `turtle-cli`, run `yarn release` command.
-- If you wish to release a new _beta_ version of `turtle-cli`, run `yarn release:beta` instead.
-- Update the [changelog](CHANGELOG.md).
+- 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!

DEVELOPMENT.md

@@ -1,35 +0,0 @@
-# Turtle Development
-
-## Prerequisites
-
-- Working `www` service, see [this README](https://github.com/expo/universe/tree/master/server/www/README.md) for more details.
-- Own AWS SQS queues. See [this README](https://github.com/expo/universe/tree/master/terraform/turtle-queues/README.md) to learn more.
-
-## Setup
-
-- Run `update-local-secrets` to populate the `.secrets*` files. You'll need to run this any time any secret changes (it shouldn't be very often).
-- Run `EXPO_UNIVERSE_DIR=/path/to/universe/dir yarn secrets:init-private YOUR_SQS_NICKNAME`. Alternatively, you can create `.secrets.local-queue` file with the SQS queues' urls yourself (`AWS_SQS_ANDROID_QUEUE_URL`, `AWS_SQS_ANDROID_PRIORITY_QUEUE_URL`, `AWS_SQS_IOS_QUEUE_URL`, `AWS_SQS_IOS_PRIORITY_QUEUE_URL`)
-- Run `yarn set-workingdir:local` or `yarn set-workingdir:remote`:
-  - `:local` creates symlinks to the shell apps in `expo` repository (_unfortunately this is currently broken_)
-  - `:remote` downloads precompiled shell apps
-- Run `yarn` to install node modules.
-- Run `yarn start:ios` or `yarn start:android` to run Turtle.
-
-## Updating shell apps
-
-_TODO_
-
-## Generating recording files for smoke tests
-
-Smoke tests are powered by [Nock](https://www.npmjs.com/package/nock) which uses JSON files containing responses to the HTTP requests fired by the build process.
-
-To record new responses remove old `recording.json` and run tests and then manually schedule a build with `expo-cli` tool.
-
-As a precaution, the file with HTTP requests/responses contains, among other things, iOS certificates used for the test build, is
-encrypted with `git-crypt`. Remember not to revoke them, because then the tests will fail.
-
-## Other notes
-
-Turtle uses Redis to get notifications (from www) about builds cancellations. To make this feature working, you have to use the same Redis instance as www. Therefore, you need to remember about starting www before starting Turtle. If you forget about it, don't worry, Turtle will remind you to run `yarn start-docker` in `server/www` directory.
-
-Turtle uploads build artifacts to S3. This could take some time if you have a poor internet connection. To facilitate local development, there is a feature which allows Turtle to fake artifacts upload. `secrets:init-private` script, which you should have run while setting up Turtle, sets fake upload directory to your user's default `Downloads` directory (we're assuming you're using Mac). If you need to test uploading artifacts to S3, you have to edit `.secrets.local` file and comment or remove `TURTLE_FAKE_UPLOAD` and `TURTLE_FAKE_UPLOAD_DIR` environment variables.

Dockerfile

@@ -1,29 +1,126 @@
-# see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.6.0
+FROM openjdk:8u141
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# https://github.com/yarnpkg/yarn/issues/2821
+RUN apt-get update && apt-get install apt-transport-https
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+# Install dependencies
+RUN dpkg --add-architecture i386 && \
+  apt-get update && \
+  apt-get install -yq \
+  ant\
+  build-essential\
+  bzip2:i386\
+  file\
+  lib32ncurses5\
+  lib32z1\
+  libc6:i386\
+  libncurses5:i386\
+  libstdc++6:i386\
+  rsync\
+  unzip\
+  yarn\
+  zlib1g:i386\
+  --no-install-recommends && \
+  apt-get clean
+
+ENV NPM_CONFIG_LOGLEVEL warn
+ENV NODE_VERSION 8.12.0
+
+RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
+  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+# Download and untar SDK
+ENV ANDROID_HOME /usr/local/android-sdk-linux
+ENV ANDROID_SDK /usr/local/android-sdk-linux
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+RUN mkdir -p ${ANDROID_HOME} && \
+  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
+  cd ${ANDROID_HOME} && \
+  unzip -qq sdk.zip && \
+  rm sdk.zip && \
+  mkdir -p ${HOME}/.android && \
+  touch ${HOME}/.android/repositories.cfg
+
+ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
+ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
+
+RUN yes | sdkmanager --licenses > /dev/null
+RUN yes | sdkmanager \
+  "platforms;android-23" \
+  "platforms;android-24" \
+  "platforms;android-25" \
+  "platforms;android-26" \
+  "platforms;android-27" \
+  "platforms;android-28" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "platform-tools" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "build-tools;28.0.3" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services" | grep -v '=' || echo 'no output'
+
+# Install Android NDK
+ENV ANDROID_NDK_VERSION android-ndk-r10e
+ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
+ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
+ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
+ENV PATH $ANDROID_NDK:$PATH
+
+# i have no clue why some of this is here, but it's working elsewhere
+# it appears to install the NDK version expo needs, so that's cool
+RUN mkdir /ndk_setup && cd /ndk_setup && \
+  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
+  chmod +x ${ANDROID_NDK_FILE} && \
+  sync && \
+  ./${ANDROID_NDK_FILE} && \
+  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
+  cd && rm -rf /ndk_setup
+
+# Support Gradle
+ENV TERM dumb
+
+# Install gradle
+RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
+RUN unzip -qq gradle-4.4-all.zip
+RUN mv gradle-4.4 /usr/local
+RUN rm gradle-4.4-all.zip
+ENV GRADLE_HOME /usr/local/gradle-4.4
+ENV PATH ${GRADLE_HOME}/bin:$PATH
 
 ADD . /app/turtle
 
-WORKDIR /app/turtle
-
-RUN ./scripts/fetchRemoteTarballs.sh android
-
-RUN ln -s /app/turtle/workingdir /app/workingdir && \
-  for SDK_VERSION in `ls /app/workingdir/android/`; do \
-  echo "preparing $SDK_VERSION shell app" && \
-  cd /app/workingdir/android/$SDK_VERSION && \
-  mv package.json copy_package.json && \
-  jq '.workspaces.packages = ["packages/expo", "packages/expo-modules-autolinking"]' copy_package.json > package.json && \
-  rm -f copy_package.json && \
-  # Keep in sync with src/bin/setup/android/index.ts#_installNodeModules
-  # --prod requires --ignore-scripts (otherwise
-  # expo-yarn-workspaces errors as missing)
-  yarn install --ignore-scripts --prod ; \
-  done
+RUN mv /app/turtle/workingdir /app && \
+    for SDK_VERSION in `ls /app/workingdir/android/`; do \
+      echo "preparing $SDK_VERSION shell app" && \
+      cd /app/workingdir/android/$SDK_VERSION && \
+      if [ -f universe-package.json ]; then \
+      mv package.json exponent-package.json && \
+      mv universe-package.json package.json && \
+      yarn install && \
+      mv package.json universe-package.json && \
+      mv exponent-package.json package.json; \
+      else \
+      yarn install; \
+      fi \
+    ; done && \
+    mv /app/workingdir /app/turtle
 
 ENV NODE_ENV "production"
 ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
-ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-ADD redislabs_ca.pem /var/run/config/redislabs-tls/redislabs_ca.pem
+WORKDIR /app/turtle
 
-CMD ["/usr/bin/supervisord"]
+CMD ["node", "./build/server.js"]

README.md

@@ -6,8 +6,8 @@
 [![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 Discord](https://img.shields.io/discord/695411232856997968)](http://chat.expo.dev)
-[![Expo Forums](https://img.shields.io/badge/Expo%20Forums-blue.svg)](https://forums.expo.dev/)
+[![Expo Developers Slack](https://img.shields.io/badge/Expo%20Developers-e01563.svg?logo=slack)](http://slack.expo.io)
+[![Expo Forums](https://img.shields.io/badge/Expo%20Forums-blue.svg)](https://forums.expo.io/)
 
 <hr />
 
@@ -15,29 +15,29 @@ 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](CONTRIBUTING.md)
-- [Development](DEVELOPMENT.md)
+- [Contributing to Turtle CLI](CONTRIBUTING.md)
 - [Code of Conduct](CODE_OF_CONDUCT.md)
 
-## Installation
+## 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 instructions and documentation here.](https://docs.expo.dev/distribution/turtle-cli/)
+## 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.dev/), especially [Building Standalone Apps on Your CI
-  ](https://docs.expo.dev/versions/latest/distribution/turtle-cli) and [Building Standalone Apps](https://docs.expo.dev/versions/latest/distribution/building-standalone-apps) guides.
+- 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 the [Expo Forums](https://forums.expo.dev/).
-  - connect with the community on the [Expo Developers Discord](http://chat.expo.dev).
+  * create [a GitHub issue](https://github.com/expo/turtle/issues/new).
+  * create a new topic on [Expo Forums](https://forums.expo.io/).
+  * ask a question on [Expo Developers Slack](http://slack.expo.io).
 
 ## License
-
 The Turtle CLI source code is made available under the [MIT license](LICENSE).
 Some of the dependencies are licensed differently, with the BSD license, for example.

bin/turtle.js

@@ -3,18 +3,7 @@
 
 const subcommand = process.argv[2];
 if (subcommand) {
-  let platform;
-  if (subcommand.length === 2) {
-    const letter = subcommand[1];
-    if (letter === 'a') {
-      platform = 'android';
-    } else if (letter === 'i') {
-      platform = 'ios';
-    }
-  } else {
-    const [, maybePlatform] = subcommand.split(':');
-    platform = maybePlatform;
-  }
+  const [, platform] = subcommand.split(':');
   if (platform === 'ios' || platform === 'android') {
     // so that logs have correct platform set
     process.env.PLATFORM = platform;

docker-base/.gitignore

@@ -1 +0,0 @@
-configureAndroidSdk.sh

docker-base/Dockerfile

@@ -1,100 +0,0 @@
-# If you ever need to rebuild this, run:
-# yarn docker:build-and-push:android-base-image NEW_IMAGE_SEMVER
-FROM openjdk:8u141
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# https://github.com/yarnpkg/yarn/issues/2821
-RUN apt-get update && apt-get install apt-transport-https
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-# Install dependencies
-RUN dpkg --add-architecture i386 && \
-  apt-get update && \
-  apt-get install -yq \
-  ant\
-  build-essential\
-  bzip2:i386\
-  file\
-  jq\
-  lib32ncurses5\
-  lib32z1\
-  libc6:i386\
-  libncurses5:i386\
-  libstdc++6:i386\
-  rsync\
-  unzip\
-  yarn\
-  zlib1g:i386\
-  supervisor\
-  --no-install-recommends && \
-  apt-get clean
-
-ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 12.22.7
-
-RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
-  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-# Download and untar SDK
-ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-RUN mkdir -p ${ANDROID_HOME} && \
-  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
-  cd ${ANDROID_HOME} && \
-  unzip -qq sdk.zip && \
-  rm sdk.zip && \
-  mkdir -p ${HOME}/.android && \
-  touch ${HOME}/.android/repositories.cfg
-
-ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
-ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
-
-ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
-RUN /tmp/configureAndroidSdk.sh --install-all-platforms
-ENV ANDROID_NDK_HOME /usr/local/android-sdk-linux/ndk/17.2.4988734
-
-# Support Gradle
-ENV TERM dumb
-
-# Install gradle 6.2
-RUN wget https://services.gradle.org/distributions/gradle-6.2-all.zip
-RUN unzip -qq gradle-6.2-all.zip
-RUN cp -r gradle-6.2 /usr/local
-
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN mv gradle-6.2-all.zip /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN mv gradle-6.2 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2/bin/gradle
-
-# Install gradle 5.6.3
-RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
-RUN unzip -qq gradle-5.6.3-all.zip
-RUN cp -r gradle-5.6.3 /usr/local
-
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3-all.zip /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3/bin/gradle
-
-ENV GRADLE_HOME /usr/local/gradle-5.6.3
-ENV PATH ${GRADLE_HOME}/bin:$PATH
-
-# Install gradle 4.10.2
-RUN wget https://services.gradle.org/distributions/gradle-4.10.2-all.zip
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN unzip -qq gradle-4.10.2-all.zip
-RUN mv gradle-4.10.2-all.zip /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN mv gradle-4.10.2 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2/bin/gradle

k8s/android/turtle-deployment.template.yml

@@ -88,6 +88,11 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: aws_sqs_android_priority_queue_url
+          - name: AWS_SQS_OUT_QUEUE_URL
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: aws_sqs_out_queue_url
           - name: AWS_CLOUDWATCH_REGION
             valueFrom:
               secretKeyRef:
@@ -133,26 +138,19 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: datadog_app_key
-          - name: TURTLE_SDK_VERSIONS_SECRET_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: turtle_sdk_versions_secret_token
           # other vars
           - name: GRADLE_DAEMON_DISABLED
             value: "1"
           - name: DISABLE_DEX_MAX_HEAP
             value: "true"
           - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx13g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
+            value: '-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC'
           - name: GRADLE_OPTS
-            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx13g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
-          - name: REDIS_CA_CERTIFICATE
-            value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
+            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC"'
         resources:
           requests:
-            memory: "12Gi"
-            cpu: "3000m"
+            memory: "8192Mi"
+            cpu: "2000m"
           limits:
-            memory: "13Gi"
-            cpu: "3500m"
+            memory: "8192Mi"
+            cpu: "2000m"

nix/all-packages.nix

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

nix/android-shell.nix

@@ -2,78 +2,11 @@ with (import ./default.nix {});
 
 let
 
-  # These expressions can be deleted when react native depends on version of
-  # ndk present in nixpkgs.
-  os = if stdenv.system == "x86_64-linux" then "linux"
-    else if stdenv.system == "x86_64-darwin" then "macosx" else throw "unsupported system architecture: ${stdenv.system}";
-  ndk_17c_src = if stdenv.isDarwin then fetchurl {
-    url = http://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
-    sha256 = "11iyxgqp017fchn54kkns9mrax73m73xm5wgis266dsq2g36dn73";
-  } else fetchurl {
-    url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip;
-    sha256 = "12b5h5p8b2ia38825dnnacn7b47c0inpys8jp82r42iks3dilm1z";
-  };
-  ndk_runtime_paths = lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk python3 which ]; #+ ":${platform-tools}/platform-tools";
-  ndk = stdenv.mkDerivation {
-    name = "ndk-17c";
-    src = ndk_17c_src;
-    buildInputs = [ unzip autoPatchelfHook makeWrapper python2 ] ++ lib.optional (os == "linux") [ glibc stdenv.cc.cc ncurses5 zlib libcxx.out ];
-    unpackPhase = ''
-      mkdir extractedzip
-      cd extractedzip
-      unpackFile "$src"
-      if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]
-      then
-          cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
-      fi
-      sourceRoot="$PWD"
-    '';
-
-   installPhase = ''
-     packageBaseDir=$out/libexec/android-sdk/ndk-bundle
-     mkdir -p $packageBaseDir
-     cd $packageBaseDir
-     cp -av $sourceRoot/* .
-   '' + lib.optionalString (os == "linux") ''
-     patchShebangs .
-     wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${ndk_runtime_paths}"
-     rm -rf docs tests
-     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
-     addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
-     find toolchains -type d -name bin | while read dir
-     do
-         autoPatchelf "$dir"
-     done
-     # fix ineffective PROGDIR / MYNDKDIR determination
-     for i in ndk-build
-     do
-         sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i
-     done
-     # Patch executables
-     autoPatchelf prebuilt/linux-x86_64
-     # wrap
-     for i in ndk-build
-     do
-         wrapProgram "$(pwd)/$i" --prefix PATH : "${ndk_runtime_paths}"
-     done
-     # make some executables available in PATH
-     mkdir -p $out/bin
-     for i in ndk-build
-     do
-         ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
-     done
-   '';
-   dontStrip = true;
-   dontPatchELF = true;
-   dontAutoPatchelf = true;
-   noAuditTmpdir = true;
-  };
-  ndkRoot = "${ndk}/libexec/android-sdk/ndk-bundle";
-
-  sdk = androidenv.androidPkgs_9_0.androidsdk;
-  sdk_path = if stdenv.isDarwin
-    then "/Library/Android/sdk"
-    else "/Android/Sdk"; # intentional Capital S
+   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
 
@@ -90,27 +23,28 @@ mkShell rec {
   nativeBuildInputs = [
     awscli
     curl
-    fastlane
     git
-    nodejs
+    nodejs-8_x
     openjdk8
     yarn
   ];
 
-  passthru = { inherit ndk ndkRoot; };
+  passthru = { inherit ndk; };
 
   shellHook = ''
-    ${./install-ndk-17c.sh} ${ndk} ${ndkRoot}
-    # grep -v = should clean up build logs, see https://stackoverflow.com/a/52464819/1123156
-    yes | ${sdk}/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
+    ${./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/nixpkgs.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.23.0",
+  "version": "0.8.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -13,22 +13,34 @@
     "prepare": "rimraf ./build && yarn build",
     "build": "ttsc",
     "build:production": "./scripts/build.sh",
-    "watch": "ttsc --watch",
     "secrets:init-private": "./scripts/initPrivateSecrets.sh",
     "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
     "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
+    "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} .",
+    "docker:push": "retry5 gcloud docker -- push gcr.io/exponentjs/turtle-android:${TAG} && retry5 gcloud docker -- push gcr.io/exponentjs/turtle-android:latest",
+    "deploy:android": "./scripts/android/deploy.sh",
     "test": "yarn jest",
     "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:record": "PLATFORM=android EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "test:smoke:ios:record": "PLATFORM=ios EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=iOS",
     "release": "./scripts/release.sh",
     "release:beta": "./scripts/releaseBeta.sh",
-    "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh",
-    "docker:build-and-push:android-base-image": "./scripts/android/buildAndPushAndroidBaseImage.sh"
+    "ssh:android:pods-names": "./scripts/ssh/findAndroidPods.sh",
+    "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
+    "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",
+    "set-priorities": "yarn set-priorities:local",
+    "set-priorities:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setConfigurations.ts",
+    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-priorities:default",
+    "set-priorities:staging": "yarn set-priorities:default",
+    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default",
+    "set-replica-count:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setReplicaCount.ts | bunyan -o short -l debug",
+    "set-replica-count:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-replica-count:default",
+    "set-replica-count:staging": "yarn set-replica-count:default",
+    "set-replica-count:production": "EXPENV_OVERRIDES=prod yarn set-replica-count:default"
   },
   "husky": {
     "hooks": {
@@ -47,7 +59,7 @@
   "files": [
     "bin",
     "build",
-    "scripts/android/configureAndroidSdk.sh",
+    "scripts/cli",
     "shellTarballs"
   ],
   "keywords": [
@@ -55,9 +67,9 @@
     "react-native"
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=8"
   },
-  "author": "Expo <support@expo.dev>",
+  "author": "Expo <support@expo.io>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/expo/turtle/issues"
@@ -67,48 +79,39 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@expo/babel-preset-cli": "^0.1.3",
-    "@types/color-string": "^1.5.0",
     "@types/decompress": "^4.2.3",
     "@types/fs-extra": "^5.0.4",
-    "@types/ioredis": "^4.16.6",
     "@types/jest": "^23.3.9",
     "@types/joi": "^13.4.3",
     "@types/lodash": "^4.14.129",
-    "@types/node-forge": "^0.10.0",
-    "@types/npm-package-arg": "^6.1.0",
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
     "@types/request": "^2.47.1",
-    "@types/request-promise": "^4.1.44",
     "@types/semver": "^6.0.0",
-    "@types/sharp": "0.28.3",
+    "@types/sharp": "^0.17.8",
     "@types/tar": "^4.0.0",
     "@types/uuid": "^3.4.3",
-    "@types/webpack": "^4.32.1",
-    "@types/webpack-dev-server": "^3.1.7",
     "@types/which": "^1.3.1",
     "husky": "^1.3.1",
-    "jest": "^26.1.0",
+    "jest": "^23.6.0",
     "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
-    "nodemon": "^2.0.2",
-    "release-it": "^12.3.4",
+    "nodemon": "^1.18.11",
+    "release-it": "^10.0.0",
     "rimraf": "^2.6.2",
-    "ts-jest": "^26.1.2",
+    "ts-jest": "^23.10.4",
     "ts-node": "^8.0.3",
     "ts-transformer-imports": "^0.4.1",
     "tsconfig-paths": "^3.8.0",
     "tslint": "^5.10.0",
     "tslint-eslint-rules": "^5.4.0",
     "ttypescript": "^1.5.6",
-    "typescript": "^3.9.5"
+    "typescript": "^3.4.2"
   },
   "dependencies": {
-    "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "59.1.7",
-    "@google-cloud/logging-bunyan": "^2.0.3",
+    "@expo/xdl": "54.1.4",
+    "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
     "bunyan": "^1.8.12",
@@ -119,7 +122,7 @@
     "decompress": "^4.2.0",
     "dogapi": "^2.8.3",
     "fs-extra": "^6.0.0",
-    "ioredis": "^4.17.3",
+    "ioredis": "^3.2.2",
     "is-semver": "^1.0.8",
     "joi": "^13.2.0",
     "lodash": "^4.17.11",
@@ -127,19 +130,14 @@
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
-    "request-promise": "^4.2.5",
     "semver": "^6.0.0",
-    "sharp": "0.28.3",
+    "sharp": "^0.21.0",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.11.4"
-  },
-  "volta": {
-    "node": "12.22.7",
-    "yarn": "1.22.0"
+    "@expo/traveling-fastlane-darwin": "1.9.4"
   }
 }

redislabs_ca.pem

@@ -1 +0,0 @@
-this is just a placeholder to simplify deployments

scripts/android/buildAndPushAndroidBaseImage.sh

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

scripts/android/configureAndroidSdk.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
-
-yes | $SDKMANAGER --licenses > /dev/null
-if [[ "$1" = "--install-all-platforms" ]]; then
-  yes | $SDKMANAGER \
-    "platforms;android-23" \
-    "platforms;android-24" \
-    "platforms;android-25" \
-    "platforms;android-26" \
-    "platforms;android-27" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-fi
-yes | $SDKMANAGER "platforms;android-28" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "platform-tools" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "build-tools;28.0.3" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER \
-  "extras;android;m2repository" \
-  "extras;google;m2repository" \
-  "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-
-if [[ "$(uname -s)" == "Darwin" ]] && [[ "$(uname -m)" == "arm64" ]]; then
-  echo "Skipping NDK install on M1 macOS"
-else
-  yes | $SDKMANAGER "ndk;17.2.4988734" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-fi

scripts/android/supervisordEventListener.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-printf "READY\n"; # signal to superivsord that listener is ready
-
-while read line; do
-  echo "[supervisord:eventlistener] Processing Event: $line" >&2;
-  kill -SIGQUIT $PPID
-done < /dev/stdin

scripts/build.sh

@@ -14,7 +14,7 @@ PLATFORM=$1
 yarn
 yarn run build
 if [ "$PLATFORM" = "android" ]; then
-  echo "shell apps will be fetched when building a Docker image"
+  $ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
 elif [ "$PLATFORM" = "ios" ]; then
   $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 fi

scripts/cli/configureAndroidSdk.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
+
+yes | $SDKMANAGER --licenses > /dev/null
+yes | $SDKMANAGER "platforms;android-28"
+yes | $SDKMANAGER "platform-tools"
+yes | $SDKMANAGER "build-tools;28.0.3"
+yes | $SDKMANAGER \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services"

scripts/deploy.sh

@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-SCRIPT_NAME=`basename "$0"`
-DEPLOY_ENDPOINT_URL="https://circleci.com/api/v1.1/project/github/expo/turtle-deploy/tree/master"
-
-if [[ -z "$1" || -z "$2" ]]; then
-  echo "usage: ${bold}$SCRIPT_NAME PLATFORM ENVIRONMENT [FORCE]${normal}"
-  exit 1
-fi
-
-PLATFORM="$1"
-ENVIRONMENT="$2"
-
-if [[ "$3" = "--force" ]]; then
-  FORCE_DEPLOY="true"
-fi
-
-if [[ "$PLATFORM" != "android" && "$PLATFORM" != "ios" ]]; then
-  echo "unsupported PLATFORM passed: ${bold}$PLATFORM${normal}"
-  echo "valid values are: ${bold}android${normal}, ${bold}ios${normal}"
-  exit 1
-fi
-
-if [[ "$ENVIRONMENT" != "staging" && "$ENVIRONMENT" != "production" ]]; then
-  echo "unsupported ENVIRONMENT passed: ${bold}$ENVIRONMENT${normal}"
-  echo "valid values are: ${bold}staging${normal}, ${bold}production${normal}"
-  exit 1
-fi
-
-if [[ ! -z "$CIRCLE_SHA1" ]]; then
-  TURTLE_COMMIT="$CIRCLE_SHA1"
-elif [[ -z "$FORCE_DEPLOY" ]]; then
-  read -p "You're about to schedule a deploy, are you sure you want to deploy the current commit? (y/n) " -n 1 -r
-  echo    # (optional) move to a new line
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "exiting..."
-    exit 0
-  else
-    TURTLE_COMMIT=`git log --pretty=format:%H -1`
-  fi
-fi
-
-if [[ -z "$TURTLE_BOT_CIRCLE_API_USER_TOKEN" ]]; then
-  echo "Please set the TURTLE_BOT_CIRCLE_API_USER_TOKEN env variable."
-  exit 1
-fi
-
-if [[ $FORCE_DEPLOY = "true" ]]; then
-  curl -X POST \
-    --header "Content-Type: application/json" \
-    -u $TURTLE_BOT_CIRCLE_API_USER_TOKEN: \
-    -d '
-      {
-        "build_parameters": {
-          "CIRCLE_JOB": "deploy_'$PLATFORM'",
-          "TURTLE_ENV": "'$ENVIRONMENT'",
-          "TURTLE_FORCE_DEPLOY": "true"
-        }
-      }' \
-    $DEPLOY_ENDPOINT_URL | jq -r .build_url
-else
-  curl -X POST \
-    --header "Content-Type: application/json" \
-    -u $TURTLE_BOT_CIRCLE_API_USER_TOKEN: \
-    -d '
-      {
-        "build_parameters": {
-          "CIRCLE_JOB": "deploy_'$PLATFORM'",
-          "TURTLE_ENV": "'$ENVIRONMENT'",
-          "TURTLE_COMMIT": "'$TURTLE_COMMIT'"
-        }
-      }' \
-    $DEPLOY_ENDPOINT_URL | jq -r .build_url
-fi

scripts/initPrivateSecrets.sh

@@ -1,7 +1,7 @@
 #!/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 and AWS_SQS_IOS_QUEUE_URL variables."
+  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
 
@@ -13,15 +13,13 @@ fi
 TURTLE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
 TERRAFORM_DIR="${EXPO_UNIVERSE_DIR}/terraform"
 
-ANDROID_NORMAL=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_android_in | head -1 | cut -d"=" -f2 | xargs`
-ANDROID_PRIORITY=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_android_in_priority | head -1 | cut -d"=" -f2 | xargs`
-IOS_NORMAL=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in | head -1 | cut -d"=" -f2 | xargs`
-IOS_PRIORITY=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in_priority | head -1 | cut -d"=" -f2 | xargs`
+ANDROID=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_android_in | head -1 | cut -d"=" -f2 | xargs`
+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
-AWS_SQS_ANDROID_QUEUE_URL="$ANDROID_NORMAL"
-AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="$ANDROID_PRIORITY"
-AWS_SQS_IOS_QUEUE_URL="$IOS_NORMAL"
-AWS_SQS_IOS_PRIORITY_QUEUE_URL="$IOS_PRIORITY"
+AWS_SQS_ANDROID_QUEUE_URL="$ANDROID"
+AWS_SQS_IOS_QUEUE_URL="$IOS"
+AWS_SQS_OUT_QUEUE_URL="$OUT"
 EOF
 

scripts/release.sh

@@ -2,22 +2,8 @@
 
 set -eo pipefail
 
-if ! command -v jq &> /dev/null
-then
-    echo "jq is not installed and is required by the release script. Install it through homebrew or your package manager of choice."
-    exit
-fi
-
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
 
-if [[ -z "$GITHUB_TOKEN" || -z "$CIRCLE_API_USER_TOKEN" ]]; then
-  yellow=`tput setaf 3`
-  reset=`tput sgr0`
-  echo "${yellow}please set GITHUB_TOKEN and CIRCLE_API_USER_TOKEN env variables in .envrc.local file if you wish to release turtle-cli"
-  echo "run 'cp .envrc.local.example .envrc.local' if you don't have one yet and edit the new file${reset}"
-  exit 1
-fi
-
 $ROOT_DIR/node_modules/.bin/release-it
 echo
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

scripts/releaseBeta.sh

@@ -2,12 +2,6 @@
 
 set -eo pipefail
 
-if ! command -v jq &> /dev/null
-then
-    echo "jq is not installed and is required by the release script. Install it through homebrew or your package manager of choice."
-    exit
-fi
-
 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

@@ -6,44 +6,42 @@ 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 the .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_ANDROID_PRIORITY_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL, and AWS_SQS_IOS_PRIORITY_QUEUE_URL variables."
+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
 
-# @dsokal: this is currently broken
-#
-# setup_local() {
-#   ensure_link_exists() {
-#     if [ ! -L "$2" ]; then
-#       ln -s $1 $2
-#       echo "$2 link created"
-#     fi
-#   }
-#   WORKINGDIR="$ROOT_DIR/workingdir/local"
-#
-#   if [[ -d $WORKINGDIR ]]; then
-#     echo "Local workingdir already prepared"
-#     return
-#   fi
-#
-#   if [[ -z "$EXPO_UNIVERSE_DIR" ]]; then
-#     echo "EXPO_UNIVERSE_DIR needs to be set"
-#     exit -1
-#   fi
-#
-#   cd $EXPO_UNIVERSE_DIR/exponent && yarn
-#   cd $EXPO_UNIVERSE_DIR/exponent/tools-public && yarn && ./generate-dynamic-macros-android.sh
-#
-#   mkdir -p $WORKINGDIR
-#   echo "$WORKINGDIR directory created"
-#
-#   LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces" "node_modules")
-#
-#   for LINKNAME in ${LINKS[@]}; do
-#     ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
-#   done
-# }
+setup_local() {
+  ensure_link_exists() {
+    if [ ! -L "$2" ]; then
+      ln -s $1 $2
+      echo "$2 link created"
+    fi
+  }
+  WORKINGDIR="$ROOT_DIR/workingdir/local"
+  
+  if [[ -d $WORKINGDIR ]]; then
+    echo "Local workingdir already prepared"
+    return
+  fi
+
+  if [[ -z "$EXPO_UNIVERSE_DIR" ]]; then
+    echo "EXPO_UNIVERSE_DIR needs to be set"
+    exit -1
+  fi
+
+  cd $EXPO_UNIVERSE_DIR/exponent && yarn
+  cd $EXPO_UNIVERSE_DIR/exponent/tools-public && yarn && ./generate-dynamic-macros-android.sh
+
+  mkdir -p $WORKINGDIR
+  echo "$WORKINGDIR directory created"
+
+  LINKS=("template-files" "package.json" "android" "expokit-npm-package" "packages" "client-builds" "cpp" "exponent-view-template" "ios" "shellAppBase-builds" "shellAppWorkspaces" "node_modules")
+
+  for LINKNAME in ${LINKS[@]}; do
+    ensure_link_exists "$EXPO_UNIVERSE_DIR/exponent/$LINKNAME" "$WORKINGDIR/$LINKNAME"
+  done
+}
 
 setup_remote() {
   if [[ -d $ROOT_DIR/workingdir/android && -d $ROOT_DIR/workingdir/ios ]]; then
@@ -57,7 +55,7 @@ setup_remote() {
       $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
     fi
   fi
-
+  
   for sdk in $ROOT_DIR/workingdir/android/* ; do
     if [[ -f "$sdk/universe-package.json" ]]; then
       mv $sdk/package.json $sdk/exponent-package.json
@@ -89,10 +87,8 @@ EOF
 }
 
 if [ "$1" == "local" ]; then
-  # setup_local
-  # switch_local
-  echo "Setting local workingdir is currently broken, sorry :("
-  exit -1
+  setup_local
+  switch_local
 elif [ "$1" == "remote" ]; then
   setup_remote
   switch_remote

scripts/ssh/connectToAndroidPod.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+if [ -z "$1" ]; then
+  echo "Please provide an environment name as a first argument"
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "Please provide a pod name as a second argument"
+  exit 1
+fi
+
+kubectl --namespace $1 exec -it $2 -- /bin/bash

scripts/ssh/findAndroidPods.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ENVIRONMENT=${1:-production}
+
+kubectl get pods --namespace $ENVIRONMENT | grep "turtle-android-" | sed -e "s/  */ /g" | cut -d" " -f1

scripts/ssh/findIosIps.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+ENVIRONMENT=${1:-production}
+
+govc vm.ip -wait 5s turtle-js-"${ENVIRONMENT}"-*

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -2,8 +2,6 @@
 
 set -ueo pipefail
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-
 export NODE_ENV=test
 
 export ENVIRONMENT="development"
@@ -13,20 +11,16 @@ export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/2742511416
 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_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.exp.host"
+export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
-
-pushd $ROOT_DIR/workingdir/android/${SDK_VERSION:-sdk39} >/dev/null 2>&1
-yarn
-popd >/dev/null 2>&1
 
 yarn test:smoke:android

scripts/tests/runIOSSmokeTestsCI.sh

@@ -9,19 +9,19 @@ export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/2742511416
 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_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="https"
-export API_HOSTNAME="staging.exp.host"
+export API_HOSTNAME="staging.expo.io"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-$ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 
 yarn test:smoke:ios

scripts/tests/runUnitTestsCI.sh

@@ -9,6 +9,7 @@ export AWS_SQS_IOS_QUEUE_URL="noop"
 export AWS_SQS_ANDROID_QUEUE_URL="noop"
 export AWS_SQS_IOS_PRIORITY_QUEUE_URL="noop"
 export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="noop"
+export AWS_SQS_OUT_QUEUE_URL="noop"
 export AWS_ACCESS_KEY_ID="noop"
 export AWS_SECRET_ACCESS_KEY="noop"
 export AWS_SQS_REGION="noop"
@@ -21,6 +22,5 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 yarn test:unit

scripts/updateTurtleCliExampleRepo.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-if ! command -v jq &> /dev/null
-then
-    echo "jq is not installed and is required by the release script. Install it through homebrew or your package manager of choice."
-    exit
-fi
-
-DEPLOY_ENDPOINT_URL="https://circleci.com/api/v1.1/project/github/expo/turtle-cli-example/tree/updates-do-not-remove-me"
-
-curl -X POST \
-    --header "Content-Type: application/json" \
-    -u $CIRCLE_API_USER_TOKEN: \
-    -d '
-      {
-        "build_parameters": {
-          "CIRCLE_JOB": "update",
-          "TURTLE_TAG": "latest"
-        }
-      }' \
-    $DEPLOY_ENDPOINT_URL 2>/dev/null | jq -r .build_url

shellTarballs/android/sdk27

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

shellTarballs/android/sdk28

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

shellTarballs/android/sdk29

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

shellTarballs/android/sdk30

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

shellTarballs/android/sdk31

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

shellTarballs/android/sdk32

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

shellTarballs/android/sdk33

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

shellTarballs/android/sdk36

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

shellTarballs/android/sdk37

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

shellTarballs/android/sdk38

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

shellTarballs/android/sdk39

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

shellTarballs/android/sdk40

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

shellTarballs/android/sdk41

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

shellTarballs/android/sdk42

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

shellTarballs/android/sdk43

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

shellTarballs/ios/client

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

shellTarballs/ios/sdk27

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-27-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz

shellTarballs/ios/sdk28

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-28-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz

shellTarballs/ios/sdk29

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-29-db356a09877642d64023af98e4e2e1e632fbe4df.tar.gz

shellTarballs/ios/sdk30

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

shellTarballs/ios/sdk31

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

shellTarballs/ios/sdk32

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

shellTarballs/ios/sdk33

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

shellTarballs/ios/sdk36

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

shellTarballs/ios/sdk37

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

shellTarballs/ios/sdk38

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

shellTarballs/ios/sdk39

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

shellTarballs/ios/sdk40

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

shellTarballs/ios/sdk41

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

shellTarballs/ios/sdk42

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

shellTarballs/ios/sdk43

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

src/__smoke__/fixtures/android/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>8de5bfc7-bc8e-5ee3-9e04-e787ff880c47</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","8de5bfc7-bc8e-5ee3-9e04-e787ff880c47","Date","Tue, 01 Dec 2020 13:10:35 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>0bb998bb-3156-5159-b16f-c0fb725a5d65</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","0bb998bb-3156-5159-b16f-c0fb725a5d65","Date","Tue, 01 Dec 2020 13:10:41 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>feef69fc-27a3-5af5-83af-31bc64b1b9d7</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","feef69fc-27a3-5af5-83af-31bc64b1b9d7","Date","Tue, 01 Dec 2020 13:10:47 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>f39aaec9-47e0-4d02-bdb7-cf467fe2ea19</MessageId><ReceiptHandle>AQEBBI8nzAywIPCH57h1Iptt39uq60E5dzlj+Er50gtGqH+esoJ6iFdxoPDxvtD0xfT0qlyKSqlmoBDkQwh36tqsfqdT5FcFF8ejmPMRVIE8hexofzEbacxxw+3cBfgra2EFAik49TJbMT5pwxyaf42y+qwyWKOZ5N62VzRgGtnpj5ilNw1dt0lUzCdsfhCu7sne+dfJ8oMpbuy6T+ttoEYUS6VVKmv8f1BzuujHoKMy0kJip8r3zFoaigWE2p1bpFby9b9oBFTFT1ycD618YTu+Un5S9Q7Q6/nqJ7RPM2BfK2iPxBMk+UWmGfJ/otX11Zc0p8qx/MyKuYY/480Zta//xQ==</ReceiptHandle><MD5OfBody>1942fb5be12b59fc93b8052cf960f7d8</MD5OfBody><Body>{&quot;id&quot;:&quot;686530e4-c025-4a01-b84b-041e6d4f7fb3&quot;,&quot;experienceId&quot;:&quot;4d928c1c-5be9-4380-8fd5-48a6a4805839&quot;,&quot;experienceName&quot;:&quot;@testtest2/sdk-39-test&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;39.0.0&quot;,&quot;accountId&quot;:&quot;1ecd48ee-e393-4f6b-9f77-311f2e0d2b39&quot;,&quot;priority&quot;:&quot;high&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;/u3+7QAAAAIAAAABAAAAAQAgcWhybGMzcjB6eG4wbWk5enpnc3Rtemt0ZGd2emRhPT0AAAF2HlYoCQAABQEwggT9MA4GCisGAQQBKgIRAQEFAASCBOmzIBnRnHGBLgRUOJ1GGYiLjktnTeq/GXR/h4KZSSQ67PoiJqJnhrHLvj35Sr1swSL78q4j52IRV/a1mFbqQT4JFFy1ZdH2XgKUptY+kVc+ZrBI/awC8akIeYofWmKTNcS0Bc9IDT1VwIzwxxRrlnK/36Gh2m1vRuwVUdBChHjB4SHgC91F8wB0opY+RmiRhZqQevd8PBvZyqKenR5IWgZDXhsUYvvby4U4zMzvEgV3zNv7YGYM1Bb2ehJ8HdsW6O/58zFL3ufJ3+H2VonLxSn9YayninHoqkyMP40/mmnaFPz5jNItDkCQIeuudgQc8mrZlv4X0lM2ZjT4ZJDLdN4FCXV5iYDe4hopF8iF+DZmhMaZ1xFJ57boEaZ+WUcwsTkKOawusOGqW2JsvZbDMehOYLc8aqM2t28PrdYf3c7zspJALi6+tar2mwN66TX/AteeJRAk3r7HAiYPyle5gOffGgpmy0klLb5MEStkLQNNNsVMLJ7XSYrewzI6jXyAbMVc6PzbiVnCRPtoSy0TMUD7qQWMUGdePL1jxDlwhOVS3jgwOwHIFhUaLBbQOPROm1bF4hY3p25+LHFu954aDsYC3JlT6k9EOKIacKbJThq14r2Lb4EekfQlYTO/yst6ncVJcawWHYS1f93xWUlIjcpFnqJrLq2QVQfhafPWJmTS3K0lcYgFpfxvoU8RVn+ySaLOiy9J86l5YPmtpH/nFqr6BkqROy6dXps5x+D9vi3jVfYlYHnmqHxq7vyX5X+IMIMLvJ28SviuMKWb8Ikqmm7FSzlewJfF4xy/NLgQrQY6VxUahy92PZf3uR02ENolnj5nPSnh/B1FnIfrG46xFqlPg8imzen7hjKk1yXrdUjOT4WcjLdD/K/heVVHKUnsn3QCBt6eOgB8MpG9XzGRD+PAwloklASQx8iVSD67EauU2y1yayf4lNaQzdfnF3iFXSF25BU9XLJIRTtdRsTwmLRuLTmQcctLYD8hQCDQ2/njZtTkdY/AJeVlm44CdDaTLJpP8mVVscAOgH/S0DPi/oGGie8AYeKr8ZmBO1lQSN6l2LBJcAq2fh6AaUF5By21lT9FfR9KQd5WM87iUZk41nBIHQXcQSSt7H+vETEfm/8T9tOOwY5dMyf5QAYNCZuBoIFNCr0MOxe/Dcrsvd46KVbftR4HsJsQl53MnZoh4eLine truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>fc2fe53d-1447-4304-90e0-60b025ac9687</MessageId><ReceiptHandle>AQEBcOA9S4yhL3ZCaho9Cv+XVqJEbhOaaWJTsOvBD9SOa/NK/248s0+yI9bHro5Ti9WJrnD3H65SdK9eOETFeS/QDaaCMTYkxjvH/1DrSJt2rAptgItmxl8F6N3iDYLqplOQjmautdjCWYXrCLxMDihMHEjcvWNAq0XLAAjlQJvtm5Z8Vji5xXKJP3IpQOV2DvhS/Cqriteaqe6NW5xKwgKHOC52IVTPMSHiJ0ERUf55agntOOJJ7Za7vHdTr+Zjrxl6yVFWKC/cpwYI00OKGj4bArud0buiaD0rtjszLmcPgcwADRsmhfG65p3gLwIwjfclHqSLlmcuY3c+xsu/5VM1YA==</ReceiptHandle><MD5OfBody>c9e8a99bf73407dfa26a2cb81103c26a</MD5OfBody><Body>{&quot;id&quot;:&quot;b9f9f814-5603-4dd5-929d-c9eed756c591&quot;,&quot;experienceId&quot;:&quot;531b2db0-4b14-11e9-92d6-95aebd1034a3&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;32.0.0&quot;,&quot;accountId&quot;:&quot;4c44c9d8-3cb6-4980-8505-ca0637cf3165&quot;,&quot;priority&quot;:&quot;high&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;/u3+7QAAAAIAAAABAAAAAQAscWdyemIydGhiYzFzYjJuaGJjOTBkeGowYmd1dHkyeHBsd3Y0eXcxd2JndT0AAAFpycAadgAABQIwggT+MA4GCisGAQQBKgIRAQEFAASCBOrpcy5jViAnKMlnwuvGQ2qa5UcYfuJQwaa48a4oEcvZlrPUUvQSi1T/ZOVpWc8bhiAD8xvTbTh0w1B26K4bPrbrchQGyubs5o3tZU94I+1yMR//nITj4srlUPipX7kr2KdGDqfLfS4EwK8FXACyXx3YxC30STovgtOjTctGUQRzD2iQmu9UmlCAl4szItY2vn+j51VJBpjV9SWXrWpEOmH6hkq7xlHFhbr00FpJXnzON6ifg7ymMIUbkG2nLC3VGCVTAqWBsOgEnUExMOKTedl6Rdzze5sP9CmzUk4aUpgZK1CHjvY03/RztuFky85ODEfSLrk3zBnegQgg0x54RQq1ji+/s5IyPslfpZbcVsTM1KBLEstfCkhZT8xjCZeUxD44U1UxcMlXRYsWtpHv5gfG/4vvV9xQ+pqzuCD43DLiTrqUFw9VzIzXjU7L9CXNGN0DtcmTI5usoKhLZPYgnpT546H4rnZkPzxYs3HXd+tyBmqFTWbvoRiFI2njeaMu0/RZMR17VKjv1u7rITpi7xjwX8cxPvxHLxoDyLL/0vxu45qfmH9ScOWw0QAxQ6RybMhZuZYXuHCERrJ4DLgXNqX8yDjba/C4ioF4nl4cL1S3JtUUE8aRaB6KKQaXP2Fxj+mww3eqetWBuCBD0yBHVscqCZfePh3b1hotMaVZvu/VrxkFL+BbnOkeSinwhkHB2sLFW3wzE5NQHbMi3chaHavC0jxFfaqf8aARub+5I/0+tqI3Crj46EdcxBMpPVa82HAYLkM8pSL8Tjs15bHg+v5suU+DEAymFPauDfEOIzbAJYdBmyrLiL5HBBSM39TdjdpXm1TOdBBtpOlROpJJsOpd3HRIqBF6yHyyRSrPZ5b5k42KCbMheRREXssqZoyPtZWT8aUdi9SnwhZm/fhNPVie1F7GjfsWi5U6OLpSHk2J6GOiwBFk5AXXoe4LNqcAMwYng5a23xEyAJ2JQ4sV5Hb8asNOfVjKvwLSKhRkG1wa+zsku2B0wFa7czX3r/u+NsEfOSbgo8ICya8itu8nlaoCtol/484Ab7NHiPJpF1qeZDB5n57+aODG7rjpBXJLvB0BTI4x9bPOEEzEu6cUEo6pvVIYGb5wTfgKVZVv5pA40x61/OicbG9dR8W6co/MfCDA0BMREzxO6djh8aSphR8Wd3jFYw1MI+PzCllnD3L4/6ZTc7R4sa9EUIfIxIFp7hw48HFO6I9uhp79lQySZ+EcEFFsvMK1hRGR6lfgX8ZWqgnJP1fx0n7PXyzFQvCEsw6GEesu6IVco39vNs1WL//FhhGf+HU2/Jq7wFOjN4yQtU/h2CEG5fv/aKGswoMv2Kqiihd4LjpxQlQHlaOXjp5QnBVMl6/8QVvX50JieabW3uXmcbOGnQ8qAOyg4OCgPzJmShifOeLuDPUQIvG4Tm7514lPZJ1aGFF9tj/zEBjxJfs7N30lUG+TfcPeFQDYfwmUZED2nZgsDdNQhkkucIf53Zgly9tKzXodRdAqwSv9qAeX69nbC2Db9J//E7CaDMLgm/Ij/w11MVlikMYv0FE95PdJ/vLbWPzEF1OwxXtutlg2TPksdSU7Cl7oJNk4B++fekquRmjPGzb8EEVIsTwmzZ77LOnre/F9Zy6nGX5mGCzhnYsBux6cRaDdwcYZ6UDm2PO88c5LEiIuAAAAAQAFWC41MDkAAANhMIIDXTCCAkWgAwIBAgIEHWp77zANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJVUzEJMAcGA1UECBMAMQkwBwYDVQQHEwAxCTAHBgNVBAoTADEJMAcGA1UECxMAMSQwIgYDVQQDExtjb20uZXhwby50dXJ0bGUuY2xpLmV4YW1wbGUwHhcNMTkwMzI5MTQwMDAzWhcNNDYwODE0MTQwMDAzWjBfMQswCQYDVQQGEwJVUzEJMAcGA1UECBMAMQkwBwYDVQQHEwAxCTAHBgNVBAoTADEJMAcGA1UECxMAMSQwIgYDVQQDExtjb20uZXhwby50dXJ0bGUuY2xpLmV4YW1wbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw5E26XXa9AHihXC2gDfA9Wi4kHOhLiC5D6D1iS3Ftc+UCgg1d4pEzVB1o5O81IhWyIdTINkmpZ/qgDi1DCWXEgFHSisHFWWisXy/Ab2zRSPkE0GsDlnNvq2wObLzhEnLyALZ57+5EjQRCQJlzbO3kCFPhf/hT4hnVrsF+nnObkiEnUPCGLebHYqzk6lvMQ2XERzTyIovHD+TvfbIpKWOjSeZeEQ/9DI6Yo9bkZ4rRs9Z1vX1UTMtvEEg/T9oyCY0uE5h6yz49eH3Q2M27DqYEC3VaDhSBSELnItfSBnay/6vaQSlEzB+FGW6Jt9rTDQ1tMayUGQKvxhXi+08NHm7vAgMBAAGjITAfMB0GA1UdDgQWBBQiidnk1c5N5F4Aeg/EEPiuJO6ApDANBgkqhkiG9w0BAQsFAAOCAQEAkPbJQpnfoZehkPPNOHvyFl5S/POROColqo4OwfaYF0LmFfhMOPi3B2iuEXDPc/lVliuhQ+b+kD+pQnqlcDxWXEP8ZJETFjVSMLAeZ43MoTs22DBKh6sMYrO7MyjZbIwMMALmnfniHQe58gV7ot0sgBCs0bN3hICpqHXzZn6QSLxW1F9W5/52XFEwl+6zwTKnphZPNBhOCPQ/Z6cCEmodrKD48YeEOu+laojg3TZhVEF8Wf6TdcHjgyaT2IRPF+J6aD2K9ZazLFN/tvz0j5+1EPYtm1l6iX9RMFg0GtbRngXcIhuPXrcNuThF5/c2dL13JNYtMHUe3AAOfkycMNVjeTDkzLXZiULCDIisCnPuJQ9cRz7N&quot;,&quot;keyPassword&quot;:&quot;fb7409988d78459c826cf2a438cb3a33&quot;,&quot;keystoreAlias&quot;:&quot;QGRzb2thbC1sb2NhbC90dXJ0bGUtY2xpLWV4YW1wbGU=&quot;,&quot;keystorePassword&quot;:&quot;80c3583b33b84a1d91e5cf33b2421d7c&quot;},&quot;manifest&quot;:{&quot;android&quot;:{&quot;package&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;bundledAssets&quot;:[&quot;asset_3a2ba31570920eeb9b1d217cabe58315.ttf&quot;,&quot;asset_744ce60078c17d86006dd0edabcd59a7.ttf&quot;,&qLine truncated

src/__smoke__/smoke.test.ts

@@ -17,7 +17,8 @@ jest.mock('../builders/utils/uploader.ts', () => ({
 async function performSmokeTest(recording: string) {
   jest.setTimeout(60 * 60 * 1000);
 
-  const fixtureExists = await fs.pathExists(recording);
+  // @ts-ignore
+  const fixtureExists = await fs.exists(recording);
   if (fixtureExists) {
     logger.info('Fixture exists, test will use existing one.');
 

src/aws/cloudwatch/index.ts

@@ -136,7 +136,7 @@ function _addEmptyMetrics(metrics: IMetric[]) {
       acc.add(i.MetricName);
     }
     return acc;
-  }, new Set<string>());
+  }, new Set());
 
   const nonEmptyMetrics = _.omitBy(state.registeredMetrics, ({ addEmpty }) => !addEmpty);
   const toAdd = _.difference(Object.keys(nonEmptyMetrics), Array.from(seenMetrics));

src/aws/cloudwatch/statistics.ts

@@ -19,10 +19,10 @@ export default function calculateStatistics(metrics: IMetric[]) {
       });
     }
 
-    result!.StatisticValues.Maximum = Math.max(result!.StatisticValues.Maximum, i.Value);
-    result!.StatisticValues.Minimum = Math.min(result!.StatisticValues.Minimum, i.Value);
-    result!.StatisticValues.SampleCount += 1;
-    result!.StatisticValues.Sum += i.Value;
+    result.StatisticValues.Maximum = Math.max(result.StatisticValues.Maximum, i.Value);
+    result.StatisticValues.Minimum = Math.min(result.StatisticValues.Minimum, i.Value);
+    result.StatisticValues.SampleCount += 1;
+    result.StatisticValues.Sum += i.Value;
     return result;
   }, null);
   return [reduced];

src/aws/sqs.ts

@@ -2,8 +2,9 @@ import retry from 'async-retry';
 import AWS from 'aws-sdk';
 import _ from 'lodash';
 
-import { QUEUE_URL } from 'turtle/aws/utils';
+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';
 
@@ -72,3 +73,19 @@ export function changeMessageVisibilityRecurring(priority: string, receiptHandle
     }
   }, (VISIBILITY_TIMEOUT_SEC * 1000) / 3);
 }
+
+export async function sendMessage(jobId: string, status: JOB_UPDATE_TYPE, data = {}) {
+  const params = {
+    MessageBody: JSON.stringify({ jobId, status, ...data }),
+    QueueUrl: OUTPUT_QUEUE_URL(),
+    DelaySeconds: 0,
+    MessageGroupId: jobId,
+  };
+  try {
+    return await retry(async () => {
+      return await sqs.sendMessage(params).promise();
+    });
+  } catch (err) {
+    logger.error({ err }, `Error sending SQS message: ${JSON.stringify(params)}}`);
+  }
+}

src/aws/utils.ts

@@ -1,3 +1,4 @@
 import config from 'turtle/config';
 
 export const QUEUE_URL = (priority: string) => (config.sqs.queues as any)[priority][config.platform];
+export const OUTPUT_QUEUE_URL = () => config.sqs.queues.out;

src/bin/commands/build/android.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -23,26 +24,16 @@ export default (program: any, setCommonCommandOptions: any) => {
       /^(app-bundle|apk)$/i,
       'app-bundle',
     )
-    .option(
-      '-m --mode <build>',
-      'type of build: debug|release',
-      /^(debug|release)$/i,
-      'release',
-    )
-    .option(
-      '--gradle-args <gradle-args>',
-      'optional arguments passed to gradle, make sure to surround them with double quotes'
-      + ' (e.g.: --gradle-args "--stacktrace --debug")',
-    )
     .description(
-      'Build a standalone APK or App Bundle for your project, either signed and ready for submission to'
-      + ' the Google Play Store or in debug mode.',
+      'Build a standalone APK or App Bundle for your project, signed and ready for submission to the Google Play'
+      + ' Store.',
     )
     .asyncAction(
       createBuilderAction({
         program,
         command,
         prepareCredentials,
+        buildJobObject,
         builder,
         platform: PLATFORMS.ANDROID,
         os: ['darwin', 'linux'],
@@ -50,6 +41,26 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
+const buildJobObject = (
+  appJSON: any,
+  { releaseChannel, username, projectDir, publicUrl, buildType }: any,
+  credentials: any,
+) => ({
+  config: {
+    ..._.get(appJSON, 'expo.android.config', {}),
+    releaseChannel,
+    androidPackage: _.get(appJSON, 'expo.android.package'),
+    publicUrl,
+    buildType,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.ANDROID,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  projectDir,
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
   const { keystorePath, keystoreAlias } = cmd;
   const keystorePassword = process.env.EXPO_ANDROID_KEYSTORE_PASSWORD;

src/bin/commands/build/index.ts

@@ -15,12 +15,7 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported unless '
-      + '--allow-non-https-public-url is also set!',
-    )
-    .option(
-      '--allow-non-https-public-url',
-      'allows non-HTTPS URLs in --public-url; this should only be used when building an unpublished application',
+      'the URL of an externally hosted manifest (for self-hosted apps).',
     )
     .option(
       '--release-channel <channel-name>',

src/bin/commands/build/ios.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import _ from 'lodash';
+import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { createBuilderAction } from 'turtle/bin/utils/builder';
@@ -31,6 +32,7 @@ export default (program: any, setCommonCommandOptions: any) => {
         program,
         command,
         prepareCredentials,
+        buildJobObject,
         builder,
         platform: PLATFORMS.IOS,
         os: 'darwin',
@@ -38,6 +40,21 @@ export default (program: any, setCommonCommandOptions: any) => {
     );
 };
 
+const buildJobObject = (appJSON: any, { releaseChannel, buildType, username, publicUrl }: any, credentials: any) => ({
+  config: {
+    ..._.get(appJSON, 'expo.ios.config', {}),
+    buildType,
+    releaseChannel,
+    bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier'),
+    publicUrl,
+  },
+  id: uuid.v4(),
+  platform: PLATFORMS.IOS,
+  sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
+  experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
+  ...(credentials && { credentials }),
+});
+
 const prepareCredentials = async (cmd: any) => {
   if (cmd.type !== IOS_BUILD_TYPES.ARCHIVE) {
     return null;

src/bin/setup/android/index.ts

@@ -5,6 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
 
+import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -14,38 +15,27 @@ import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';
 
 const which = util.promisify(_which);
-const JAVA_REQUIRED_VERSION = 8;
 const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'bash',
     missingDescription: 'Please install bash',
   },
+  {
+    command: 'gulp',
+    missingDescription: 'Run `npm install -g gulp-cli` (or `yarn global add gulp-cli`) to install gulp',
+  },
   {
     command: 'javac',
-    missingDescription:
-      `Please install JDK 8 - keep in mind that other versions are not supported by Android`,
+    missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
     testFn: async () => {
-      const { status, stdout, stderr } = await ExponentTools.spawnAsyncThrowError(
-        'java',
+      const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
+        'javac',
         ['-version'],
         { stdio: 'pipe' },
       );
       if (stdout.match(/no java runtime present/i)) {
         return false;
       }
-
-      const matchResult = stderr.match(/.*version "(.*)"/);
-      if (matchResult) {
-        const [, currentFullJavaVersion] = matchResult;
-        const javaMajorVersionPosition = currentFullJavaVersion.startsWith('1.') ? 1 : 0;
-        const javaMajorVersion = Number(currentFullJavaVersion.split('.')[javaMajorVersionPosition]);
-        if (javaMajorVersion !== JAVA_REQUIRED_VERSION) {
-          throw new Error(`You're on Java ${currentFullJavaVersion}, please install version ${JAVA_REQUIRED_VERSION}`);
-        }
-      } else {
-        logger.warn(`Couldn't find Java version number, assuming you're on Java ${JAVA_REQUIRED_VERSION}...`);
-      }
-
       return status === 0;
     },
   },
@@ -68,15 +58,16 @@ export default async function setup(sdkVersion?: string) {
 async function prepareAndroidEnv() {
   await fs.ensureDir(config.directories.androidDependenciesDir);
   const sdkConfig = await ensureAndroidSDKIsPresent();
-  _setEnvVars(sdkConfig.envVars);
-  _alterPath(sdkConfig.path);
+  const ndkConfig = await ensureAndroidNDKIsPresent();
+  _setEnvVars({ ...sdkConfig.envVars, ...ndkConfig.envVars });
+  _alterPath([...sdkConfig.path, ...sdkConfig.path]);
 }
 
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }
 
-async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: string) {
+async function _shellAppPostDownloadAction(workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
   if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
@@ -91,19 +82,15 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
     await _installNodeModules(workingdir);
   }
 
-  // TODO: remove this after making sure that we don't need node_modules in tools-public for older sdks
-  if (ExponentTools.parseSdkMajorVersion(sdkVersion) < 33) {
-    const toolsPublicDir = path.join(workingdir, 'tools-public');
-    await _installNodeModules(toolsPublicDir);
-  }
+  // TODO: remove following lines after upgrading android shell app
+  const toolsPublicDir = path.join(workingdir, 'tools-public');
+  await _installNodeModules(toolsPublicDir);
 }
 
 async function _installNodeModules(cwd: string) {
   l.info(`installing dependencies in ${cwd} directory...`);
   const command = await _shouldUseYarnOrNpm();
-  // Keep in sync with /Dockerfile
-  // --prod requires --ignore-scripts (otherwise expo-yarn-workspaces errors as missing)
-  await ExponentTools.spawnAsyncThrowError(command, ['install', '--ignore-scripts', '--production'], {
+  await ExponentTools.spawnAsyncThrowError(command, ['install'], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
     cwd,

src/bin/setup/android/ndk.ts

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

src/bin/setup/android/sdk.ts

@@ -5,7 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-import * as utils from 'turtle/bin/setup/utils/common';
+import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -17,10 +17,9 @@ const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
-  await utils.removeDirectoryUnlessReady(androidSdkDir);
   if (!(await fs.pathExists(androidSdkDir))) {
     await fs.ensureDir(androidSdkDir);
-    const androidSdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_SDK_URL);
+    const androidSdkDownloadPath = formatArtifactDownloadPath(ANDROID_SDK_URL);
 
     try {
       l.info('Downloading Android SDK');
@@ -32,7 +31,6 @@ export default async function ensureAndroidSDKIsPresent() {
       await fs.remove(androidSdkDownloadPath);
       l.info('Configuring Android SDK, this may take a while');
       await _configureSdk(androidSdkDir);
-      await utils.markDirectoryAsReady(androidSdkDir);
       l.info('Android SDK installed and configured successfully');
     } catch (err) {
       await fs.remove(androidSdkDir);
@@ -42,7 +40,7 @@ export default async function ensureAndroidSDKIsPresent() {
     }
   }
   return {
-    envVars: await _createEnvVars(androidSdkDir),
+    envVars: _createEnvVars(androidSdkDir),
     path: _createPaths(androidSdkDir),
   };
 }
@@ -54,7 +52,7 @@ async function _configureSdk(androidSdkDir: string) {
   await ExponentTools.spawnAsyncThrowError('./configureAndroidSdk.sh', [], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
-    cwd: path.join(config.directories.rootDir, 'scripts/android'),
+    cwd: path.join(config.directories.rootDir, 'scripts/cli'),
     env: {
       ...process.env,
       ANDROID_HOME: androidSdkDir,
@@ -63,16 +61,10 @@ async function _configureSdk(androidSdkDir: string) {
   });
 }
 
-async function _createEnvVars(androidSdkDir: string) {
-  const ndkPath = path.join(androidSdkDir, 'ndk/17.2.4988734');
-  const ndkPathExists = await fs.pathExists(ndkPath);
-  if (!ndkPathExists) {
-    l.warn('Skipping NDK installation');
-  }
+function _createEnvVars(androidSdkDir: string) {
   return {
     ANDROID_HOME: androidSdkDir,
     ANDROID_SDK: androidSdkDir,
-    ...(ndkPathExists ? { ANDROID_NDK_HOME: ndkPath } : {}),
   };
 }
 

src/bin/setup/ios.ts

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

src/bin/setup/utils/common.ts

@@ -17,7 +17,7 @@ interface IShellAppFormaters {
   formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }
 
-type PostDownloadAction = (sdkVersion: string, workingdir: string) => void;
+type PostDownloadAction = (workingdir: string) => void;
 
 export async function checkSystem(requiredTools: IToolDefinition[]) {
   await ensureToolsAreInstalled(requiredTools);
@@ -29,17 +29,14 @@ export async function ensureShellAppIsPresent(
   postDownloadAction?: PostDownloadAction,
 ) {
   const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
-  const shellAppMetadata = await _readShellAppTarballS3Uri(sdkVersion, formatters);
-  await removeDirectoryUnlessReady(workingdir, shellAppMetadata);
   if (await fs.pathExists(workingdir)) {
     return;
   }
   l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
   await _downloadShellApp(sdkVersion, workingdir, formatters);
   if (postDownloadAction) {
-    await postDownloadAction(sdkVersion, workingdir);
+    await postDownloadAction(workingdir);
   }
-  await markDirectoryAsReady(workingdir, shellAppMetadata);
 }
 
 async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
@@ -68,31 +65,3 @@ async function _readShellAppTarballS3Uri(sdkVersion: string, formatters: IShellA
   const data = await fs.readFile(filePath, 'utf8');
   return data.trim();
 }
-
-export async function removeDirectoryUnlessReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  const readyFileExists = await fs.pathExists(readyFilePath);
-  let shouldRemove = false;
-  if (readyFileExists) {
-    if (metadata !== undefined) {
-      const readyFileContents = (await fs.readFile(readyFilePath, 'utf-8')).trim();
-      if (readyFileContents !== metadata) {
-        shouldRemove = true;
-       }
-    }
-  } else {
-    shouldRemove = true;
-  }
-  if (shouldRemove) {
-    await fs.remove(dir);
-  }
-}
-
-export async function markDirectoryAsReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
-  if (metadata === undefined) {
-    await fs.open(readyFilePath, 'w');
-  } else {
-    await fs.writeFile(readyFilePath, metadata);
-  }
-}

src/bin/setup/utils/toolsDetector.ts

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

src/bin/utils/builder.ts

@@ -1,16 +1,10 @@
-import _url from 'url';
-
-import { ConfigError, getExpoSDKVersion, ProjectConfig } from '@expo/config';
-import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
-import uuid from 'uuid';
 
 import { ErrorWithCommandHelp } from 'turtle/bin/commands/ErrorWithCommandHelp';
 import { ErrorWithProgramHelp } from 'turtle/bin/commands/ErrorWithProgramHelp';
 import setup from 'turtle/bin/setup/setup';
 import * as ProjectUtils from 'turtle/bin/utils/project';
 import * as UserUtils from 'turtle/bin/utils/user';
-import { getExperienceUrl } from 'turtle/builders/utils/common';
 import logger from 'turtle/logger';
 import { sanitizeJob } from 'turtle/validator';
 
@@ -18,6 +12,7 @@ export function createBuilderAction({
   program,
   command,
   prepareCredentials,
+  buildJobObject,
   builder,
   platform,
   os,
@@ -57,29 +52,20 @@ export function createBuilderAction({
         );
       }
 
-      if (cmd.publicUrl && !cmd.allowNonHttpsPublicUrl) {
-        const parsedPublicUrl = _url.parse(cmd.publicUrl);
-        if (parsedPublicUrl.protocol !== 'https:') {
-          throw new ErrorWithCommandHelp('--public-url is invalid - only HTTPS urls are supported');
-        }
-      }
-
-      const projectAbsoluteDir = ProjectUtils.resolveAbsoluteDir(projectDirArg);
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,
-        buildMode: cmd.mode,
         username: userData.username || 'anonymous',
-        projectDir: projectAbsoluteDir,
+        projectDir: ProjectUtils.resolveAbsoluteDir(projectDirArg),
         publicUrl: cmd.publicUrl,
       };
 
-      const projectConfig = await ProjectUtils.getConfig(projectDirArg, cmd.config);
-      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, projectConfig);
+      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
+      const sdkVersion = _.get(appJSON, 'expo.sdkVersion');
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...await buildJobObject(cmd, platform, projectConfig, args, credentials, sdkVersion),
+        ...buildJobObject(appJSON, args, credentials),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -96,58 +82,3 @@ export function createBuilderAction({
     }
   };
 }
-
-function getExpoSDKVersionSafely(projectDir: string, projectConfig: ProjectConfig) {
-  try {
-    return getExpoSDKVersion(projectDir, projectConfig.exp);
-  } catch (err) {
-    if (err instanceof ConfigError) {
-      throw new Error(
-        'Couldn\'t find the `expo` library in your project\'s dependencies.'
-        + ' Have you run \'yarn install\' or \'npm install\' for your project?',
-      );
-    } else {
-      throw err;
-    }
-  }
-}
-
-const buildJobObject = async (
-  cmd: any,
-  platform: 'android' | 'ios',
-  projectConfig: ProjectConfig,
-  { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
-  credentials: any,
-  sdkVersion: string,
-) => {
-  const owner = projectConfig.exp.owner || username;
-  const experienceName = `@${owner}/${projectConfig.exp.slug}`;
-  const job = {
-    config: {
-      ...(projectConfig.exp?.[platform]?.config || {}),
-      buildType,
-      releaseChannel,
-      publicUrl,
-      ...(platform === 'android' && cmd.gradleArgs ? { gradleArgs: cmd.gradleArgs.split(' ') } : {}),
-      ...(platform === 'android' ? { buildMode } : {}),
-      ...(platform === 'android' ? { androidPackage: projectConfig.exp?.android?.package } : {}),
-      ...(platform === 'ios' ? { bundleIdentifier: projectConfig.exp?.ios?.bundleIdentifier } : {}),
-    },
-    id: uuid.v4(),
-    platform,
-    projectDir,
-    sdkVersion,
-    experienceName,
-    ...(credentials && { credentials }),
-  };
-  const url = getExperienceUrl(job.experienceName, job.config.publicUrl);
-
-  const manifest = await ExponentTools.getManifestAsync(url, {
-    'Exponent-SDK-Version': sdkVersion,
-    'Exponent-Platform': platform,
-    'Expo-Release-Channel': releaseChannel,
-    'Accept': 'application/expo+json,application/json',
-  });
-
-  return { ...job, manifest };
-};

src/bin/utils/project.ts

@@ -1,18 +1,20 @@
+import fs from 'fs-extra';
 import path from 'path';
 
-import { getConfig as getProjectConfig, setCustomConfigPath } from '@expo/config';
-import fs from 'fs-extra';
-
-export async function getConfig(projectDir: string, config: string | null) {
-  projectDir = resolveAbsoluteDir(projectDir);
+export async function loadAppJSON(projectDirArg: string, config: string | null) {
+  let appJSONPath;
   if (config) {
-    const pathToConfig = path.resolve(process.cwd(), config);
-    if (!await fs.pathExists(pathToConfig)) {
-      throw new Error(`File at provided config path does not exist: ${pathToConfig}`);
-    }
-    setCustomConfigPath(projectDir, pathToConfig);
+    appJSONPath = resolveAbsoluteDir(config);
+  } else {
+    const projectDir = resolveAbsoluteDir(projectDirArg);
+    appJSONPath = path.join(projectDir, 'app.json');
+  }
+  const appJSONExists = await fs.pathExists(appJSONPath);
+  if (!appJSONExists) {
+    throw new Error(`Couldn't find app.json.`);
+  } else {
+    return require(appJSONPath);
   }
-  return await getProjectConfig(projectDir, {});
 }
 
 export const resolveAbsoluteDir = (dir: string) => {

src/bin/utils/user.ts

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

src/builders/android.ts

@@ -3,6 +3,7 @@ import path from 'path';
 import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import semver from 'semver';
 import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
 
@@ -10,7 +11,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveExplicitOptIn, resolveNativeModules } from 'turtle/builders/utils/unimodules';
+import { resolveNativeModules } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -26,7 +27,7 @@ export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
   const s3FileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
   const s3Filename = `${jobData.experienceName}-${randomHex}-signed.${s3FileExtension}`;
   const s3FileKey = `android/${s3Filename}`;
-  const fakeUploadFilename = s3Filename.replace('/', '__');
+  const fakeUploadFilename = s3Filename.replace('/', '\\');
 
   const artifactUrl = await uploadBuildToS3({
     uploadPath: outputFilePath,
@@ -34,8 +35,8 @@ export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
     ...config.builder.fakeUpload && {
       fakeUploadBuildPath:
         jobData.fakeUploadBuildPath
-          ? jobData.fakeUploadBuildPath
-          : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename),
+        ? jobData.fakeUploadBuildPath
+        : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename),
     },
   });
 
@@ -72,24 +73,14 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
-  // Default behaviour:
-  // - load all modules except [expo-branch]
-  // - load expo-branch only if present in package.json dependencies
-  //
-  // Behaviour with "enableDangerousExperimentalLeanBuilds" flag enabled
-  // - add unimodules from `manifest.dependencies` (project package.json dependecies)
-  // - add unimodules from react-native-unimodules package.json
-  // - add unimodules from expo package package.json
-  // - add recusively all dependecies of already added unimodules
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const packageJsonDependecies = _.get(manifest, 'dependencies');
-  const enabledModules = _.get(manifest, 'android.enableDangerousExperimentalLeanBuilds')
-    ? await resolveNativeModules(workingDir, sdkVersion, packageJsonDependecies)
-    : await resolveExplicitOptIn(workingDir, packageJsonDependecies);
+  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
+    ? await resolveNativeModules(workingDir, manifest.dependencies)
+    : null;
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
-      url: commonUtils.getExperienceUrl(jobData.experienceName, jobData.config.publicUrl),
+      url: commonUtils.getExperienceUrl(jobData),
       sdkVersion,
       keystore: tempKeystorePath,
       manifest,
@@ -102,8 +93,6 @@ async function runShellAppBuilder(
       outputFile: outputFilePath,
       modules: enabledModules,
       buildType: jobData.config.buildType,
-      buildMode: jobData.config.buildMode,
-      gradleArgs: jobData.config.gradleArgs,
     });
   } catch (err) {
     commonUtils.logErrorOnce(err);

src/builders/ios/context.ts

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

src/builders/ios/index.ts

@@ -1,7 +1,6 @@
 import fs from 'fs-extra';
 import pick from 'lodash/pick';
 
-import spawnAsync from '@expo/spawn-async';
 import buildArchive from 'turtle/builders/ios/archive';
 import { createBuilderContext, IContext } from 'turtle/builders/ios/context';
 import buildSimulator from 'turtle/builders/ios/simulator';
@@ -52,13 +51,6 @@ async function initBuilder(ctx: IContext) {
     await fs.ensureDir(dir);
     await fs.chmod(dir, 0o755);
   }
-
-  if (config.builder.mode === 'online') {
-    await spawnAsync('sudo', ['xcrun', 'simctl', 'list']);
-  } else {
-    // sudo not needed for CLI builds
-    await spawnAsync('xcrun', ['simctl', 'list']);
-  }
 }
 
 async function cleanup(ctx: IContext) {
@@ -69,4 +61,4 @@ async function cleanup(ctx: IContext) {
 }
 
 const getTemporaryDirs = (ctx: IContext) =>
-  Object.values(pick(ctx, ['appDir', 'provisioningProfileDir'])) as string[];
+  Object.values(pick(ctx, ['appDir', 'provisioningProfileDir']));

src/builders/utils/android/credentials.ts

@@ -1,14 +1,15 @@
 import path from 'path';
 
-import { AndroidCredentials } from '@expo/xdl';
+import { Credentials } from '@expo/xdl';
 import fs from 'fs-extra';
 import get from 'lodash/get';
 import uuidv4 from 'uuid/v4';
 
+import * as sqs from 'turtle/aws/sqs';
+import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
 import { IAndroidCredentials, IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 import { isOffline } from 'turtle/turtleContext';
-import { sendCredentialsUpdate } from 'turtle/utils/www';
 
 async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredentials> {
   if (!jobData.credentials) {
@@ -28,7 +29,7 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
       );
     }
 
-    await AndroidCredentials.createKeystore(
+    await Credentials.Android.createKeystore(
       {
         keystorePath: keystoreFilename,
         keystorePassword: credentials.keystorePassword,
@@ -49,7 +50,9 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
       l.info(`Key password: ${credentials.keyPassword}`);
       l.info(`Please keep these credentials safe`);
     } else {
-      await sendCredentialsUpdate(jobData.id, 'android', credentials);
+      await sqs.sendMessage(jobData.id, UPDATE_CREDENTIALS, {
+        ...credentials,
+      });
       l.info('Keystore sent to storage successfully');
     }
     await fs.unlink(keystoreFilename);

src/builders/utils/common.ts

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

src/builders/utils/ios/adhocBuild.ts

@@ -3,12 +3,14 @@ import path from 'path';
 import spawnAsync from '@expo/spawn-async';
 import { IosCodeSigning } from '@expo/xdl';
 import fs from 'fs-extra';
+import isEmpty from 'lodash/isEmpty';
 
+import * as sqs from 'turtle/aws/sqs';
 import BuildError, { BuildErrorReason } from 'turtle/builders/BuildError';
+import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
 import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 import { isOffline } from 'turtle/turtleContext';
-import { sendCredentialsUpdate } from 'turtle/utils/www';
 
 // tslint:disable-next-line:no-var-requires
 const travelingFastlane = process.platform === 'darwin' ? require('@expo/traveling-fastlane-darwin')() : null;
@@ -19,18 +21,10 @@ async function prepareAdHocBuildCredentials(job: IJob) {
   }
 
   const { bundleIdentifier } = job.config;
-  const {
-    certP12,
-    certPassword,
-    teamId,
-    appleSession,
-    udids,
-    provisioningProfileId,
-  } = job.credentials;
+  const { certP12, certPassword, teamId, appleSession, udids } = job.credentials;
 
   const certSerialNumber = IosCodeSigning.findP12CertSerialNumber(certP12, certPassword);
   const args = [
-    ...(provisioningProfileId ? ['--profile-id', provisioningProfileId] : []),
     teamId,
     udids!.join(','),
     bundleIdentifier,
@@ -38,32 +32,31 @@ async function prepareAdHocBuildCredentials(job: IJob) {
   ];
 
   try {
-    if (provisioningProfileId) {
-      logger.info(
-        `Using ad hoc provisioning profile id: ${provisioningProfileId}`,
-      );
-    }
-
     const credentials = await runFastlaneAction(
       travelingFastlane.manageAdHocProvisioningProfile,
       args,
       { env: { FASTLANE_SESSION: appleSession } },
     );
+    if (isEmpty(credentials)) {
+      if (!job.credentials.provisioningProfile) {
+        // a user has generated the provisioning profile for his app, but he probably deleted it from Expo servers, ...
+        throw new BuildError(
+          BuildErrorReason.PROVISIONING_PROFILE_MISSING,
+          `Provisioning profile is missing on Expo servers.`,
+        );
+      }
+      return;
+    }
 
     logger.info('New ad hoc provisioning profile successfully created');
     job.credentials.provisioningProfile = credentials.provisioningProfile;
 
-    if (!credentials.provisioningProfileUpdateTimestamp) {
-      //  dont need to persist profile because nothing changed
-      return;
-    }
-
     if (isOffline()) {
       const provisioningProfilePath = path.join(job.projectDir, `adhoc.mobileprovision`);
       await fs.writeFile(provisioningProfilePath, Buffer.from(credentials.provisioningProfile, 'base64'));
       logger.info(`Saved provisioning profile to ${provisioningProfilePath}`);
     } else {
-      await sendCredentialsUpdate(job.id, 'ios', {
+      await sqs.sendMessage(job.id, UPDATE_CREDENTIALS, {
         provisioningProfileId: credentials.provisioningProfileId,
         provisioningProfile: credentials.provisioningProfile,
       });