update sharp and skip NDK install on M1

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.4 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.4...1.5.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -7,6 +7,77 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- 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
+
+### 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.

k8s/android/turtle-deployment.template.yml

@@ -144,15 +144,15 @@ spec:
           - name: DISABLE_DEX_MAX_HEAP
             value: "true"
           - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
+            value: '-Xms2048m -Xmx12g -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 -Xmx12g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
           - name: REDIS_CA_CERTIFICATE
             value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
         resources:
           requests:
-            memory: "8192Mi"
-            cpu: "2000m"
+            memory: "12Gi"
+            cpu: "3000m"
           limits:
-            memory: "8192Mi"
-            cpu: "2000m"
+            memory: "12Gi"
+            cpu: "3500m"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.20.2",
+  "version": "0.21.8",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -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.9.7",
     "@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,7 +107,7 @@
   "dependencies": {
     "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "58.0.20",
+    "@expo/xdl": "59.1.0",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.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",

scripts/android/configureAndroidSdk.sh

@@ -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/release.sh

@@ -2,6 +2,12 @@
 
 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

scripts/releaseBeta.sh

@@ -2,6 +2,12 @@
 
 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/updateTurtleCliExampleRepo.sh

@@ -2,6 +2,12 @@
 
 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 \

shellTarballs/android/sdk40

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

shellTarballs/android/sdk41

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

shellTarballs/ios/client

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

shellTarballs/ios/sdk40

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

shellTarballs/ios/sdk41

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

src/bin/setup/android/sdk.ts

@@ -42,7 +42,7 @@ export default async function ensureAndroidSDKIsPresent() {
     }
   }
   return {
-    envVars: _createEnvVars(androidSdkDir),
+    envVars: await _createEnvVars(androidSdkDir),
     path: _createPaths(androidSdkDir),
   };
 }
@@ -63,11 +63,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/builders/ios/index.ts

@@ -52,7 +52,13 @@ async function initBuilder(ctx: IContext) {
     await fs.ensureDir(dir);
     await fs.chmod(dir, 0o755);
   }
-  await spawnAsync('sudo', ['xcrun', 'simctl', 'list']);
+
+  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) {