[android] update SDK 39 tarball with linking fix

CHANGELOG.md

@@ -7,47 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Fixed
-
-- Fix issues with Reanimated v2 in Android SDK 39 tarball.
-
-# [0.18.7] - 2020-10-23
-
-### Fixed
-
-- Fix issue with updates in self-hosted Android apps ([#10746](https://github.com/expo/expo/issues/10746)) in the SDK 39 tarball
-
-# [0.18.6] - 2020-10-22
-
-### Fixed
-
-- Fix issues with notifications ([10624](https://github.com/expo/expo/pull/10624) and [10608](https://github.com/expo/expo/pull/10608)) in the Android SDK 39 tarball.
-
-# [0.18.5] - 2020-10-07
-
-### Fixed
-
-- Always add expo-notifications for SDK >= 39 projects with android.enableDangerousExperimentalLeanBuilds enabled.
-
-# [0.18.4] - 2020-10-06
-
-### Fixed
-
-- Fixed an issue with notifications ([expo/expo#10562](https://github.com/expo/expo/issues/10562)) in the Android SDK 39 tarball.
-
-# [0.18.3] - 2020-10-03
-
-### Fixed
-
-- Update @expo/xdl to fix regression in SDK <= 39 splash
-
-# [0.18.2] - 2020-10-03
-
-### Fixed
-
-- Updated SDK 39 Android tarball.
-- Updated SDK 39 iOS tarball.
-- Updated iOS client tarball.
+- Updated SDK 39 Android tarball
+- Updated SDK 39 iOS tarball
 - Update @expo/config and @expo/xdl. Temporarily bring in type definitions for color-string and xcode.
 
 ## [0.18.1] - 2020-09-22

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.18.8",
+  "version": "0.18.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -107,7 +107,7 @@
   "dependencies": {
     "@expo/config": "~3.3.9",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "58.0.13",
+    "@expo/xdl": "58.0.12",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",

shellTarballs/android/sdk39

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-d292dcd0cc277ab665957244a8b15b9981debd29.tar.gz
+s3://exp-artifacts/android-shell-builder-3c36813a23df8bf26c7ebea0f4945057c63e44f3.tar.gz

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-401ff3fb71a1350c00bd0886f7eb4fd462bdf0c0.tar.gz
+s3://exp-artifacts/ios-expo-client-1fd3a1b4c76b1303d011887fd335730534555601.tar.gz

src/builders/android.ts

@@ -84,7 +84,7 @@ async function runShellAppBuilder(
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
   const packageJsonDependecies = _.get(manifest, 'dependencies');
   const enabledModules = _.get(manifest, 'android.enableDangerousExperimentalLeanBuilds')
-    ? await resolveNativeModules(workingDir, sdkVersion, packageJsonDependecies)
+    ? await resolveNativeModules(workingDir, packageJsonDependecies)
     : await resolveExplicitOptIn(workingDir, packageJsonDependecies);
 
   try {

src/builders/utils/unimodules.ts

@@ -4,7 +4,6 @@ import keys from 'lodash/keys';
 import merge from 'lodash/merge';
 import values from 'lodash/values';
 import path from 'path';
-import semver from 'semver';
 import logger from 'turtle/logger';
 
 export interface IUnimoduleEntry {
@@ -20,37 +19,21 @@ interface IPackageInfo {
   dependencies: string[];
 }
 
-export async function resolveExplicitOptIn(
-  workingdir: string,
-  packages?: string[],
-): Promise<IUnimoduleEntry[]> {
+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));
+    ? 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}`);
-  });
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
   return modules;
 }
 
-export async function resolveNativeModules(
-  workingdir: string,
-  sdkVersion: string,
-  packages?: string[],
-): Promise<IUnimoduleEntry[]> {
+export async function resolveNativeModules(workingdir: string, packages?: string[]): Promise<IUnimoduleEntry[]> {
   const resolver = new Resolver(workingdir);
   await resolver.init();
 
@@ -58,13 +41,6 @@ export async function resolveNativeModules(
     resolver.addAll();
   } else {
     const corePackages = await readCorePackages(workingdir);
-
-    // expo-notifications is required for shell apps in SDK >= 39
-    // https://github.com/expo/expo/issues/10569
-    if (semver.gte(sdkVersion, '39.0.0')) {
-      resolver.addModule('expo-notifications');
-    }
-
     for (const pkg of corePackages) {
       if (resolver.isUnimodule(pkg)) {
         resolver.addModule(pkg);
@@ -77,36 +53,17 @@ export async function resolveNativeModules(
     }
   }
   const modules = resolver.getModules();
-  modules.forEach(({ name, version }) => {
-    logger.info(`Adding ${name}:${version}`);
-  });
+  modules.forEach(({ name, version }) => { logger.info(`Adding ${name}:${version}`); });
   return modules;
 }
 
 async function readCorePackages(workingdir: string) {
-  const pkgJsonPath = path.join(
-    workingdir,
-    'node_modules',
-    'react-native-unimodules',
-    'package.json',
-  );
-  const expoPkgJsonPath = path.join(
-    workingdir,
-    'packages',
-    'expo',
-    'package.json',
-  );
-  if (
-    (await fs.pathExists(pkgJsonPath)) &&
-    (await fs.pathExists(expoPkgJsonPath))
-  ) {
+  const pkgJsonPath = path.join(workingdir, 'node_modules', 'react-native-unimodules', 'package.json');
+  const expoPkgJsonPath = path.join(workingdir, 'packages', 'expo', 'package.json');
+  if (await fs.pathExists(pkgJsonPath) && await fs.pathExists(expoPkgJsonPath)) {
     const packageJson = JSON.parse(await fs.readFile(pkgJsonPath, 'utf-8'));
-    const expoPackageJson = JSON.parse(
-      await fs.readFile(expoPkgJsonPath, 'utf-8'),
-    );
-    return keys(packageJson.dependencies).concat(
-      keys(expoPackageJson.dependencies),
-    );
+    const expoPackageJson = JSON.parse(await fs.readFile(expoPkgJsonPath, 'utf-8'));
+    return keys(packageJson.dependencies).concat(keys(expoPackageJson.dependencies));
   } else {
     logger.warn('No core packages detected');
     return [];
@@ -119,7 +76,7 @@ interface IDependencyInfo {
 
 class Resolver {
   private workingdir: string;
-  private modulesMap: { [key: string]: IUnimoduleEntry };
+  private modulesMap: {[key: string]: IUnimoduleEntry};
   private dependencyMap: IDependencyInfo;
 
   constructor(workingdir: string) {
@@ -151,7 +108,7 @@ class Resolver {
   }
 
   public getModules(): IUnimoduleEntry[] {
-    return values(this.modulesMap);
+     return values(this.modulesMap);
   }
 
   private async resolveModule(moduleName: string) {
@@ -170,9 +127,7 @@ class Resolver {
   }
 }
 
-async function generateDependenciesInfo(
-  workingdir: string,
-): Promise<IDependencyInfo> {
+async function generateDependenciesInfo(workingdir: string): Promise<IDependencyInfo> {
   const dir = await fs.readdir(path.join(workingdir, 'packages'));
   const map: IDependencyInfo = {};
 
@@ -185,9 +140,7 @@ async function generateDependenciesInfo(
   }
 
   // handle @unimodules directory
-  const unimodulesDir = await fs.readdir(
-    path.join(workingdir, 'packages', '@unimodules'),
-  );
+  const unimodulesDir = await fs.readdir(path.join(workingdir, 'packages', '@unimodules'));
   for (const pkgName of unimodulesDir) {
     const pkg = await getPackage(workingdir, path.join('@unimodules', pkgName));
     if (pkg) {
@@ -202,27 +155,19 @@ async function generateDependenciesInfo(
   return map;
 }
 
-async function getPackage(
-  workingdir: string,
-  pkgName: string,
-): Promise<IPackageInfo | null> {
+async function getPackage(workingdir: string, pkgName: string): Promise<IPackageInfo | null> {
   const pkgPath = path.join(workingdir, 'packages', pkgName);
   const isAndroid = await fs.pathExists(path.join(pkgPath, 'android'));
   const isIos = await fs.pathExists(path.join(pkgPath, 'ios'));
   const isUnimodule = await fs.pathExists(path.join(pkgPath, 'unimodule.json'));
-  const hasPackageJson = await fs.pathExists(
-    path.join(pkgPath, 'package.json'),
-  );
+  const hasPackageJson = await fs.pathExists(path.join(pkgPath, 'package.json'));
   if (!isUnimodule || !hasPackageJson || (!isAndroid && !isIos)) {
     return null;
   }
 
-  const packageJson = JSON.parse(
-    await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'),
-  );
+  const packageJson = JSON.parse(await fs.readFile(path.join(pkgPath, 'package.json'), 'utf-8'));
 
-  const pkgDeps = merge(
-    {}, // reading everything to make sure
+  const pkgDeps = merge({}, // reading everything to make sure
     packageJson.dependencies,
     packageJson.peerDependencies,
     packageJson.unimodulePeerDependencies,

yarn.lock

@@ -2155,10 +2155,10 @@
     workbox-webpack-plugin "^3.6.3"
     worker-loader "^2.0.0"
 
-"@expo/[email protected]3":
-  version "58.0.13"
-  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-58.0.13.tgz#7e747ee8743f45816c632b3e634ba91796bd4efe"
-  integrity sha512-ToCCTrj8NeupX0e9tpBtbZsESHlIEKbpRNU5IUy/2IKD9No5DXGxHG/FDsbEz595gawDzTv4isdzbOOulCoUcQ==
+"@expo/[email protected]2":
+  version "58.0.12"
+  resolved "https://registry.yarnpkg.com/@expo/xdl/-/xdl-58.0.12.tgz#f4130478fc221f0039533f60eff25c578957b84e"
+  integrity sha512-LhMX9MhF0kX4n4lG7RlM8af9e6yYTQFL/eUlEbrgg40UtXAL4mQ5aEYDLsd8yJHgRR2Z3jdaagdK5yr89BxtYw==
   dependencies:
     "@expo/bunyan" "3.0.2"
     "@expo/config" "3.3.9"