increase replica count

CHANGELOG.md

@@ -7,51 +7,7 @@ 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
+- Updated SDK 40 Android, iOS, and client tarballs for patch release.
 
 # [0.20.6] - 2021-01-25
 

k8s/android/turtle-deployment.template.yml

@@ -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"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.21.8",
+  "version": "0.20.7",
   "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.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",
     "@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",
@@ -107,7 +107,7 @@
   "dependencies": {
     "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "59.1.0",
+    "@expo/xdl": "59.0.17",
     "@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.28.3",
+    "sharp": "0.24.1",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",

scripts/android/configureAndroidSdk.sh

@@ -19,8 +19,4 @@ yes | $SDKMANAGER \
   "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
+yes | $SDKMANAGER "ndk;17.2.4988734" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

shellTarballs/android/sdk41

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

shellTarballs/ios/sdk41

@@ -1 +0,0 @@
-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: await _createEnvVars(androidSdkDir),
+    envVars: _createEnvVars(androidSdkDir),
     path: _createPaths(androidSdkDir),
   };
 }
@@ -63,16 +63,11 @@ 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 } : {}),
+    ANDROID_NDK_HOME: path.join(androidSdkDir, 'ndk/17.2.4988734'),
   };
 }