update CHANGELOG

.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:

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

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

docker-base/Dockerfile

@@ -17,7 +17,6 @@ RUN dpkg --add-architecture i386 && \
   build-essential\
   bzip2:i386\
   file\
-  jq\
   lib32ncurses5\
   lib32z1\
   libc6:i386\

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.7",
+  "version": "0.12.7",
   "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,6 +128,6 @@
     "which": "^1.3.1"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "1.11.4"
+    "@expo/traveling-fastlane-darwin": "1.9.9"
   }
 }

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -14,9 +14,9 @@ IMAGE_VERSION_FULL_NAME="gcr.io/exponentjs/turtle-android-base:$IMAGE_TAG"
 IMAGE_LATEST_FULL_NAME="gcr.io/exponentjs/turtle-android-base:latest"
 
 pushd $ROOT_DIR > /dev/null
-docker build -f docker-base/Dockerfile -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
+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"
 popd  > /dev/null

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-1d9cef3e92482314ed6282d53a60022f878900e2.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-7c0999cf6d266e8bfe2d368d863a5a1b7ed73e88.tar.gz

src/bin/utils/builder.ts

@@ -92,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`, {}),
@@ -107,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 };