Update build_testapps.py with tvOS support (#508)

DellaBitta · web-flow · commit abb3d98a2534 · 2022-10-31T13:17:09.000-04:00
Updates to `build_testapps.py` to generate Unity builds that target tvOS platforms.

Updates `ProjectSettings.asset` files of our testapps to use `tvOSTargetOSVersion` instead of the now obsolete `tvOSTargetOS`. The property `tvOSTargetOSVersion` is supported in Unity version 2018 and above, and should be a safe change since our new minimum is Unity version 2019.
diff --git a/analytics/testapp/ProjectSettings/ProjectSettings.asset b/analytics/testapp/ProjectSettings/ProjectSettings.asset
@@ -187,7 +187,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/auth/testapp/ProjectSettings/ProjectSettings.asset b/auth/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/crashlytics/testapp/ProjectSettings/ProjectSettings.asset b/crashlytics/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/database/testapp/ProjectSettings/ProjectSettings.asset b/database/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/dynamic_links/testapp/ProjectSettings/ProjectSettings.asset b/dynamic_links/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/firestore/testapp/ProjectSettings/ProjectSettings.asset b/firestore/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/functions/testapp/ProjectSettings/ProjectSettings.asset b/functions/testapp/ProjectSettings/ProjectSettings.asset
@@ -190,7 +190,7 @@ PlayerSettings:
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/installations/testapp/ProjectSettings/ProjectSettings.asset b/installations/testapp/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
   iPhoneSdkVersion: 988
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
-  tvOSTargetOSVersion: 900
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/messaging/testapp/ProjectSettings/ProjectSettings.asset b/messaging/testapp/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
   iPhoneSdkVersion: 988
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
-  tvOSTargetOSVersion: 900
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/remote_config/testapp/ProjectSettings/ProjectSettings.asset b/remote_config/testapp/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
   iPhoneSdkVersion: 988
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
-  tvOSTargetOSVersion: 900
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
@@ -127,6 +127,7 @@
 _ANDROID = "Android"
 _PLAYMODE = "Playmode"
 _IOS = "iOS"
+_TVOS = "tvOS"
 _WINDOWS = "Windows"
 _MACOS = "macOS"
 _LINUX = "Linux"
@@ -135,14 +136,15 @@
 _BUILD_TARGET = {
   _ANDROID: "Android",
   _IOS: "iOS",
+  _TVOS: "tvOS",
   _WINDOWS: "Win64",
   _MACOS: "OSXUniversal",
   _LINUX: "Linux64",
   _PLAYMODE: "Playmode"
 }
 
 _SUPPORTED_PLATFORMS = (
-    _ANDROID, _IOS, _PLAYMODE, _DESKTOP,
+    _ANDROID, _IOS, _TVOS, _PLAYMODE, _DESKTOP,
     _WINDOWS, _LINUX, _MACOS)
 
 _SUPPORTED_XCODE_CONFIGURATIONS = (
@@ -151,7 +153,7 @@
 FLAGS = flags.FLAGS
 
 flags.DEFINE_list(
-    "platforms", "Android,iOS",
+    "platforms", "Android,iOS,tvOS",
     "Build targets. Note that 'Playmode' corresponds to performing an in-editor"
     " playmode test, not a build.",
     short_name="p")
@@ -196,7 +198,7 @@
 
 flags.DEFINE_list(
     "ios_sdk", _DEVICE_REAL,
-    "Build for device or simulator (only affects iOS).")
+    "Build for device or simulator (only affects iOS and tvOS).")
 
 flags.DEFINE_enum(
     "xcode_configuration", "ReleaseForRunning", _SUPPORTED_XCODE_CONFIGURATIONS,
@@ -218,7 +220,7 @@
 
 flags.DEFINE_bool(
     "use_unity_ios_symlinks", True,
-    "Tell Unity to symlink iOS libraries into the xcode project"
+    "Tell Unity to symlink iOS/tvOS libraries into the xcode project"
     " instead of copying them (~700mb on at least some versions)."
     " Enabled by default to significantly reduce disk space utilization.")
 
@@ -435,8 +437,8 @@ def build_testapp(dir_helper, api_config, ios_config, target):
   the directory helper, and is configured with the appropriate testapp
   files, plugin, and the testapp builder itself.
 
-  For iOS, this will generate an xcode project. For other platforms, this will
-  generate the final binary (apk or standalone binary).
+  For iOS and tvOS, this will generate an xcode project. For other platforms,
+  this will generate the final binary (apk or standalone binary).
 
   Args:
     dir_helper: _DirectoryHelper object for this testapp.
@@ -456,7 +458,7 @@ def build_testapp(dir_helper, api_config, ios_config, target):
       "-AppBuilderHelper.outputDir", dir_helper.output_dir,
       "-buildTarget", target
   ]
-  if target == _IOS:
+  if target == _IOS or target == _TVOS:
     for device_type in ios_config.ios_sdk:
       build_flags += ["-AppBuilderHelper.targetIosSdk", _IOS_SDK[device_type]]
       if not ios_config.use_unity_symlinks:
@@ -611,7 +613,7 @@ def perform_in_editor_tests(dir_helper, retry_on_license_check=True):
 
 
 def run_xcodebuild(dir_helper, ios_config, device_type):
-  """Uses xcode project generated by Unity to build an iOS binary."""
+  """Uses xcode project generated by Unity to build an iOS or tvOS binary."""
   build_output_dir = os.path.join(dir_helper.output_dir, "ios_output_"+device_type)
   _run(
       xcodebuild.get_args_for_build(
@@ -906,9 +908,12 @@ def validate_testapps(apis, api_configs):
 
 def validate_platforms(platforms):
   """Ensures platforms are valid."""
-  if _IOS in platforms and platform.system() != "Darwin":
+  if (_IOS in platforms and platform.system() != "Darwin"):
     logging.warning("iOS requested on non-Mac OS, which is not yet supported.")
     platforms.remove(_IOS)
+  if (_TVOS in platforms and platform.system() != "Darwin"):
+    logging.warning("tvOS requested on non-Mac OS, which is not yet supported.")
+    platforms.remove(_TVOS)
   return platforms
 
 
@@ -971,8 +976,8 @@ def get_xcode_name(version, force_xcode_project):
 
   Returns:
     The name (not path), with extension, of the xcode project or
-    workspace used for this build.
-
+    workspace used for this build. Note that Unity exports tvOS xcode projects
+    using the same name as that used for iOS.
   """
   version = unity_version.UnityVersion(version)
   if version.generates_workspace and not force_xcode_project:
diff --git a/storage/testapp/ProjectSettings/ProjectSettings.asset b/storage/testapp/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
   iPhoneSdkVersion: 988
   iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
-  tvOSTargetOSVersion: 900
+  tvOSTargetOSVersionString: 12.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
