[android] update sdk35 shell tarball with battery fix

* [expo-branch] Change package of vendored expo-branch

* shell tarball with rebuilt expokit

* Update SDK34 Android tarball

CHANGELOG.md

@@ -4,7 +4,36 @@ All notable changes to this project will be documented in this file.
 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]
+## Unreleased
+
+## [0.12.1] - 2019-09-20
+### Changed
+- Updated iOS shell apps for SDK 33 and 34 to fix iOS 13 issues with fishhook, notification tokens, and ShareSheet
+- Updated iOS shell app for SDK 35 with a minor fix
+
+## [0.12.0] - 2019-09-19
+### Added
+- Support for SDK 35 iOS and Android builds.
+### Removed
+- Support for SDK 27-30 iOS and Android builds.
+
+## [0.11.3] - 2019-09-19
+### Changed
+- Updated SDK34 Android shell app with `expo-branch` fixes.
+
+## [0.11.2] - 2019-08-21
+### Added
+- Support for GoogleService-Info.plist (>=34.0.0).
+
+## [0.11.1] - 2019-08-08
+### Changed
+- Updated iOS client shell app with the latest fixes (up to 2.12.3).
+
+## [0.11.0] - 2019-08-07
+### Changed
+- Enabled back optional modules support, but only for specific unimodules.
+- Updated SDK34 Android shell app with the latest fixes (up to 2.12.2).
+- Updated SDK34 iOS shell app with the latest fixes (up to 2.12.3).
 
 ## [0.10.0] - 2019-08-01
 ### Changed
@@ -23,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Setting `Constants.nativeAppVersion` for Android standalone builds (actually fixed in [expo/expo-cli#878](https://github.com/expo/expo-cli/pull/878)).
 - Passing `expo.android.config` object from `app.json` to the Android builder.
+- Fixed crash on launch for iOS standalone apps on iOS 13 (all SDK versions).
+- Fixed occasional issue on iOS (SDK 33) where the JS bundle cannot be found ("No cache exists for this resource: shell-app.bundle") and a reload would be required.
 
 ## [0.8.11] - 2019-07-16
 ### Fixed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.10.0",
+  "version": "0.12.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -79,6 +79,8 @@
     "@types/sharp": "^0.17.8",
     "@types/tar": "^4.0.0",
     "@types/uuid": "^3.4.3",
+    "@types/webpack": "^4.32.1",
+    "@types/webpack-dev-server": "^3.1.7",
     "@types/which": "^1.3.1",
     "husky": "^1.3.1",
     "jest": "^23.6.0",
@@ -98,7 +100,7 @@
   },
   "dependencies": {
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "56.1.4-rc.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",

shellTarballs/android/sdk27

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

shellTarballs/android/sdk28

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

shellTarballs/android/sdk29

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

shellTarballs/android/sdk30

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

shellTarballs/android/sdk34

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-5e004e9c1a55d4d9c26e221b634a8246080b6e38.tar.gz
+s3://exp-artifacts/android-shell-builder-a8e204610e5712391336b378f47962bbb0c04164.tar.gz

shellTarballs/android/sdk35

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

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-5b74b634263fa1980d88cdd9b7d8f16b06c36671.tar.gz
+s3://exp-artifacts/ios-expo-client-bfa75682546bef336b6b68318cb26bcef3eacb2c.tar.gz

shellTarballs/ios/sdk27

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

shellTarballs/ios/sdk28

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

shellTarballs/ios/sdk29

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

shellTarballs/ios/sdk30

@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-30-6863276e6b9605e31228c845a047387571959e9b.tar.gz

shellTarballs/ios/sdk33

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-7a0e6bb94bd3edb2bc2dc501d6c09ad6edccd1bb.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-36b57e8ebb96aa8dce286c89bd56e8708eca819d.tar.gz

shellTarballs/ios/sdk34

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-f7aab5cac069205d0f939bd686a9c0f9239ea6cd.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-651588ff3445a5d87b3a5b81ec2977c02b22f3a2.tar.gz

shellTarballs/ios/sdk35

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

src/builders/android.ts

@@ -3,6 +3,7 @@ import path from 'path';
 import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import semver from 'semver';
 import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
 
@@ -10,6 +11,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
+import { resolveExplicitOptIn } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -71,14 +73,15 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
-  // logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-
-  // This can be set to `await resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))`
-  // (depending on project SDK version) in order to enable optional modules.
   // (2019-07-31) We are explicitly choosing to disable this option until we have more
   // infrastructure/tooling built around optional modules and OTA updates, as right now it's
   // very easy for developers to break apps in production with optional modules.
-  const enabledModules = null;
+  //
+  // to enable full resolver switch resolveExplicitOptIn to resolveNativeModules
+  logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
+  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
+    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
+    : null;
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({

src/builders/utils/unimodules.ts

@@ -19,6 +19,20 @@ interface IPackageInfo {
   dependencies: string[];
 }
 
+export async function resolveExplicitOptIn(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
+  const resolver = new Resolver(workingdir);
+  await resolver.init();
+
+  const optionalModules = ['expo-branch'];
+  resolver.addAll();
+  const modules = packages
+    ? resolver.getModules().filter((mod) => !optionalModules.includes(mod.name) || packages.includes(mod.name))
+    : resolver.getModules().filter((mod) => !optionalModules.includes(mod.name));
+
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
+  return modules;
+}
+
 export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
   const resolver = new Resolver(workingdir);
   await resolver.init();
@@ -38,8 +52,9 @@ export async function resolveNativeModules(workingdir: string, packages?: string
       }
     }
   }
-
-  return resolver.getModules();
+  const modules = resolver.getModules();
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
+  return modules;
 }
 
 async function readCorePackages(workingdir: string) {
@@ -101,7 +116,6 @@ class Resolver {
       return;
     }
     const pkg = this.dependencyMap[moduleName];
-    logger.info(`Adding ${moduleName}:${pkg.version}`);
     this.modulesMap[moduleName] = {
       name: pkg.name,
       dirname: pkg.dirname,