[android] update SDK 35 shell tarball to fix GCM crash

.circleci/config.yml

@@ -186,14 +186,14 @@ jobs:
       - run: yarn
       - save_yarn_cache
       - restore_workingdir_cache:
-          sdk_version: sdk35
+          sdk_version: sdk32
           platform: ios
       - run:
           name: Run iOS smoke tests
           command: ./scripts/tests/runIOSSmokeTestsCI.sh
       - save_workingdir_cache:
           workingdir: /Users/distiller/project/workingdir
-          sdk_version: sdk35
+          sdk_version: sdk32
           platform: ios
 
   android_smoke_tests:

.gitignore

@@ -1,3 +1,5 @@
+!/src/node_modules
+
 node_modules
 yarn-error.log
 google-cloud-credentials.json
@@ -5,8 +7,6 @@ google-cloud-credentials.json
 /build/
 /workingdir/*
 /artifacts/*
-.history
-
 shell.apk
 .secrets*
 

.secrets.local-common

@@ -6,4 +6,3 @@ SENTRY_DSN=""
 ENVIRONMENT="development"
 REDIS_URL="redis://localhost:6379/0"
 REDIS_CONFIG_URL="redis://localhost:6379/0"
-TURTLE_SDK_VERSIONS_SECRET_TOKEN="xeiw7yigha<a_r5aich!oW9Ik2eish8the9Na6Jae-ghoo5ua/t8nu5AeheiTew4"

CHANGELOG.md

@@ -7,116 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Added
-
-- Added validation for `--public-url`.
-
-### Changed
-
-- Changed the way of installing NDK - it's installed with `sdkmanager` now.
-- Upgraded NDK to 17.2.4988734.
-
-### Fixed
-
-- A bug where the `platform` field in logs wasn't set correctly when using a shortcut command.
-
-## [0.13.9] - 2020-02-13
-
-### Fixed
-
-- Fixed Notifications.getDevicePushTokenAsync() erroring occasionally on iOS SDK 36.
-
-## [0.13.8] - 2020-01-27
-
-### Fixed
-
-- Fixed `react-native-maps` native module not being properly initialized (https://github.com/expo/expo/pull/6844)
-- Fixed Android standalone apps crashing on startup (https://github.com/expo/expo/pull/6825)
-
-## [0.13.7] - 2020-01-15
-
-### Added
-
-- Bumped `traveling-fastlane` to 1.11.4 to update CA certs
-
-## [0.13.6] - 2019-12-17
-
-### Fixed
-
-- Fixed issue with missing request handler for assets-library urls.
-
-## [0.13.4] - 2019-12-13
-
-### Added
-
-- Support for building iOS apps with a wildcard provisioning profile.
-
-## [0.13.3] - 2019-12-12
-
-### Fixed
-
-- Removed private API usage from iOS SDK 36 tarball
-
-## [0.13.2] - 2019-12-10
-
-### Fixed
-
-- Fixed Android App Bundle builds
-- Fixed issue with Root View Background Color and AppLoading on Android SDK 36 builds
-
-## [0.13.1] - 2019-12-09
-
-### Fixed
-
-- Fixed Android shell app for SDK 36
-
-## [0.13.0] - 2019-12-09
-
-### Added
-
-- Added iOS and Android shell apps for SDK 36
-
-### Changed
-
-- Updated iOS client shell app to support SDK 36
-
-## [0.12.12] - 2019-11-22
-
-### Fixed
-
-- A bug that caused `expo.owner` value not to be used if defined.
-
-## [0.12.11] - 2019-11-20
-
-### Added
-
-- Bumped `traveling-fastlane` to 1.11.0
-
-## [0.12.10] - 2019-11-15
-
-### Added
-
-- Add `shellAppSdkVersion` param to `IOSShellAppBuilder` so entitlement keys get properly added in (https://github.com/expo/turtle/pull/162)
-
-## [0.12.9] - 2019-11-14
-
-### Added
-
-- Support for customizing Facebook SDK behavior at buildtime (autoinitialization, logging app events, logging Advertiser ID) (https://github.com/expo/expo/pull/5924)
-
-## [0.12.8] - 2019-10-29
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix `Linking.openUrl` not opening app if it's already foregrounded (https://github.com/expo/expo/issues/6058)
-- Enforce Java 8 when using turtle-cli.
-
-## [0.12.7] - 2019-10-25
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix occasional crash in background due to GCM registration service (https://github.com/expo/expo/issues/4207)
-
 ## [0.12.5] - 2019-10-18
 
 ### Changed

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

bin/turtle.js

@@ -3,18 +3,7 @@
 
 const subcommand = process.argv[2];
 if (subcommand) {
-  let platform;
-  if (subcommand.length === 2) {
-    const letter = subcommand[1];
-    if (letter === 'a') {
-      platform = 'android';
-    } else if (letter === 'i') {
-      platform = 'ios';
-    }
-  } else {
-    const [, maybePlatform] = subcommand.split(':');
-    platform = maybePlatform;
-  }
+  const [, platform] = subcommand.split(':');
   if (platform === 'ios' || platform === 'android') {
     // so that logs have correct platform set
     process.env.PLATFORM = platform;

docker-base/Dockerfile

@@ -17,7 +17,6 @@ RUN dpkg --add-architecture i386 && \
   build-essential\
   bzip2:i386\
   file\
-  jq\
   lib32ncurses5\
   lib32z1\
   libc6:i386\
@@ -55,33 +54,39 @@ ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
 ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
-ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
+ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
 RUN /tmp/configureAndroidSdk.sh --install-all-platforms
 
+# Install Android NDK
+ENV ANDROID_NDK_VERSION android-ndk-r10e
+ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
+ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
+ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
+ENV PATH $ANDROID_NDK:$PATH
+
+# i have no clue why some of this is here, but it's working elsewhere
+# it appears to install the NDK version expo needs, so that's cool
+RUN mkdir /ndk_setup && cd /ndk_setup && \
+  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
+  chmod +x ${ANDROID_NDK_FILE} && \
+  sync && \
+  ./${ANDROID_NDK_FILE} && \
+  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
+  cp -R \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
+  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
+  cd && rm -rf /ndk_setup
+
 # Support Gradle
 ENV TERM dumb
 
-# Install gradle 5.6.3
-RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
-RUN unzip -qq gradle-5.6.3-all.zip
-RUN cp -r gradle-5.6.3 /usr/local
-
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3-all.zip /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN mv gradle-5.6.3 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3/bin/gradle
-
-ENV GRADLE_HOME /usr/local/gradle-5.6.3
+# Install gradle
+RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
+RUN unzip -qq gradle-4.4-all.zip
+RUN mv gradle-4.4 /usr/local
+RUN rm gradle-4.4-all.zip
+ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
-
-# Install gradle 4.10.2
-RUN wget https://services.gradle.org/distributions/gradle-4.10.2-all.zip
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN unzip -qq gradle-4.10.2-all.zip
-RUN mv gradle-4.10.2-all.zip /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN mv gradle-4.10.2 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2/bin/gradle

k8s/android/turtle-deployment.template.yml

@@ -138,11 +138,6 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: datadog_app_key
-          - name: TURTLE_SDK_VERSIONS_SECRET_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: turtle-js-config
-                key: turtle_sdk_versions_secret_token
           # other vars
           - name: GRADLE_DAEMON_DISABLED
             value: "1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.13.10",
+  "version": "0.12.5",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -22,9 +22,7 @@
     "test:unit": "yarn test --config jest/unit-config.json",
     "test:smoke": "yarn test --config jest/smoke-config.json --forceExit",
     "test:smoke:android": "PLATFORM=android yarn test:smoke --testNamePattern=android",
-    "test:smoke:android:record": "PLATFORM=android EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=android",
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
-    "test:smoke:ios:record": "PLATFORM=ios EXPENV_OVERRIDES=local-common,local,local-queue expenv yarn test:smoke --testNamePattern=iOS",
     "release": "./scripts/release.sh",
     "release:beta": "./scripts/releaseBeta.sh",
     "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh",
@@ -77,7 +75,6 @@
     "@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/tar": "^4.0.0",
@@ -103,7 +100,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.4.0",
+    "@expo/xdl": "56.2.2-alpha.2",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -123,7 +120,6 @@
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
-    "request-promise": "^4.2.5",
     "semver": "^6.0.0",
     "sharp": "0.22.1",
     "source-map-support": "^0.5.6",
@@ -132,9 +128,6 @@
     "which": "^1.3.1"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.11.4"
-  },
-  "volta": {
-    "node": "8.15.1"
+    "@expo/traveling-fastlane-darwin": "1.9.9"
   }
 }

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -3,8 +3,6 @@
 set -eo pipefail
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-CONFIGURE_ANDROID_SDK_PATH="$ROOT_DIR/scripts/android/configureAndroidSdk.sh"
-DOCKER_BASE_DIR="$ROOT_DIR/docker-base"
 
 IMAGE_TAG="$1"
 if [[ -z "$IMAGE_TAG" ]]; then
@@ -15,12 +13,10 @@ fi
 IMAGE_VERSION_FULL_NAME="gcr.io/exponentjs/turtle-android-base:$IMAGE_TAG"
 IMAGE_LATEST_FULL_NAME="gcr.io/exponentjs/turtle-android-base:latest"
 
-pushd $DOCKER_BASE_DIR > /dev/null
-cp $CONFIGURE_ANDROID_SDK_PATH .
-docker build -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
+pushd $ROOT_DIR > /dev/null
+echo docker build -f docker-base/Dockerfile -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
 echo "Successfully built $IMAGE_VERSION_FULL_NAME Docker image"
-gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
-gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
+echo gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
+echo gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
 echo "Successfully pushed $IMAGE_VERSION_FULL_NAME Docker image to GCloud"
-rm -rf `basename $CONFIGURE_ANDROID_SDK_PATH`
 popd  > /dev/null

scripts/android/configureAndroidSdk.sh

@@ -18,5 +18,3 @@ yes | $SDKMANAGER \
   "extras;android;m2repository" \
   "extras;google;m2repository" \
   "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-
-yes | $SDKMANAGER "ndk;17.2.4988734" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -22,6 +22,5 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 yarn test:smoke:android

scripts/tests/runIOSSmokeTestsCI.sh

@@ -20,9 +20,8 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-SDK_VERSION=sdk35 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
+SDK_VERSION=sdk32 $ROOT_DIR/scripts/ios/fetchRemoteIosTarball.sh
 
 yarn test:smoke:ios

scripts/tests/runUnitTestsCI.sh

@@ -22,6 +22,5 @@ export API_PORT="443"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 export DATADOG_DISABLED="true"
-export TURTLE_SDK_VERSIONS_SECRET_TOKEN="noop"
 
 yarn test:unit

shellTarballs/android/sdk35

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-7ce098f40cc82a2f61fed9f1f515d695a83c55b2.tar.gz
+s3://exp-artifacts/android-shell-builder-a9b26e258382dce4c3f73c4f2d16cbb1a93e8a1a.tar.gz

shellTarballs/android/sdk36

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

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-33560c83d858e509e71150d4163836d2bfcae2b6.tar.gz
+s3://exp-artifacts/ios-expo-client-d31aaf53daca6aa65d8cb1090fb60c73a9c47075.tar.gz

shellTarballs/ios/sdk36

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

src/bin/commands/build/index.ts

@@ -15,7 +15,7 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported!',
+      'the URL of an externally hosted manifest (for self-hosted apps).',
     )
     .option(
       '--release-channel <channel-name>',

src/bin/setup/android/index.ts

@@ -5,6 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
 
+import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -14,7 +15,6 @@ import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';
 
 const which = util.promisify(_which);
-const JAVA_REQUIRED_VERSION = 8;
 const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'bash',
@@ -22,27 +22,16 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   },
   {
     command: 'javac',
-    missingDescription: `Please install JDK (version ${JAVA_REQUIRED_VERSION}) - check https://jdk.java.net/`,
+    missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
     testFn: async () => {
-      const { status, stdout, stderr } = await ExponentTools.spawnAsyncThrowError(
-        'java',
+      const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
+        'javac',
         ['-version'],
         { stdio: 'pipe' },
       );
       if (stdout.match(/no java runtime present/i)) {
         return false;
       }
-
-      const matchResult = stderr.match(/.*version ".*\.(.*)\..*"/);
-      if (matchResult) {
-        const [, currentJavaVersion] = matchResult;
-        if (Number(currentJavaVersion) !== JAVA_REQUIRED_VERSION) {
-          throw new Error(`You're using a wrong Java version, please install version ${JAVA_REQUIRED_VERSION}`);
-        }
-      } else {
-        logger.warn(`Couldn't find Java version number, assuming you're on Java ${JAVA_REQUIRED_VERSION}...`);
-      }
-
       return status === 0;
     },
   },
@@ -65,8 +54,9 @@ export default async function setup(sdkVersion?: string) {
 async function prepareAndroidEnv() {
   await fs.ensureDir(config.directories.androidDependenciesDir);
   const sdkConfig = await ensureAndroidSDKIsPresent();
-  _setEnvVars(sdkConfig.envVars);
-  _alterPath(sdkConfig.path);
+  const ndkConfig = await ensureAndroidNDKIsPresent();
+  _setEnvVars({ ...sdkConfig.envVars, ...ndkConfig.envVars });
+  _alterPath([...sdkConfig.path, ...sdkConfig.path]);
 }
 
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {

src/bin/setup/android/ndk.ts

@@ -0,0 +1,53 @@
+import os from 'os';
+import path from 'path';
+
+import decompress from 'decompress';
+import fs from 'fs-extra';
+
+import * as utils from 'turtle/bin/setup/utils/common';
+import download from 'turtle/bin/setup/utils/downloader';
+import config from 'turtle/config';
+import logger from 'turtle/logger';
+
+const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;
+
+const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
+const l = logger.child(LOGGER_FIELDS);
+
+export default async function ensureAndroidNDKIsPresent() {
+  const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
+  await utils.removeDirectoryUnlessReady(androidNdkDir);
+  if (!(await fs.pathExists(androidNdkDir))) {
+    await fs.ensureDir(androidNdkDir);
+    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
+
+    try {
+      l.info('Downloading Android NDK');
+      await fs.ensureDir(config.directories.artifactsDir);
+      await download(ANDROID_NDK_URL, androidNdkDownloadPath);
+      l.info('Decompressing Android NDK');
+      await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
+      await utils.markDirectoryAsReady(androidNdkDir);
+      l.info('Android NDK installed successfully');
+    } catch (err) {
+      await fs.remove(androidNdkDir);
+      throw err;
+    } finally {
+      await fs.remove(androidNdkDownloadPath);
+    }
+  }
+  return {
+    envVars: _createEnvVars(androidNdkDir),
+    path: _createPaths(androidNdkDir),
+  };
+}
+
+function _createEnvVars(androidNdkDir: string) {
+  return {
+    ANDROID_NDK: androidNdkDir,
+  };
+}
+
+function _createPaths(androidNdkDir: string) {
+  return [androidNdkDir];
+}

src/bin/utils/builder.ts

@@ -1,5 +1,3 @@
-import _url from 'url';
-
 import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
 import uuid from 'uuid';
@@ -56,13 +54,6 @@ export function createBuilderAction({
         );
       }
 
-      if (cmd.publicUrl) {
-        const parsedPublicUrl = _url.parse(cmd.publicUrl);
-        if (parsedPublicUrl.protocol !== 'https:') {
-          throw new ErrorWithCommandHelp('--public-url is invalid - only HTTPS urls are supported');
-        }
-      }
-
       const args = {
         releaseChannel: cmd.releaseChannel || 'default',
         buildType: cmd.type,
@@ -101,7 +92,6 @@ const buildJobObject = async (
   { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
   credentials: any,
 ) => {
-  const experienceName = `@${_.get(appJSON, 'expo.owner', username)}/${_.get(appJSON, 'expo.slug')}`;
   const job = {
     config: {
       ..._.get(appJSON, `expo.${platform}.config`, {}),
@@ -116,7 +106,7 @@ const buildJobObject = async (
     platform,
     projectDir,
     sdkVersion: _.get(appJSON, 'expo.sdkVersion'),
-    experienceName,
+    experienceName: `@${username}/${_.get(appJSON, 'expo.slug')}`,
     ...(credentials && { credentials }),
   };
   const url = getExperienceUrl(job.experienceName, job.config.publicUrl);

src/builders/utils/ios/shellAppBuilder.ts

@@ -36,7 +36,6 @@ export default async function runShellAppBuilder(ctx: IContext, job: IJob): Prom
     manifest,
     output: ctx.outputPath,
     verbose: true,
-    shellAppSdkVersion: sdkVersion,
   };
   if (buildType === IOS_BUILD_TYPES.CLIENT) {
     Object.assign(shellAppParams, {

src/config.ts

@@ -89,7 +89,4 @@ export default {
       path.join(os.platform() === 'darwin' ? '/private' : '/', 'tmp', 'turtle'),
     ),
   },
-  www: {
-    sdkVersionsSecretToken: env('TURTLE_SDK_VERSIONS_SECRET_TOKEN'),
-  },
 };

src/logger/streams/s3.ts

@@ -1,3 +1,4 @@
+
 import EventEmitter from 'events';
 import path from 'path';
 

src/server.ts

@@ -6,7 +6,10 @@ import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
 import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { setSupportedSdkVersions, setTurtleVersion } from 'turtle/utils/versions';
+import { getRedisClient } from 'turtle/utils/redis';
+
+const REDIS_TURTLE_VERSION_KEY = 'turtle:version';
+const REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY = `turtle:${config.platform}:sdkVersions`;
 
 process.on('unhandledRejection', (err) => logger.error({ err }, 'Unhandled promise rejection'));
 
@@ -34,13 +37,18 @@ async function main() {
   }
 
   try {
-    await setTurtleVersion(turtleVersion);
-    logger.info(`Registered Turtle version (${turtleVersion}) in www`);
-    const sdkVersions = (await findSupportedSdkVersions(config.platform)).map((version) => `${version}.0.0`);
-    await setSupportedSdkVersions(config.platform, sdkVersions);
-    logger.info(`Registered supported SDK versions (${sdkVersions}) in www`);
+    const redis = await getRedisClient();
+    if (redis) {
+      await redis.set(REDIS_TURTLE_VERSION_KEY, turtleVersion);
+      logger.info(`Registered Turtle version (${turtleVersion}) in Redis`);
+      const sdkVersions = (await findSupportedSdkVersions(config.platform)).join(',');
+      await redis.set(REDIS_TURTLE_SUPPORTED_SDK_VERSIONS_KEY, sdkVersions);
+      logger.info(`Registered supported SDK versions (${sdkVersions}) in Redis`);
+    } else {
+      logger.warn('Couldn\'t set supported SDK versions in Redis (failed to connect to Redis)');
+    }
   } catch (err) {
-    logger.error({ err }, 'Failed to register versions in www');
+    logger.error({ err }, 'Failed to set versions in Redis');
   }
 
   while (true) {

src/utils/versions.ts

@@ -1,49 +0,0 @@
-import { URL } from 'url';
-
-import request from 'request-promise';
-
-import config from 'turtle/config';
-
-async function setSupportedSdkVersions(platform: string, sdkVersions: string[]) {
-  const { href } = new URL('/--/api/v2/standalone-build/setSupportedSDKVersions', resolveWWWEndpoint());
-  await request({
-    method: 'POST',
-    uri: href,
-    headers: {
-      'secret-token': config.www.sdkVersionsSecretToken,
-    },
-    body: {
-      platform,
-      sdkVersions,
-    },
-    json: true,
-  });
-}
-
-async function setTurtleVersion(version: string) {
-  const { href } = new URL('/--/api/v2/standalone-build/setTurtleVersion', resolveWWWEndpoint());
-  await request({
-    method: 'POST',
-    uri: href,
-    headers: {
-      'secret-token': config.www.sdkVersionsSecretToken,
-    },
-    body: {
-      version,
-    },
-    json: true,
-  });
-}
-
-function resolveWWWEndpoint() {
-  const currentEnv = config.deploymentEnv;
-  if (currentEnv === 'production') {
-    return 'https://expo.io';
-  } else if (currentEnv === 'staging') {
-    return 'https://staging.expo.io';
-  } else {
-    return 'http://127.0.0.1:3000';
-  }
-}
-
-export { setSupportedSdkVersions, setTurtleVersion };