Add tvos targets

Author: kraenhansen

packages/ferric/src/build.ts

@@ -340,6 +340,7 @@ async function combineLibraries(
   const result = [];
   const darwinLibraries = [];
   const iosSimulatorLibraries = [];
+  const tvosSimulatorLibraries = [];
   for (const [target, libraryPath] of libraries) {
     if (target.endsWith("-darwin")) {
       darwinLibraries.push(libraryPath);
@@ -348,6 +349,11 @@ async function combineLibraries(
       target === "x86_64-apple-ios" // Simulator despite name missing -sim suffix
     ) {
       iosSimulatorLibraries.push(libraryPath);
+    } else if (
+      target === "aarch64-apple-tvos-sim" ||
+      target === "x86_64-apple-tvos" // Simulator despite name missing -sim suffix
+    ) {
+      tvosSimulatorLibraries.push(libraryPath);
     } else {
       result.push(libraryPath);
     }
@@ -356,6 +362,7 @@ async function combineLibraries(
   const combinedLibraryPaths = await createUniversalAppleLibraries([
     darwinLibraries,
     iosSimulatorLibraries,
+    tvosSimulatorLibraries,
   ]);
 
   return [...result, ...combinedLibraryPaths];

packages/ferric/src/cargo.ts

@@ -32,10 +32,12 @@ const APPLE_XCFRAMEWORK_CHILDS_PER_TARGET: Record<AppleTargetName, string> = {
   // The x86_64 target for vision simulator isn't supported
   // see https://doc.rust-lang.org/rustc/platform-support.html
 
+  "aarch64-apple-tvos": "tvos-arm64",
+  "aarch64-apple-tvos-sim": "tvos-arm64_x86_64-simulator",
+  "x86_64-apple-tvos": "tvos-arm64_x86_64-simulator",
+
   // "aarch64-apple-ios-macabi": "", // Catalyst
   // "x86_64-apple-ios-macabi": "ios-x86_64-simulator",
-  // "aarch64-apple-tvos": "tvos-arm64",
-  // "aarch64-apple-tvos-sim": "tvos-arm64-simulator",
 };
 
 const ANDROID_ARCH_PR_TARGET: Record<AndroidTargetName, string> = {

packages/ferric/src/targets.ts

@@ -29,23 +29,20 @@ export const APPLE_TARGETS = [
   "aarch64-apple-visionos",
   "aarch64-apple-visionos-sim",
 
-  // TODO: Re-enabled these when we know how to install them 🙈
-  /*
   "aarch64-apple-tvos",
+  // "arm64e-apple-tvos",
   "aarch64-apple-tvos-sim",
-  */
+  "x86_64-apple-tvos", // Simulator (despite the missing -sim suffix)
 
   // "aarch64-apple-watchos",
   // "aarch64-apple-watchos-sim",
   // "arm64_32-apple-watchos",
   // "arm64e-apple-darwin",
   // "arm64e-apple-ios",
-  // "arm64e-apple-tvos",
   // "armv7k-apple-watchos",
   // "armv7s-apple-ios",
   // "i386-apple-ios",
   // "i686-apple-darwin",
-  // "x86_64-apple-tvos",
   // "x86_64-apple-watchos-sim",
   // "x86_64h-apple-darwin",
 ] as const;
@@ -57,6 +54,10 @@ export type TargetName = (typeof ALL_TARGETS)[number];
 const THIRD_TIER_TARGETS: Set<TargetName> = new Set([
   "aarch64-apple-visionos",
   "aarch64-apple-visionos-sim",
+
+  "aarch64-apple-tvos",
+  "aarch64-apple-tvos-sim",
+  "x86_64-apple-tvos",
 ]);
 
 export function assertNightlyToolchain() {