fix for breaking changes in xdl

CHANGELOG.md

@@ -5,28 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Added
-- `--config` parameter for turtle-cli commands, which allows to specify a custom path to app.json file
-
-## [0.5.13] - 2019-03-12
-### Added
-- Android SDK version support validation.
-### Changed
-- iOS Enterprise builds don't compile bitcode now.
-
-## [0.5.12] - 2019-02-26
-### Added
-- Google Cloud logger (as a bunyan stream).
-### Changed
-- Android builder passes the manifest from a build job message if it's available.
-
-## [0.5.11] - 2019-02-22
-### Added
-- Builder for iOS client apps.
 
 ## [0.5.10] - 2019-02-19
 ### Added
-- Register Turtle version in Redis.
+- Register Turtle version in Redis
 ### Changed
 - Update Android shell app for SDK 32 to fix [update](https://github.com/expo/expo/issues/3504) and [back button](https://github.com/expo/expo/issues/1786) issues.
 

jest/integration-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testRegex": "(test|spec)\\.ts$",
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

jest/smoke-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testMatch": [ "**/__smoke__/*.test.ts" ],
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

jest/unit-config.json

@@ -9,6 +9,6 @@
     "^.+\\.ts$": "ts-jest"
   },
   "testMatch": [ "**/__tests__/*.ts" ],
-  "moduleFileExtensions": ["ts", "js", "json"],
+  "moduleFileExtensions": ["ts", "js"],
   "verbose": true
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.5.13",
+  "version": "0.5.10",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -100,7 +100,6 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.0",
-    "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
     "bunyan": "^1.8.12",
@@ -124,9 +123,9 @@
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1",
-    "xdl": "53.1.6-alpha.2"
+    "xdl": "53.1.1"
   },
   "optionalDependencies": {
-    "@expo/traveling-fastlane-darwin": "^1.8.1"
+    "@expo/traveling-fastlane-darwin": "^1.8.0"
   }
 }

scripts/testAndroidCI.sh

@@ -20,6 +20,9 @@ export API_PORT="3000"
 export REDIS_URL="noop"
 export REDIS_CONFIG_URL="noop"
 
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+$ROOT_DIR/scripts/android/fetchRemoteAndroidTarball.sh
+
 yarn test:smoke:android
 smoke_result=$?
 

src/bin/commands/build/index.ts

@@ -20,8 +20,7 @@ function setCommonCommandOptions(cmd: any) {
     .option(
       '--release-channel <channel-name>',
       'pull from specified release channel (default: default)',
-    )
-    .option('-c --config <config-file>', 'specify a path to app.json');
+    );
 }
 
 export default {

src/bin/utils/builder.ts

@@ -60,7 +60,7 @@ export function createBuilderAction({
         publicUrl: cmd.publicUrl,
       };
 
-      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
+      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg);
       const sdkVersion = _.get(appJSON, 'expo.sdkVersion');
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);

src/bin/utils/project.ts

@@ -1,17 +1,12 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-export async function loadAppJSON(projectDirArg: string, config: string | null) {
-  let appJSONPath;
-  if (config) {
-    appJSONPath = resolveAbsoluteDir(config);
-  } else {
-    const projectDir = resolveAbsoluteDir(projectDirArg);
-    appJSONPath = path.join(projectDir, 'app.json');
-  }
+export async function loadAppJSON(projectDirArg: string) {
+  const projectDir = resolveAbsoluteDir(projectDirArg);
+  const appJSONPath = path.join(projectDir, 'app.json');
   const appJSONExists = await fs.pathExists(appJSONPath);
   if (!appJSONExists) {
-    throw new Error(`Couldn't find app.json.`);
+    throw new Error(`Couldn't find app.json in ${projectDir} directory.`);
   } else {
     return require(appJSONPath);
   }

src/builders/android.ts

@@ -10,13 +10,11 @@ import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdi
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
-import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
 import { IAndroidCredentials, IJob, IJobResult } from 'turtle/job';
 import logger from 'turtle/logger';
 
 export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
-  await ensureCanBuildSdkVersion(jobData);
   const credentials = await getOrCreateCredentials(jobData);
   const apkFilePath = await runShellAppBuilder(jobData, credentials);
   const randomHex = uuidv4().replace(/-/g, '');
@@ -62,21 +60,20 @@ async function runShellAppBuilder(
 
   const outputFilePath = path.join(temporaryFilesRoot, `shell-signed-${jobData.id}.apk`);
 
-  const { config: jobConfig, manifest, sdkVersion: sdkVersionFromJob } = jobData;
-  const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
+  const { manifest: { sdkVersion: sdkVersionFromManifest = null } = {}, sdkVersion: sdkVersionFromJob } = jobData;
+  const sdkVersion = sdkVersionFromJob || sdkVersionFromManifest;
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
       url: commonUtils.getExperienceUrl(jobData),
-      sdkVersion,
+      sdkVersion: _.get(jobData, 'manifest.sdkVersion') || jobData.sdkVersion,
       keystore: tempKeystorePath,
-      manifest,
       alias: credentials.keystoreAlias,
       keystorePassword: credentials.keystorePassword,
       keyPassword: credentials.keyPassword,
       privateConfigFile: tempShellAppConfigPath,
-      releaseChannel: jobConfig.releaseChannel,
+      releaseChannel: jobData.config.releaseChannel,
       workingDir,
       outputFile: outputFilePath,
     });

src/builders/ios/index.ts

@@ -1,5 +1,8 @@
+import path from 'path';
+
 import fs from 'fs-extra';
 import pick from 'lodash/pick';
+import { ExponentTools } from 'xdl';
 
 import buildArchive from 'turtle/builders/ios/archive';
 import { createBuilderContext, IContext } from 'turtle/builders/ios/context';
@@ -7,13 +10,14 @@ import buildSimulator from 'turtle/builders/ios/simulator';
 import { logErrorOnce } from 'turtle/builders/utils/common';
 import prepareAdHocBuildCredentials from 'turtle/builders/utils/ios/adhocBuild';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
-import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
-import { IOS } from 'turtle/constants/index';
+import { IOS, PLATFORMS } from 'turtle/constants/index';
 import { IJob, IJobResult } from 'turtle/job';
 
 const { BUILD_TYPES } = IOS;
 
+let SUPPORTED_SDK_VERSIONS: number[];
+
 export default async function iosBuilder(job: IJob): Promise<IJobResult> {
   if (job.config.buildType !== BUILD_TYPES.CLIENT) {
     await ensureCanBuildSdkVersion(job);
@@ -64,3 +68,25 @@ async function cleanup(ctx: IContext) {
 
 const getTemporaryDirs = (ctx: IContext) =>
   Object.values(pick(ctx, ['appDir', 'provisioningProfileDir']));
+
+async function ensureCanBuildSdkVersion(job: IJob) {
+  if (config.builder.useLocalWorkingDir) {
+    return;
+  }
+
+  if (!SUPPORTED_SDK_VERSIONS) {
+    SUPPORTED_SDK_VERSIONS = await findSupportedSdkVersions();
+  }
+
+  const targetMajorSdkVersion = ExponentTools.parseSdkMajorVersion(job.sdkVersion || job.manifest.sdkVersion);
+  if (!SUPPORTED_SDK_VERSIONS.includes(targetMajorSdkVersion)) {
+    throw new Error(`Unsupported SDK Version!`);
+  }
+}
+
+async function findSupportedSdkVersions(): Promise<number[]> {
+  const SDK_DIR_PREFIX = 'sdk';
+  const files = await fs.readdir(path.join(config.directories.workingDir, PLATFORMS.IOS));
+  const sdks = files.filter((file) => file.startsWith(SDK_DIR_PREFIX));
+  return sdks.map((sdk) => parseInt(sdk.substr(SDK_DIR_PREFIX.length), 10));
+}

src/builders/utils/version.ts

@@ -1,30 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { ExponentTools } from 'xdl';
-
-import config from 'turtle/config';
-import { IJob } from 'turtle/job';
-
-let SUPPORTED_SDK_VERSIONS: number[];
-
-export async function ensureCanBuildSdkVersion(job: IJob) {
-  if (config.builder.useLocalWorkingDir) {
-    return;
-  }
-
-  if (!SUPPORTED_SDK_VERSIONS) {
-    SUPPORTED_SDK_VERSIONS = await findSupportedSdkVersions(job.platform);
-  }
-
-  const targetMajorSdkVersion = ExponentTools.parseSdkMajorVersion(job.sdkVersion || job.manifest.sdkVersion);
-  if (!SUPPORTED_SDK_VERSIONS.includes(targetMajorSdkVersion)) {
-    throw new Error(`Unsupported SDK Version!`);
-  }
-}
-
-async function findSupportedSdkVersions(platform: 'android' | 'ios'): Promise<number[]> {
-  const SDK_DIR_PREFIX = 'sdk';
-  const files = await fs.readdir(path.join(config.directories.workingDir, platform));
-  const sdks = files.filter((file) => file.startsWith(SDK_DIR_PREFIX));
-  return sdks.map((sdk) => parseInt(sdk.substr(SDK_DIR_PREFIX.length), 10));
-}

src/config.ts

@@ -53,9 +53,6 @@ export default {
       buffer: envNum('LOGGLY_BUFFER', 100),
     },
   },
-  google: {
-    credentials: env('GOOGLE_APPLICATION_CREDENTIALS', ''),
-  },
   sentry: {
     dsn: env('SENTRY_DSN', ''),
   },

src/logger/index.ts

@@ -10,11 +10,6 @@ import HackyLogglyStream from 'turtle/logger/hackyLogglyStream';
 import S3Stream from 'turtle/logger/s3Stream';
 import { isOffline } from 'turtle/turtleContext';
 
-// type error when using import
-// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
-// tslint:disable-next-line:no-var-requires
-const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
-
 interface IStream {
   stream: any;
   type?: string;
@@ -59,6 +54,8 @@ if (config.logger.loggly.token) {
     // prettier-ignore
     tags: [
       'app-shell-apps',
+      `platform.${config.platform}`,
+      `environment.${config.deploymentEnv}`,
     ],
   };
   logglyStream = new HackyLogglyStream(logglyConfig);
@@ -68,23 +65,9 @@ if (config.logger.loggly.token) {
   });
 }
 
-if (config.google.credentials) {
-  const resource = {
-    type: 'generic_node',
-    labels: {
-      node_id: config.hostname,
-      location: '', // default value
-      namespace: '', // default value
-    },
-  };
-  streams.push(new LoggingBunyan({ name: 'turtle', resource }).stream('info'));
-}
-
 const logger = bunyan.createLogger({
   name: 'turtle',
   level: config.logger.level,
-  platform: config.platform,
-  environment: config.deploymentEnv,
   streams,
 });