Skip to content

Extend iOS Resolver with tvOS support #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2022
Merged

Extend iOS Resolver with tvOS support #550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions source/IOSResolver/src/IOSResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,8 @@ static IOSResolver() {
// Delay initialization until the build target is iOS and the editor is not in play
// mode.
EditorInitializer.InitializeOnMainThread(condition: () => {
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
!EditorApplication.isPlayingOrWillChangePlaymode;
}, initializer: Initialize, name: "IOSResolver", logger: logger);
}
Expand All @@ -719,9 +720,10 @@ static IOSResolver() {
/// current active build target is iOS and not in play mode.
/// </summary>
private static bool Initialize() {
if ( EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS ) {
if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.iOS &&
EditorUserBuildSettings.activeBuildTarget != BuildTarget.tvOS) {
throw new Exception("IOSResolver.Initialize() is called when active build target " +
"is not iOS. This should never happen. If it does, please report to the " +
"is not iOS+. This should never happen. If it does, please report to the " +
"developer.");
}

Expand Down Expand Up @@ -955,7 +957,9 @@ public static bool PodfileGenerationEnabled {
/// Enable / disable target SDK polling.
/// </summary>
private static void SetEnablePollTargetSdk(bool enable) {
if (enable && EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS) {
if (enable &&
(EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS)) {
RunOnMainThread.OnUpdate += PollTargetSdk;
} else {
RunOnMainThread.OnUpdate -= PollTargetSdk;
Expand Down Expand Up @@ -1174,7 +1178,8 @@ private static bool CocoapodsProjectIntegrationEnabled {
/// </summary>
public static bool CocoapodsIntegrationEnabled {
get {
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
CocoapodsIntegrationMethodPref != CocoapodsIntegrationMethod.None;
}
}
Expand Down Expand Up @@ -1231,7 +1236,8 @@ public static bool PodPresent(string pod) {
/// project.
/// </summary>
private static bool InjectDependencies() {
return EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS &&
return (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS ||
EditorUserBuildSettings.activeBuildTarget == BuildTarget.tvOS) &&
Enabled && pods.Count > 0;
}

Expand Down