Release 0.27.4

Fix expo-notifications `useLastNotificationResponse` overwritten issue on Android 12

.circleci/config.yml

@@ -307,8 +307,6 @@ workflows:
   tests:
     jobs:
       - unit_tests
-      - ios_smoke_tests
-      - android_smoke_tests
   deploy:
     jobs:
       - android_staging_approve_deploy:

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -1,10 +1,9 @@
 ---
 name: "\U0001F41B Bug Report"
 about: You want to report a reproducible bug or regression in turtle-cli.
-title: ''
-labels: 'bug'
-assignees: ''
-
+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] -->
@@ -13,14 +12,16 @@ assignees: ''
 
 - [ ] Updated turtle-cli to the latest version (`yarn global add turtle-cli` or `npm install --global turtle-cli`).
 - [ ] I read the [Contribution Guidelines](https://github.com/expo/turtle/blob/master/CONTRIBUTING.md).
-- [ ] I read [docs.expo.io](https://docs.expo.io) (Managed Workflow > Distributing Your App).
+- [ ] I 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

.github/ISSUE_TEMPLATE/QUESTION.md

@@ -1,21 +1,22 @@
 ---
 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: ''
-
+title: ""
+labels: "question"
+assignees: ""
 ---
 
 ### Question Checklist
 
 - [ ] I read the [Contribution Guidelines](https://github.com/expo/turtle/blob/master/CONTRIBUTING.md).
-- [ ] I read [docs.expo.io](https://docs.expo.io) (Managed Workflow > Distributing Your App).
+- [ ] I 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 -->

CHANGELOG.md

@@ -7,7 +7,154 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Updated SDK 40 Android, iOS, and client tarballs for patch release.
+# [0.27.3] - 2022-06-18
+
+- Update Android SDK 45 shell tarball to fix the notification trampoline issues for Android 12+.
+
+# [0.27.2] - 2022-06-15
+
+- Update Android shell tarballs for SDK 44 and 43.
+
+# [0.27.1] - 2022-06-13
+
+- Update Android shell tarball for SDK 45.
+
+# [0.27.0] - 2022-05-23
+
+- Add iOS and Android shell tarballs for SDK 45.
+
+# [0.26.0] - 2022-03-21
+
+- Remove JDK 8 validation. [#389](https://github.com/expo/turtle/pull/389)
+- Update android toolchain. [#389](https://github.com/expo/turtle/pull/389)
+
+# [0.25.0] - 2022-03-11
+
+- Swap out Cloudfront CDN for `classic-assets.eascdn.net`. [#375](https://github.com/expo/turtle/pull/375)
+- Disable bitcode for iOS builds.
+
+# [0.24.3] - 2021-12-29
+
+- Update ios sdk 44 shell tarball with [orientation lock fix](https://github.com/expo/expo/pull/15715)
+
+# [0.24.2] - 2021-12-16
+
+- Update Android shell tarball for SDK 44.
+
+# [0.24.1] - 2021-12-15
+
+- Update iOS and Android tarballs for SDK 44 RC. [#369](https://github.com/expo/turtle/pull/369).
+
+# [0.24.0] - 2021-12-10
+
+- Update iOS and Android tarballs for SDK 44 beta.
+- Add detection for Expo modules using `expo-module.config.json`, the successor to `unimodule.json`. [#368](https://github.com/expo/turtle/pull/368).
+- Redirect google bintray url to localhost. [#361](https://github.com/expo/turtle/pull/361)
+
+# [0.23.6] - 2021-12-08
+
+- Update android shell tarballs for bintray error fix. [#363](https://github.com/expo/turtle/pull/363)
+- Update AWS SDK. [#365](https://github.com/expo/turtle/pull/365)
+
+# [0.23.5] - 2021-11-12
+
+- Update iOS SDK 43 tarball with expo-updates fix for [#14967](https://github.com/expo/expo/issues/14967)
+
+# [0.23.4] - 2021-11-09
+
+- Update Android SDK 43 tarball with expo-updates fix for [#15112](https://github.com/expo/expo/issues/15112)
+
+# [0.23.3] - 2021-11-04
+
+- Update iOS and Android SDK 43 tarballs with expo-updates fixes for [#14930](https://github.com/expo/expo/issues/14930)
+
+# [0.23.2] - 2021-10-29
+
+- Update Android SDK 43 shell app with proguard fix
+
+# [0.23.1] - 2021-10-20
+
+- Add iOS and Android tarballs for SDK 43
+
+# [0.23.0] - 2021-10-07
+
+- Add iOS and Android beta tarballs 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
 

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.io/guidelines
+https://expo.dev/guidelines

CONTRIBUTING.md

@@ -1,30 +1,37 @@
 # Contributing to Turtle CLI
 
 ## How to contribute
+
 You can contribute to Turtle CLI in various ways, including:
+
 - [Reporting bugs or issues](https://github.com/expo/turtle/issues/new) on GitHub. Please make sure to fill in all the details suggested by the template to make sure the issue can be addressed as quickly as possible.
 - [Submitting improvements to the documentation](https://github.com/expo/expo/tree/master/docs). Updates, enhancements, new guides, spelling fixes…
-- Helping other people on [Expo Forums](https://forums.expo.io/) and on [Expo Developers Slack](http://slack.expo.io).
+- Helping other people on [Expo Forums](https://forums.expo.dev/) and on [Expo Developers Discord](http://chat.expo.dev).
 - 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.
 
 ## 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.
+- If you wish to release a new _beta_ version of `turtle-cli`, run `yarn release:beta` instead.
 - Update the [changelog](CHANGELOG.md).

Dockerfile

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.5.0
+FROM gcr.io/exponentjs/turtle-android-base:0.8.0
 
 ADD . /app/turtle
 
@@ -11,12 +11,13 @@ 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 packages non-workspace-packages && \
+  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 && \
-  mv non-workspace-packages packages ; \
+  yarn install --ignore-scripts --prod ; \
   done
 
 ENV NODE_ENV "production"

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 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/)
+[![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/)
 
 <hr />
 
@@ -21,7 +21,7 @@ You can use it both on your CI and your private computer.
 
 ## Installation
 
-[Installation instructions and documentation here.](https://docs.expo.io/distribution/turtle-cli/)
+[Installation instructions and documentation here.](https://docs.expo.dev/distribution/turtle-cli/)
 
 ## Usage example
 
@@ -29,13 +29,13 @@ See the [expo/turtle-cli-example](https://github.com/expo/turtle-cli-example) re
 
 ## Do you need help?
 
-- Make sure you've read [the Expo Docs](https://docs.expo.io/), especially [Building Standalone Apps on Your CI
-](https://docs.expo.io/versions/latest/distribution/turtle-cli) and [Building Standalone Apps](https://docs.expo.io/versions/latest/distribution/building-standalone-apps) guides.
+- 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.
 - Search for existing GitHub issues [in this repository](https://github.com/expo/turtle/issues) and in [expo/expo](https://github.com/expo/expo/issues) repository.
 - Ask for help in **one** of the following ways:
-  * create [a GitHub issue](https://github.com/expo/turtle/issues/new).
-  * create a new topic on [Expo Forums](https://forums.expo.io/).
-  * ask a question on [Expo Developers Slack](http://slack.expo.io).
+  - 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).
 
 ## License
 

docker-base/Dockerfile

@@ -1,6 +1,6 @@
 # If you ever need to rebuild this, run:
 # yarn docker:build-and-push:android-base-image NEW_IMAGE_SEMVER
-FROM openjdk:8u141
+FROM openjdk:11.0.14.1-jdk
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -18,7 +18,6 @@ RUN dpkg --add-architecture i386 && \
   bzip2:i386\
   file\
   jq\
-  lib32ncurses5\
   lib32z1\
   libc6:i386\
   libncurses5:i386\
@@ -32,7 +31,7 @@ RUN dpkg --add-architecture i386 && \
   apt-get clean
 
 ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 12.16.1
+ENV NODE_VERSION 14.17.3
 
 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 \
@@ -41,14 +40,11 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
 # Download and untar SDK
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-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
+RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip > /tmp/tools.zip && \
+  mkdir -p $ANDROID_HOME/cmdline-tools && \
+  unzip -q -d $ANDROID_HOME/cmdline-tools /tmp/tools.zip && \
+  mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/tools && \
+  rm /tmp/tools.zip
 
 ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools:${PATH}

k8s/android/turtle-deployment.template.yml

@@ -64,10 +64,7 @@ spec:
                 name: turtle-js-config
                 key: aws_secret_access_key
           - name: AWS_SQS_REGION
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: aws_sqs_region
+            value: us-west-2
           - name: AWS_SQS_IOS_QUEUE_URL
             valueFrom:
               secretKeyRef:
@@ -144,15 +141,12 @@ spec:
           - name: DISABLE_DEX_MAX_HEAP
             value: "true"
           - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
+            value: '-Xms2048m -Xmx17g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
           - name: GRADLE_OPTS
-            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
+            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx17g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
           - name: REDIS_CA_CERTIFICATE
             value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
         resources:
           requests:
-            memory: "8192Mi"
-            cpu: "2000m"
-          limits:
-            memory: "8192Mi"
-            cpu: "2000m"
+            memory: "17Gi" # 17.8 GiB is max value reachable on current nodes
+            cpu: "5000m"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.20.7",
+  "version": "0.27.4",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -57,7 +57,7 @@
   "engines": {
     "node": ">=10"
   },
-  "author": "Expo <support@expo.io>",
+  "author": "Expo <support@expo.dev>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/expo/turtle/issues"
@@ -75,14 +75,14 @@
     "@types/jest": "^23.3.9",
     "@types/joi": "^13.4.3",
     "@types/lodash": "^4.14.129",
-    "@types/node-forge": "^0.8.6",
+    "@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.17.8",
+    "@types/sharp": "0.28.3",
     "@types/tar": "^4.0.0",
     "@types/uuid": "^3.4.3",
     "@types/webpack": "^4.32.1",
@@ -107,10 +107,10 @@
   "dependencies": {
     "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "59.0.17",
+    "@expo/xdl": "^59.2.0",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
-    "aws-sdk": "^2.226.1",
+    "aws-sdk": "^2.1043.0",
     "bunyan": "^1.8.12",
     "bunyan-debug-stream": "^1.0.8",
     "bunyan-sentry-stream": "^1.2.1",
@@ -129,7 +129,7 @@
     "request-progress": "^3.0.0",
     "request-promise": "^4.2.5",
     "semver": "^6.0.0",
-    "sharp": "0.24.1",
+    "sharp": "0.28.3",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
@@ -139,7 +139,7 @@
     "@expo/traveling-fastlane-darwin": "1.11.4"
   },
   "volta": {
-    "node": "12.16.1",
+    "node": "14.17.3",
     "yarn": "1.22.0"
   }
 }

scripts/android/configureAndroidSdk.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
+SDKMANAGER=$ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager
 
 yes | $SDKMANAGER --licenses > /dev/null
 if [[ "$1" = "--install-all-platforms" ]]; then
@@ -19,4 +19,8 @@ yes | $SDKMANAGER \
   "extras;google;m2repository" \
   "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
 
-yes | $SDKMANAGER "ndk;17.2.4988734" | 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/tests/runAndroidSmokeTestsCI.sh

@@ -18,7 +18,7 @@ export AWS_S3_BUCKET="exp-shell-app-assets"
 export AWS_S3_REGION="us-west-1"
 export AWS_CLOUDWATCH_REGION="us-west-1"
 export API_PROTOCOL="http"
-export API_HOSTNAME="staging.expo.io"
+export API_HOSTNAME="staging.exp.host"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"

scripts/tests/runIOSSmokeTestsCI.sh

@@ -14,7 +14,7 @@ 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.expo.io"
+export API_HOSTNAME="staging.exp.host"
 export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"

shellTarballs/android/sdk39

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

shellTarballs/android/sdk40

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-277393d97877f56ba3639ab153c69f109d248436.tar.gz
+s3://exp-artifacts/android-shell-builder-da0e85b79332cb8e93178aefcd90f7450e6e923e.tar.gz

shellTarballs/android/sdk41

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

shellTarballs/android/sdk42

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

shellTarballs/android/sdk43

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

shellTarballs/android/sdk44

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

shellTarballs/android/sdk45

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

shellTarballs/ios/sdk41

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

shellTarballs/ios/sdk42

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

shellTarballs/ios/sdk43

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

shellTarballs/ios/sdk44

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

shellTarballs/ios/sdk45

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

src/__tests__/fixtures/iosJob.json

@@ -83,7 +83,7 @@
        ],
        "description": "A very interesting project.",
        "icon": "./assets/images/icon.png",
-       "iconUrl": "https://d1wp6m56sqw74a.cloudfront.net/~assets/fa6577fecc0a7838f15a254577639984",
+       "iconUrl": "https://classic-assets.eascdn.net/~assets/fa6577fecc0a7838f15a254577639984",
        "ios": {
           "bundleIdentifier": "com.niech.to.zadziala",
           "supportsTablet": true
@@ -101,7 +101,7 @@
        "splash": {
           "backgroundColor": "#ffffff",
           "image": "./assets/images/splash.png",
-          "imageUrl": "https://d1wp6m56sqw74a.cloudfront.net/~assets/43ec0dcbe5a156bf9e650bb8c15e7af6",
+          "imageUrl": "https://classic-assets.eascdn.net/~assets/43ec0dcbe5a156bf9e650bb8c15e7af6",
           "resizeMode": "contain"
        },
        "updates": {
@@ -112,7 +112,7 @@
        "revisionId": "1.0.0-r.zV1W89wn23",
        "publishedTime": "2018-10-16T08:44:05.362Z",
        "commitTime": "2018-10-16T08:44:05.403Z",
-       "bundleUrl": "https://d1wp6m56sqw74a.cloudfront.net/%40admin%2FtestApp%2F1.0.0%2Fb8678e2be7cd5bb9e240db0dd3c691c0-29.0.0-ios.js",
+       "bundleUrl": "https://classic-assets.eascdn.net/%40admin%2FtestApp%2F1.0.0%2Fb8678e2be7cd5bb9e240db0dd3c691c0-29.0.0-ios.js",
        "releaseChannel": "default",
        "hostUri": "exp.host/@admin/testApp"
     },

src/bin/setup/android/index.ts

@@ -14,7 +14,6 @@ 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',
@@ -23,9 +22,9 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'javac',
     missingDescription:
-      `Please install JDK 8 - keep in mind that other versions are not supported by Android`,
+      `Please install JDK 11 - keep in mind that other versions might not be supported by Android`,
     testFn: async () => {
-      const { status, stdout, stderr } = await ExponentTools.spawnAsyncThrowError(
+      const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
         'java',
         ['-version'],
         { stdio: 'pipe' },
@@ -33,19 +32,6 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
       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;
     },
   },

src/bin/setup/android/sdk.ts

@@ -10,14 +10,15 @@ import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
 
-const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';
+const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip';
 
 const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
 const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
-  await utils.removeDirectoryUnlessReady(androidSdkDir);
+  const readyFileName = '.ready-v2';
+  await utils.removeDirectoryUnlessReady(androidSdkDir, { readyFileName });
   if (!(await fs.pathExists(androidSdkDir))) {
     await fs.ensureDir(androidSdkDir);
     const androidSdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_SDK_URL);
@@ -26,13 +27,14 @@ export default async function ensureAndroidSDKIsPresent() {
       l.info('Downloading Android SDK');
       await fs.ensureDir(config.directories.artifactsDir);
       await download(ANDROID_SDK_URL, androidSdkDownloadPath);
-      await fs.ensureDir(androidSdkDir);
+      const cmdlineToolsDir = path.join(androidSdkDir, 'cmdline-tools/tools');
+      await fs.ensureDir(cmdlineToolsDir);
       l.info('Decompressing Android SDK');
-      await decompress(androidSdkDownloadPath, androidSdkDir);
+      await decompress(androidSdkDownloadPath, cmdlineToolsDir, { strip: 1 });
       await fs.remove(androidSdkDownloadPath);
       l.info('Configuring Android SDK, this may take a while');
       await _configureSdk(androidSdkDir);
-      await utils.markDirectoryAsReady(androidSdkDir);
+      await utils.markDirectoryAsReady(androidSdkDir, { readyFileName });
       l.info('Android SDK installed and configured successfully');
     } catch (err) {
       await fs.remove(androidSdkDir);
@@ -42,7 +44,7 @@ export default async function ensureAndroidSDKIsPresent() {
     }
   }
   return {
-    envVars: _createEnvVars(androidSdkDir),
+    envVars: await _createEnvVars(androidSdkDir),
     path: _createPaths(androidSdkDir),
   };
 }
@@ -63,11 +65,16 @@ async function _configureSdk(androidSdkDir: string) {
   });
 }
 
-function _createEnvVars(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');
+  }
   return {
     ANDROID_HOME: androidSdkDir,
     ANDROID_SDK: androidSdkDir,
-    ANDROID_NDK_HOME: path.join(androidSdkDir, 'ndk/17.2.4988734'),
+    ...(ndkPathExists ? { ANDROID_NDK_HOME: ndkPath } : {}),
   };
 }
 

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 = (sdkVersion: string, workingdir: string) => Promise<void>;
 
 export async function checkSystem(requiredTools: IToolDefinition[]) {
   await ensureToolsAreInstalled(requiredTools);
@@ -30,7 +30,7 @@ export async function ensureShellAppIsPresent(
 ) {
   const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
   const shellAppMetadata = await _readShellAppTarballS3Uri(sdkVersion, formatters);
-  await removeDirectoryUnlessReady(workingdir, shellAppMetadata);
+  await removeDirectoryUnlessReady(workingdir, { metadata: shellAppMetadata });
   if (await fs.pathExists(workingdir)) {
     return;
   }
@@ -39,7 +39,7 @@ export async function ensureShellAppIsPresent(
   if (postDownloadAction) {
     await postDownloadAction(sdkVersion, workingdir);
   }
-  await markDirectoryAsReady(workingdir, shellAppMetadata);
+  await markDirectoryAsReady(workingdir, { metadata: shellAppMetadata });
 }
 
 async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
@@ -69,8 +69,11 @@ async function _readShellAppTarballS3Uri(sdkVersion: string, formatters: IShellA
   return data.trim();
 }
 
-export async function removeDirectoryUnlessReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
+export async function removeDirectoryUnlessReady(
+  dir: string,
+  { metadata, readyFileName }: { metadata?: string, readyFileName?: string },
+) {
+  const readyFilePath = path.join(dir, readyFileName ?? '.ready');
   const readyFileExists = await fs.pathExists(readyFilePath);
   let shouldRemove = false;
   if (readyFileExists) {
@@ -78,7 +81,7 @@ export async function removeDirectoryUnlessReady(dir: string, metadata?: string)
       const readyFileContents = (await fs.readFile(readyFilePath, 'utf-8')).trim();
       if (readyFileContents !== metadata) {
         shouldRemove = true;
-       }
+      }
     }
   } else {
     shouldRemove = true;
@@ -88,8 +91,11 @@ export async function removeDirectoryUnlessReady(dir: string, metadata?: string)
   }
 }
 
-export async function markDirectoryAsReady(dir: string, metadata?: string) {
-  const readyFilePath = path.join(dir, '.ready');
+export async function markDirectoryAsReady(
+  dir: string,
+  { metadata, readyFileName }: { metadata?: string, readyFileName?: string },
+) {
+  const readyFilePath = path.join(dir, readyFileName ?? '.ready');
   if (metadata === undefined) {
     await fs.open(readyFilePath, 'w');
   } else {

src/builders/android.ts

@@ -17,7 +17,15 @@ import config from 'turtle/config';
 import { IAndroidCredentials, IJob, IJobResult } from 'turtle/job';
 import logger from 'turtle/logger';
 
+// temporary solution until we can rebuild shellapps
+const blockGoogleBintrayAsync = _.once(async () => {
+  if (config.builder.mode === 'online') {
+    await fs.appendFile('/etc/hosts', '\n127.0.0.1\tdl.bintray.com\n127.0.0.1\tgoogle.bintray.com\n');
+  }
+});
+
 export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
+  await blockGoogleBintrayAsync();
   await ensureCanBuildSdkVersion(jobData);
   const credentials = await getOrCreateCredentials(jobData);
   const outputFilePath = await runShellAppBuilder(jobData, credentials);

src/builders/utils/unimodules.ts

@@ -209,7 +209,9 @@ async function getPackage(
   const pkgPath = path.join(workingdir, 'packages', pkgName);
   const isAndroid = await fs.pathExists(path.join(pkgPath, 'android'));
   const isIos = await fs.pathExists(path.join(pkgPath, 'ios'));
-  const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
+  const isUnimodule =
+    (await fs.pathExists(path.join(pkgPath, 'unimodule.json'))) ||
+    (await fs.pathExists(path.join(pkgPath, 'expo-module.config.json')));
   const hasPackageJson = await fs.pathExists(
     path.join(pkgPath, 'package.json'),
   );

src/logger/index.ts

@@ -29,13 +29,13 @@ class Logger {
       jobID: job.id,
       experienceName: job.experienceName,
     });
-    const s3Url = await streams.s3.stream.init(job);
+    const s3Url = await streams.s3?.stream.init(job);
     return s3Url;
   }
 
   public async cleanup() {
     this.currentLogger = this.parentLogger;
-    await streams.s3.stream.cleanup();
+    await streams.s3?.stream.cleanup();
   }
 
   public trace(...all: any[]) {

src/logger/streams/index.ts

@@ -1,20 +1,22 @@
-import pickBy from 'lodash/pickBy';
-
+import { pickBy } from 'lodash';
 import createGCloudStream from 'turtle/logger/streams/gcloud';
 import createOfflineStream from 'turtle/logger/streams/offline';
-import createS3Stream from 'turtle/logger/streams/s3';
+import createS3Stream, { S3Stream } from 'turtle/logger/streams/s3';
 import createSentryStream from 'turtle/logger/streams/sentry';
 import { isOffline } from 'turtle/turtleContext';
 
-interface IStream {
-  stream: any;
+interface IStream<T> {
+  stream: T;
   type?: string;
   level?: string;
   reemitErrorEvents?: boolean;
 }
 
 interface IStreamMap {
-  [key: string]: IStream;
+  stdout: IStream<any>;
+  gcloud?: IStream<any>;
+  s3?: IStream<S3Stream>;
+  sentry?: IStream<any>;
 }
 
 function prepareStreams(): IStreamMap {
@@ -29,7 +31,7 @@ function prepareStreams(): IStreamMap {
       s3: createS3Stream(),
       sentry: createSentryStream(),
     };
-    return pickBy(allStreams) as IStreamMap;
+    return pickBy(allStreams) as any as IStreamMap;
   }
 }
 

src/logger/streams/s3.ts

@@ -18,7 +18,7 @@ export default function create() {
   };
 }
 
-class S3Stream extends EventEmitter {
+export class S3Stream extends EventEmitter {
   private s3Url: string | null = null;
   private lastFlush: number | null = null;
   private filePath: string | null = null;
@@ -44,7 +44,11 @@ class S3Stream extends EventEmitter {
 
   public async cleanup() {
     await this.flush(true);
-    await fs.close(this.fileHandle as number);
+
+    if (this.fileHandle) {
+      await fs.close(this.fileHandle);
+    }
+
     this.fileHandle = null;
     this.waitingOnPromise = false;
   }
@@ -64,7 +68,7 @@ class S3Stream extends EventEmitter {
       return;
     }
     fs
-      .write(this.fileHandle as number, `${JSON.stringify(rec)}\n`)
+      .write(this.fileHandle, `${JSON.stringify(rec)}\n`)
       .then(() => {
         this.flush();
       });