remove workspaces from shellapp

.circleci/config.yml

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

CHANGELOG.md

@@ -7,32 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- 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).
-
-# [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
+- Add Android beta tarball for SDK 43
+- Add iOS beta tarball for SDK 43
 - Bump xdl to fix Android shell app for SDK 43
 
 # [0.22.6] - 2021-10-01

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.6.0
+FROM gcr.io/exponentjs/turtle-android-base:0.5.0
 
 ADD . /app/turtle
 

docker-base/Dockerfile

@@ -32,7 +32,7 @@ RUN dpkg --add-architecture i386 && \
   apt-get clean
 
 ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 12.22.7
+ENV NODE_VERSION 12.16.1
 
 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 \

k8s/android/turtle-deployment.template.yml

@@ -64,7 +64,10 @@ spec:
                 name: turtle-js-config
                 key: aws_secret_access_key
           - name: AWS_SQS_REGION
-            value: us-west-2
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: aws_sqs_region
           - name: AWS_SQS_IOS_QUEUE_URL
             valueFrom:
               secretKeyRef:
@@ -141,12 +144,15 @@ spec:
           - name: DISABLE_DEX_MAX_HEAP
             value: "true"
           - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx17g -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 -Xmx17g -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: "17Gi" # 17.8 GiB is max value reachable on current nodes
-            cpu: "5000m"
+            memory: "12Gi"
+            cpu: "3000m"
+          limits:
+            memory: "12Gi"
+            cpu: "3500m"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.23.6",
+  "version": "0.22.6",
   "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.1043.0",
+    "aws-sdk": "^2.226.1",
     "bunyan": "^1.8.12",
     "bunyan-debug-stream": "^1.0.8",
     "bunyan-sentry-stream": "^1.2.1",
@@ -139,7 +139,7 @@
     "@expo/traveling-fastlane-darwin": "1.11.4"
   },
   "volta": {
-    "node": "12.22.7",
+    "node": "12.16.1",
     "yarn": "1.22.0"
   }
 }

shellTarballs/android/sdk40

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

shellTarballs/android/sdk41

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

shellTarballs/android/sdk42

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

shellTarballs/android/sdk43

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-fe8aed82dd482644ed51d0dc45ae82c4c40a55c1.tar.gz
+s3://exp-artifacts/android-shell-builder-f84f90bc6c328e9cc9873384df87bacceba6bbe4.tar.gz

shellTarballs/android/sdk44

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

shellTarballs/ios/sdk43

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

shellTarballs/ios/sdk44

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

src/builders/android.ts

@@ -17,15 +17,7 @@ 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,9 +209,7 @@ 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'))) ||
-    (await fs.pathExists(path.join(pkgPath, 'expo-module.config.json')));
+  const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
   const hasPackageJson = await fs.pathExists(
     path.join(pkgPath, 'package.json'),
   );

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.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==
+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==
   dependencies:
-    buffer "4.9.2"
+    buffer "4.9.1"
     events "1.1.1"
-    ieee754 "1.1.13"
+    ieee754 "1.1.8"
     jmespath "0.15.0"
     querystring "0.2.0"
     sax "1.2.1"
@@ -5929,16 +5929,7 @@ buffer-xor@^1.0.3:
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
-[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:
+[email protected].1, buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
@@ -9760,10 +9751,10 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
   dependencies:
     postcss "^7.0.14"
 
-[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==
+[email protected].8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
 
 ieee754@^1.1.13:
   version "1.2.1"
@@ -16366,9 +16357,9 @@ tmp@^0.0.33:
     os-tmpdir "~1.0.2"
 
 [email protected]:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
@@ -16992,9 +16983,9 @@ url-parse-lax@^3.0.0:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3, url-parse@^1.4.7:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"