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

@@ -144,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.3",
+  "version": "0.22.6",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -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/sdk43

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

shellTarballs/ios/sdk43

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

yarn.lock

@@ -16357,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"
@@ -16983,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"