[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,9 +4,44 @@ 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.9.1]- 2019-07-29
+## [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
+- Fully disabled optional modules on Android for now.
+- Updated iOS shell apps for SDK 33 and 34 to fix scoped permissions issue.
+- Updated Android shell app for SDK 34 to work after disabling optional modules.
+
+## [0.9.1] - 2019-07-29
 ### Changed
 - `release-it` version to `12.3.4`.
 
@@ -17,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

Dockerfile

@@ -1,93 +1,5 @@
-FROM openjdk:8u141
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# https://github.com/yarnpkg/yarn/issues/2821
-RUN apt-get update && apt-get install apt-transport-https
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-# Install dependencies
-RUN dpkg --add-architecture i386 && \
-  apt-get update && \
-  apt-get install -yq \
-  ant\
-  build-essential\
-  bzip2:i386\
-  file\
-  lib32ncurses5\
-  lib32z1\
-  libc6:i386\
-  libncurses5:i386\
-  libstdc++6:i386\
-  rsync\
-  unzip\
-  yarn\
-  zlib1g:i386\
-  supervisor\
-  --no-install-recommends && \
-  apt-get clean
-
-ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 8.12.0
-
-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 \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
-
-# Download and untar SDK
-ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV ANDROID_SDK /usr/local/android-sdk-linux
-ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
-RUN mkdir -p ${ANDROID_HOME} && \
-  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
-  cd ${ANDROID_HOME} && \
-  unzip -qq sdk.zip && \
-  rm sdk.zip && \
-  mkdir -p ${HOME}/.android && \
-  touch ${HOME}/.android/repositories.cfg
-
-ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools:${PATH}
-ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
-ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
-
-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
-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
+# see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
+FROM gcr.io/exponentjs/turtle-android-base:0.1.0
 
 ADD . /app/turtle
 

docker-base/Dockerfile

@@ -0,0 +1,92 @@
+# If you ever need to rebuild this, run:
+# yarn docker:build-and-push:android-base-image NEW_IMAGE_SEMVER
+FROM openjdk:8u141
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# https://github.com/yarnpkg/yarn/issues/2821
+RUN apt-get update && apt-get install apt-transport-https
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+# Install dependencies
+RUN dpkg --add-architecture i386 && \
+  apt-get update && \
+  apt-get install -yq \
+  ant\
+  build-essential\
+  bzip2:i386\
+  file\
+  lib32ncurses5\
+  lib32z1\
+  libc6:i386\
+  libncurses5:i386\
+  libstdc++6:i386\
+  rsync\
+  unzip\
+  yarn\
+  zlib1g:i386\
+  supervisor\
+  --no-install-recommends && \
+  apt-get clean
+
+ENV NPM_CONFIG_LOGLEVEL warn
+ENV NODE_VERSION 8.12.0
+
+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 \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+# Download and untar SDK
+ENV ANDROID_HOME /usr/local/android-sdk-linux
+ENV ANDROID_SDK /usr/local/android-sdk-linux
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
+RUN mkdir -p ${ANDROID_HOME} && \
+  curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
+  cd ${ANDROID_HOME} && \
+  unzip -qq sdk.zip && \
+  rm sdk.zip && \
+  mkdir -p ${HOME}/.android && \
+  touch ${HOME}/.android/repositories.cfg
+
+ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools:${PATH}
+ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
+ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
+
+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
+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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.9.1",
+  "version": "0.12.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -25,7 +25,8 @@
     "test:smoke:ios": "PLATFORM=ios yarn test:smoke --testNamePattern=iOS",
     "release": "./scripts/release.sh",
     "release:beta": "./scripts/releaseBeta.sh",
-    "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh"
+    "release:update:turtle-cli-example": "./scripts/updateTurtleCliExampleRepo.sh",
+    "docker:build-and-push:android-base-image": "./scripts/android/buildAndPushAndroidBaseImage.sh"
   },
   "husky": {
     "hooks": {
@@ -78,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",
@@ -97,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",

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
+
+IMAGE_TAG="$1"
+if [[ -z "$IMAGE_TAG" ]]; then
+  echo "usage: yarn docker:build:android-base-image IMAGE_SEMVER"
+  exit 1
+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 $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"
+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

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-5c3af20714043697e7761be48b84e5d3fb3144bb.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-5f8b48a436d2d519de03172e8d663c9b30b1595c.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-8ba2a26d5701445dc7f22bc31900a492c8d6b9d4.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

@@ -11,7 +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 { resolveNativeModules } from 'turtle/builders/utils/unimodules';
+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';
@@ -73,9 +73,14 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
+  // (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.
+  //
+  // 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 resolveNativeModules(workingDir, _.get(manifest, 'dependencies'))
+    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
     : null;
 
   try {

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,