[changelog] Update CHANGELOG

CHANGELOG.md

@@ -5,14 +5,8 @@ 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]
-
-## [0.8.2] - 2019-06-11
 ### Changed
 - Updated Android shell app for SDK33 to remove `expo-face-detector` and `expo-payments-stripe` from standalone builds.
-- Updated Android shell app for SDK33 to get rid of `node_modules` for `tools-public`.
-- From now on, `turtle-cli` installs dependencies for `tools-public` in shell apps for SDK versions < 33.
-### Fixed
-- Android builds with turtle-cli by installing all unmodules if `dependencies` is empty.
 
 ## [0.8.1] - 2019-06-10
 ### Changed

Dockerfile

@@ -51,8 +51,20 @@ 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/cli/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
-RUN /tmp/configureAndroidSdk.sh
+RUN yes | sdkmanager --licenses > /dev/null
+RUN yes | sdkmanager \
+  "platforms;android-23" \
+  "platforms;android-24" \
+  "platforms;android-25" \
+  "platforms;android-26" \
+  "platforms;android-27" \
+  "platforms;android-28" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "platform-tools" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager "build-tools;28.0.3" | grep -v '=' || echo 'no output'
+RUN yes | sdkmanager \
+  "extras;android;m2repository" \
+  "extras;google;m2repository" \
+  "extras;google;google_play_services" | grep -v '=' || echo 'no output'
 
 # Install Android NDK
 ENV ANDROID_NDK_VERSION android-ndk-r10e

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {

scripts/cli/configureAndroidSdk.sh

@@ -1,12 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
 
 yes | $SDKMANAGER --licenses > /dev/null
-yes | $SDKMANAGER "platforms;android-28" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "platform-tools" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
-yes | $SDKMANAGER "build-tools;28.0.3" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+yes | $SDKMANAGER "platforms;android-28"
+yes | $SDKMANAGER "platform-tools"
+yes | $SDKMANAGER "build-tools;28.0.3"
 yes | $SDKMANAGER \
   "extras;android;m2repository" \
   "extras;google;m2repository" \
-  "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+  "extras;google;google_play_services"

shellTarballs/android/sdk33

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

src/bin/setup/android/index.ts

@@ -67,7 +67,7 @@ function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.ANDROID, `sdk${sdkMajorVersion}`);
 }
 
-async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: string) {
+async function _shellAppPostDownloadAction(workingdir: string) {
   const inWorkingdir = (filename: string) => path.join(workingdir, filename);
 
   if (await fs.pathExists(inWorkingdir('universe-package.json'))) {
@@ -82,11 +82,9 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
     await _installNodeModules(workingdir);
   }
 
-  // TODO: remove this after making sure that we don't need node_modules in tools-public for older sdks
-  if (ExponentTools.parseSdkMajorVersion(sdkVersion) < 33) {
-    const toolsPublicDir = path.join(workingdir, 'tools-public');
-    await _installNodeModules(toolsPublicDir);
-  }
+  // TODO: remove following lines after upgrading android shell app
+  const toolsPublicDir = path.join(workingdir, 'tools-public');
+  await _installNodeModules(toolsPublicDir);
 }
 
 async function _installNodeModules(cwd: string) {

src/bin/setup/utils/common.ts

@@ -17,7 +17,7 @@ interface IShellAppFormaters {
   formatShellAppTarballUriPath: (sdkMajorVersion: string) => string;
 }
 
-type PostDownloadAction = (sdkVersion: string, workingdir: string) => void;
+type PostDownloadAction = (workingdir: string) => void;
 
 export async function checkSystem(requiredTools: IToolDefinition[]) {
   await ensureToolsAreInstalled(requiredTools);
@@ -35,7 +35,7 @@ export async function ensureShellAppIsPresent(
   l.info(`shell app for SDK ${sdkVersion} doesn't exist, downloading...`);
   await _downloadShellApp(sdkVersion, workingdir, formatters);
   if (postDownloadAction) {
-    await postDownloadAction(sdkVersion, workingdir);
+    await postDownloadAction(workingdir);
   }
 }
 

src/builders/android.ts

@@ -75,7 +75,7 @@ async function runShellAppBuilder(
 
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
   const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
-    ? await resolveNativeModules(workingDir, manifest && manifest.dependencies)
+    ? await resolveNativeModules(workingDir, manifest.dependencies)
     : null;
 
   try {

src/scripts/setConfigurations.ts

@@ -43,13 +43,13 @@ const AVAILABLE_CONFIGURATIONS_ANDROID = [
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
-  HIGH_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
+  HIGH_ONLY_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,