[android] update sdk 39 tarball for android notifications/updates disabled fix

2026-11-14 19:12:55 -10:00 · 2020-10-06 17:57:06 -07:00
24 changed files with 1303 additions and 1942 deletions
@@ -257,11 +257,11 @@ jobs:
      - run: yarn
      - save_yarn_cache
      - restore_workingdir_cache:
-          sdk_version: sdk39
+          sdk_version: sdk37
          platform: android
      - run:
          name: Fetch Android shell app
-          command: SDK_VERSION=sdk39 ./scripts/android/fetchRemoteAndroidTarball.sh
+          command: SDK_VERSION=sdk37 ./scripts/android/fetchRemoteAndroidTarball.sh
      - run:
          name: Run Android smoke tests
          command: |
@@ -269,7 +269,7 @@ jobs:
              --run "./scripts/tests/runAndroidSmokeTestsCI.sh"
      - save_workingdir_cache:
          workingdir: ~/turtle/workingdir
-          sdk_version: sdk39
+          sdk_version: sdk37
          platform: android

  android_staging_deploy:
@@ -7,129 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## Unreleased

-# [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
-
-### 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
@@ -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.io/versions/latest/distribution/turtle-cli)

 ## Usage example

@@ -144,15 +144,15 @@ spec:
          - name: DISABLE_DEX_MAX_HEAP
            value: "true"
          - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx12g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
+            value: '-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
          - name: GRADLE_OPTS
-            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx12g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
+            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
          - name: REDIS_CA_CERTIFICATE
            value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
        resources:
          requests:
-            memory: "12Gi"
-            cpu: "3000m"
+            memory: "8192Mi"
+            cpu: "2000m"
          limits:
