update aws-sdk package

This reverts commit 32683d082b.

CHANGELOG.md

@@ -7,8 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Add Android beta tarball for SDK 43
-- Add iOS beta tarball for SDK 43
+# [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

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 -Xmx13g -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 -Xmx13g -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: "12Gi"
-            cpu: "3000m"
-          limits:
-            memory: "13Gi"
-            cpu: "3500m"
+            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.23.0",
+  "version": "0.23.5",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -110,7 +110,7 @@
     "@expo/xdl": "59.1.7",
     "@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",

shellTarballs/android/sdk43

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

shellTarballs/ios/sdk43

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

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);

yarn.lock

@@ -5309,14 +5309,14 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
   dependencies:
     array-filter "^1.0.0"
 
-aws-sdk@^2.226.1:
-  version "2.407.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.407.0.tgz#667d7f847e7f9b34cf57fa5e7c70e5f12637f72b"
-  integrity sha512-mZlQBIwdtaf7RbyYemV0FNfwjGkigjSTZ3JgPm1jpCnxoGFiL6mm0Zm+JBlgkyknD1yzzi6j7jz/ja1k4B2bwg==
+aws-sdk@^2.1043.0:
+  version "2.1043.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1043.0.tgz#170a5b14b3ea25df760f9a6b437bfe35c9a1578e"
+  integrity sha512-WysMTSLfi8ZCj6QAAitJkxObxOzGLhcu6FxoKHiEnrefvfQtSvwqUq7BbT/pIfijnF9dE/7e9XwjW8Dz/hqF4Q==
   dependencies:
-    buffer "4.9.1"
+    buffer "4.9.2"
     events "1.1.1"
-    ieee754 "1.1.8"
+    ieee754 "1.1.13"
     jmespath "0.15.0"
     querystring "0.2.0"
     sax "1.2.1"
@@ -5929,7 +5929,16 @@ buffer-xor@^1.0.3:
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
-[email protected].1, buffer@^4.3.0:
+[email protected].2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
@@ -9751,10 +9760,10 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
   dependencies:
     postcss "^7.0.14"
 
-[email protected].8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
+[email protected].13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
 ieee754@^1.1.13:
   version "1.2.1"