Cleaning up

Author: kraenhansen

packages/host/src/node/cli/android.ts

@@ -19,10 +19,9 @@ const ANDROID_ARCHITECTURES = [
 export async function linkAndroidDir({
   modulePath,
   naming,
-  platform,
 }: LinkModuleOptions): Promise<LinkModuleResult> {
   const libraryName = getLibraryName(modulePath, naming);
-  const outputPath = getLinkedModuleOutputPath(platform, modulePath, naming);
+  const outputPath = getLinkedModuleOutputPath("android", modulePath, naming);
 
   await fs.promises.rm(outputPath, { recursive: true, force: true });
   await fs.promises.cp(modulePath, outputPath, { recursive: true });

packages/host/src/node/cli/apple.ts

@@ -482,7 +482,6 @@ export function determineFrameworkSlice(): {
 }
 
 export async function linkXcframework({
-  platform,
   modulePath,
   naming,
   outputPath: outputParentPath,
@@ -502,12 +501,7 @@ export async function linkXcframework({
 
   const info = await readXcframeworkInfo(path.join(modulePath, "Info.plist"));
 
-  // TODO: Assert the existence of environment variables injected by Xcodebuild
-  // TODO: Pick and assert the existence of the right framework slice based on the environment variables
-  // TODO: Link the framework into the output path
-
   const expectedSlice = determineFrameworkSlice();
-
   const framework = info.AvailableLibraries.find((framework) => {
     return (
       expectedSlice.platform === framework.SupportedPlatform &&

packages/host/src/node/cli/link-modules.ts

@@ -30,7 +30,7 @@ export type LinkModulesOptions = {
 
 export type LinkModuleOptions = Omit<
   LinkModulesOptions,
-  "fromPath" | "linker"
+  "fromPath" | "linker" | "platform"
 > & {
   modulePath: string;
 };
@@ -95,7 +95,6 @@ export async function linkModules({
         return await linker({
           modulePath: originalPath,
           naming,
-          platform,
         });
       } catch (error) {
         if (error instanceof SpawnFailure) {

packages/host/src/node/cli/xcode-helpers.ts

@@ -1,7 +1,6 @@
 import assert from "node:assert";
 import path from "node:path";
 import fs from "node:fs";
-import cp from "node:child_process";
 
 // Using xmldom here because this is what @expo/plist uses internally and we might as well re-use it here.
 // Types come from packages/host/types/xmldom.d.ts (path mapping in tsconfig.node.json) to avoid pulling in lib "dom".