Skip to content

Commit 567d3c9

Browse files
DellaBittachkuang-g
authored andcommitted
Extend iOS Resolver with BuildTarget.tvOS
1 parent 08a7e87 commit 567d3c9

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Diff for: source/IOSResolver/src/IOSResolver.cs

+12-6
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,8 @@ static IOSResolver() {
709709
// Delay initialization until the build target is iOS and the editor is not in play
710710
// mode.
711711
EditorInitializer.InitializeOnMainThread(condition: () => {
712-
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
712+
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
713+
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
713714
!EditorApplication.isPlayingOrWillChangePlaymode;
714715
}, initializer: Initialize, name: "IOSResolver", logger: logger);
715716
}
@@ -719,9 +720,10 @@ static IOSResolver() {
719720
/// current active build target is iOS and not in play mode.
720721
/// </summary>
721722
private static bool Initialize() {
722-
if ( EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS ) {
723+
if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS &&
724+
EditorUserBuildSettings.activeBuildTarget != BuildTarget.tvOS) {
723725
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 " +
725727
"developer.");
726728
}
727729

@@ -955,7 +957,9 @@ public static bool PodfileGenerationEnabled {
955957
/// Enable / disable target SDK polling.
956958
/// </summary>
957959
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)) {
959963
RunOnMainThread.OnUpdate += PollTargetSdk;
960964
} else {
961965
RunOnMainThread.OnUpdate -= PollTargetSdk;
@@ -1174,7 +1178,8 @@ private static bool CocoapodsProjectIntegrationEnabled {
11741178
/// </summary>
11751179
public static bool CocoapodsIntegrationEnabled {
11761180
get {
1177-
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
1181+
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
1182+
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
11781183
CocoapodsIntegrationMethodPref != CocoapodsIntegrationMethod.None;
11791184
}
11801185
}
@@ -1231,7 +1236,8 @@ public static bool PodPresent(string pod) {
12311236
/// project.
12321237
/// </summary>
12331238
private static bool InjectDependencies() {
1234-
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
1239+
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
1240+
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
12351241
Enabled && pods.Count > 0;
12361242
}
12371243

0 commit comments

Comments
 (0)