-            memory: "12Gi"
-            cpu: "3500m"
+            memory: "8192Mi"
+            cpu: "2000m"
@@ -1,6 +1,6 @@
 {
  "name": "turtle-cli",
-  "version": "0.21.7",
+  "version": "0.18.3",
  "description": "The command-line tool for building standalone Expo apps",
  "preferGlobal": true,
  "scripts": {
@@ -75,7 +75,7 @@
    "@types/jest": "^23.3.9",
    "@types/joi": "^13.4.3",
    "@types/lodash": "^4.14.129",
-    "@types/node-forge": "^0.9.7",
+    "@types/node-forge": "^0.8.6",
    "@types/npm-package-arg": "^6.1.0",
    "@types/progress": "^2.0.1",
    "@types/raven": "^2.5.1",
@@ -107,7 +107,7 @@
  "dependencies": {
    "@expo/config": "~3.3.9",
    "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "59.1.0",
+    "@expo/xdl": "58.0.13",
    "@google-cloud/logging-bunyan": "^2.0.3",
    "async-retry": "^1.2.1",
    "aws-sdk": "^2.226.1",
@@ -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 )"

 if [[ -z "$GITHUB_TOKEN" || -z "$CIRCLE_API_USER_TOKEN" ]]; then
@@ -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
@@ -25,7 +25,7 @@ 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
+pushd $ROOT_DIR/workingdir/android/${SDK_VERSION:-sdk37} >/dev/null 2>&1
 yarn
 popd >/dev/null 2>&1

@@ -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
-
 DEPLOY_ENDPOINT_URL="https://circleci.com/api/v1.1/project/github/expo/turtle-cli-example/tree/updates-do-not-remove-me"

 curl -X POST \
@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-d292dcd0cc277ab665957244a8b15b9981debd29.tar.gz
+s3://exp-artifacts/android-shell-builder-b8193b76084128d714a240bbaa5c2450cc4a2c41.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-277393d97877f56ba3639ab153c69f109d248436.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-2b9ea15e13f36c120c257039cf76e14573760570.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-dd6b6b4840c7a99725f1ec9a9a3970de91e90b1d.tar.gz
+s3://exp-artifacts/ios-expo-client-401ff3fb71a1350c00bd0886f7eb4fd462bdf0c0.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-0983415327f49592d81f0bd3dc8c46a3572c19b0.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-661a51216c2241dcfdd930517968cd1d0e0ee237.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-df407aadb7208fc389564aed400c39263294eb76.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-30eb0558ff6a77acf56bb045e98b84f6a5e1478a.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-ba6ec1974977bebf8fd2db22a1c87f6a0b36ffa5.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-6cde8e00cd7bdf7a933cd8aad7f8e86981ea68a2.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-4a9a038998f6be13e8a2900a95afbb9f96dd023d.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-798b04f87b8f1518a0eb4009578cb216963922f0.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-dd6b6b4840c7a99725f1ec9a9a3970de91e90b1d.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-2b9ea15e13f36c120c257039cf76e14573760570.tar.gz
@@ -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.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>f5017f35-ce75-4a6c-acaf-4ccc3d73899f</MessageId><ReceiptHandle>AQEBQjEPeX13Rkr+iSNEuh9J+WKCinb45vRFxWMojfZlD8f5gXi1fncRIotDjji9Q5lkhEK6hjXnALwGXZTstFj3/EPMVV2MKPNN/6NA3cQ7wSd5/+EqP8ZFOC+wBBK46KdS82t46NJ3c0DqkXPImlUE7O2n1WnFiRrjJ+I/G7yYhf+rnxLoNWD8ZPFzzInr6K0Q4Fae8Wqowyc9N8dw2kksnzW3qto+W/Ped1MyF4/Ia6KBqPLQswHRI5WRrqxxaVKdi37XxHW1J71xxEskicTlSBqQmre+3gaCja6cDpXkBtQSNp1LC7nvt/OXZTmXvwtM</ReceiptHandle><MD5OfBody>792da27a1e1bc549ed89f35a5f66e38c</MD5OfBody><Body>{&quot;id&quot;:&quot;cd9ff227-575b-4eec-874f-d2b9f6187f05&quot;,&quot;experienceId&quot;:&quot;da491dac-c6bf-4d54-b67a-ba7890e22fb2&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;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;fbd6360b-e85d-485e-bf20-ab66adfeea16&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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&quot;,&quot;keystorePassword&quot;:&quot;28eeeda02db44ed9afc1c1d4a0f2caa6&quot;,&quot;keystoreAlias&quot;:&quot;QGV4cG8tdHVydGxlL3R1cnRsZS1jbGktZXhhbXBsZQ==&quot;,&quot;keyPassword&quot;:&quot;a6a53453c5534673900dac983e40a693&quot;},&quot;manifest&quot;:{&quot;ios&quot;:{&quot;buildNumber&quot;:&quot;13&quot;,&quot;supportsTablet&quot;:true,&quot;bundleIdentifier&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;icon&quot;:&quot;./assets/icon.png&quot;,&quot;namLine truncated
@@ -84,7 +84,7 @@ async function runShellAppBuilder(
  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 resolveNativeModules(workingDir, packageJsonDependecies)
    : await resolveExplicitOptIn(workingDir, packageJsonDependecies);

  try {
@@ -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) {
@@ -4,7 +4,6 @@ import keys from 'lodash/keys';
 import merge from 'lodash/merge';
 import values from 'lodash/values';
 import path from 'path';
-import semver from 'semver';
 import logger from 'turtle/logger';

 export interface IUnimoduleEntry {
@@ -20,37 +19,21 @@ interface IPackageInfo {
  dependencies: string[];
 }

-export async function resolveExplicitOptIn(
-  workingdir: string,
-  packages?: string[],
-): Promise<IUnimoduleEntry[]> {
+export async function resolveExplicitOptIn(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
  const resolver = new Resolver(workingdir);
  await resolver.init();

  const optionalModules = ['expo-branch'];
  resolver.addAll();
  const modules = packages
-    ? resolver
-        .getModules()
-        .filter(
-          (mod) =>
-            !optionalModules.includes(mod.name) || packages.includes(mod.name),
-        )
-    : resolver
-        .getModules()
-        .filter((mod) => !optionalModules.includes(mod.name));
+    ? resolver.getModules().filter((mod) => !optionalModules.includes(mod.name) || packages.includes(mod.name))
+    : resolver.getModules().filter((mod) => !optionalModules.includes(mod.name));

-  modules.forEach(({ name, version }) => {
-    logger.info(`Adding ${name}:${version}`);
-  });
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
  return modules;
 }

-export async function resolveNativeModules(
-  workingdir: string,
-  sdkVersion: string,
-  packages?: string[],
-): Promise<IUnimoduleEntry[]> {
+export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
  const resolver = new Resolver(workingdir);
  await resolver.init();

@@ -58,13 +41,6 @@ export async function resolveNativeModules(
    resolver.addAll();
  } else {
    const corePackages = await readCorePackages(workingdir);
-
-    // expo-notifications is required for shell apps in SDK >= 39
-    // https://github.com/expo/expo/issues/10569
-    if (semver.gte(sdkVersion, '39.0.0')) {
-      resolver.addModule('expo-notifications');
-    }
-
    for (const pkg of corePackages) {
      if (resolver.isUnimodule(pkg)) {
        resolver.addModule(pkg);
@@ -77,36 +53,17 @@ export async function resolveNativeModules(
    }
  }
  const modules = resolver.getModules();
-  modules.forEach(({ name, version }) => {
-    logger.info(`Adding ${name}:${version}`);
-  });
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
  return modules;
 }

 async function readCorePackages(workingdir: string) {
-  const pkgJsonPath = path.join(
-    workingdir,
-    'node_modules',
-    'react-native-unimodules',
-    'package.json',
-  );
-  const expoPkgJsonPath = path.join(
-    workingdir,
-    'packages',
-    'expo',
-    'package.json',
-  );
-  if (
-    (await fs.pathExists(pkgJsonPath)) &&
-    (await fs.pathExists(expoPkgJsonPath))
-  ) {
+  const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
+  const expoPkgJsonPath = path.join(workingdir, 'packages', 'expo', 'package.json');
+  if (await fs.pathExists(pkgJsonPath) && await fs.pathExists(expoPkgJsonPath)) {
    const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    const expoPackageJson = JSON.parse(
-      await fs.readFile(expoPkgJsonPath, 'utf-8'),
-    );
-    return keys(packageJson.dependencies).concat(
-      keys(expoPackageJson.dependencies),
-    );
+    const expoPackageJson = JSON.parse(await fs.readFile(expoPkgJsonPath, 'utf-8'));
+    return keys(packageJson.dependencies).concat(keys(expoPackageJson.dependencies));
  } else {
    logger.warn('No core packages detected');
    return [];
@@ -119,7 +76,7 @@ interface IDependencyInfo {

 class Resolver {
  private workingdir: string;
-  private modulesMap: { [key: string]: IUnimoduleEntry };
+  private modulesMap: {[key: string]: IUnimoduleEntry};
  private dependencyMap: IDependencyInfo;

  constructor(workingdir: string) {
@@ -151,7 +108,7 @@ class Resolver {
  }

  public getModules(): IUnimoduleEntry[] {
-    return values(this.modulesMap);
+     return values(this.modulesMap);
  }

  private async resolveModule(moduleName: string) {
@@ -170,9 +127,7 @@ class Resolver {
  }
 }

-async function generateDependenciesInfo(
-  workingdir: string,
-): Promise<IDependencyInfo> {
+async function generateDependenciesInfo(workingdir: string): Promise<IDependencyInfo> {
  const dir = await fs.readdir(path.join(workingdir, 'packages'));
  const map: IDependencyInfo = {};

@@ -185,9 +140,7 @@ async function generateDependenciesInfo(
  }

  // handle @unimodules directory
-  const unimodulesDir = await fs.readdir(
-    path.join(workingdir, 'packages', '@unimodules'),
-  );
+  const unimodulesDir = await fs.readdir(path.join(workingdir, 'packages', '@unimodules'));
  for (const pkgName of unimodulesDir) {
    const pkg = await getPackage(workingdir, path.join('@unimodules', pkgName));
    if (pkg) {
@@ -202,27 +155,19 @@ async function generateDependenciesInfo(
  return map;
 }

-async function getPackage(
-  workingdir: string,
-  pkgName: string,
-): Promise<IPackageInfo | null> {
+async function getPackage(workingdir: string, pkgName: string): Promise<IPackageInfo | null> {
  const pkgPath = path.join(workingdir, 'packages', pkgName);
  const isAndroid = await fs.pathExists(path.join(pkgPath, 'android'));
  const isIos = await fs.pathExists(path.join(pkgPath, 'ios'));
  const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
-  const hasPackageJson = await fs.pathExists(
-    path.join(pkgPath, 'package.json'),
-  );
+  const hasPackageJson = await fs.pathExists(path.join(pkgPath, 'package.json'));
  if (!isUnimodule || !hasPackageJson || (!isAndroid && !isIos)) {
    return null;
  }

-  const packageJson = JSON.parse(
-    await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'),
-  );
+  const packageJson = JSON.parse(await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'));

-  const pkgDeps = merge(
-    {}, // reading everything to make sure
+  const pkgDeps = merge({}, // reading everything to make sure
    packageJson.dependencies,
    packageJson.peerDependencies,
    packageJson.unimodulePeerDependencies,
				`@@ -1 +0,0 @@`
				`s3://exp-artifacts/android-shell-builder-277393d97877f56ba3639ab153c69f109d248436.tar.gz`
				`@@ -1 +0,0 @@`
				`s3://exp-artifacts/ios-shell-builder-sdk-latest-dd6b6b4840c7a99725f1ec9a9a3970de91e90b1d.tar.gz`