@@ -709,7 +709,8 @@ static IOSResolver() {
|
709 | 709 | // Delay initialization until the build target is iOS and the editor is not in play
|
710 | 710 | // mode.
|
711 | 711 | EditorInitializer.InitializeOnMainThread(condition: () => {
|
712 |
| -return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS && |
| 712 | +return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS || |
| 713 | +EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) && |
713 | 714 | !EditorApplication.isPlayingOrWillChangePlaymode;
|
714 | 715 | }, initializer: Initialize, name: "IOSResolver", logger: logger);
|
715 | 716 | }
|
@@ -719,9 +720,10 @@ static IOSResolver() {
|
719 | 720 | /// current active build target is iOS and not in play mode.
|
720 | 721 | /// </summary>
|
721 | 722 | private static bool Initialize() {
|
722 |
| -if ( EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS ) { |
| 723 | +if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS && |
| 724 | +EditorUserBuildSettings.activeBuildTarget != BuildTarget.tvOS) { |
723 | 725 | throw new Exception("IOSResolver.Initialize() is called when active build target " +
|
724 |
| -"is not iOS. This should never happen. If it does, please report to the " + |
| 726 | +"is not iOS+. This should never happen. If it does, please report to the " + |
725 | 727 | "developer.");
|
726 | 728 | }
|
727 | 729 |
|
@@ -955,7 +957,9 @@ public static bool PodfileGenerationEnabled {
|
955 | 957 | /// Enable / disable target SDK polling.
|
956 | 958 | /// </summary>
|
957 | 959 | private static void SetEnablePollTargetSdk(bool enable) {
|
958 |
| -if (enable && EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS) { |
| 960 | +if (enable && |
| 961 | +(EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS || |
| 962 | +EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS)) { |
959 | 963 | RunOnMainThread.OnUpdate += PollTargetSdk;
|
960 | 964 | } else {
|
961 | 965 | RunOnMainThread.OnUpdate -= PollTargetSdk;
|
@@ -1174,7 +1178,8 @@ private static bool CocoapodsProjectIntegrationEnabled {
|
1174 | 1178 | /// </summary>
|
1175 | 1179 | public static bool CocoapodsIntegrationEnabled {
|
1176 | 1180 | get {
|
1177 |
| -return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS && |
| 1181 | +return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS || |
| 1182 | +EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) && |
1178 | 1183 | CocoapodsIntegrationMethodPref != CocoapodsIntegrationMethod.None;
|
1179 | 1184 | }
|
1180 | 1185 | }
|
@@ -1231,7 +1236,8 @@ public static bool PodPresent(string pod) {
|
1231 | 1236 | /// project.
|
1232 | 1237 | /// </summary>
|
1233 | 1238 | private static bool InjectDependencies() {
|
1234 |
| -return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS && |
| 1239 | +return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS || |
| 1240 | +EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) && |
1235 | 1241 | Enabled && pods.Count > 0;
|
1236 | 1242 | }
|
1237 | 1243 |
|
|
0 commit comments