Skip to content
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

[xcode14.3] [tools] Skip more types and namespaces when using Xcode 15. #18936

Merged
merged 1 commit into from
Sep 6, 2023
Merged

[xcode14.3] [tools] Skip more types and namespaces when using Xcode 15. #18936

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions tools/common/Frameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,11 @@ static void Gather (Application app, AssemblyDefinition product_assembly, HashSe

static bool FilterFrameworks (Application app, Framework framework)
{
if (framework.Name == "NewsstandKit" && Driver.XcodeVersion.Major >= 15) {
Driver.Log (3, "Not linking with the framework {0} because it's not available when using Xcode 15+.", framework.Name);
return false;
}

switch (app.Platform) {
#if !NET
// CHIP has been removed in Xcode 14 Beta 5 in favor of Matter
Expand Down
2 changes: 1 addition & 1 deletion tools/common/StaticRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,7 +2865,7 @@ void Specialize (AutoIndentStringBuilder sb, out string initialization_method)
continue;
}

if (@class.Type.Is ("PassKit", "PKDisbursementAuthorizationControllerDelegate")) {
if (@class.Type.Is ("PassKit", "PKDisbursementAuthorizationControllerDelegate") || @class.Type.Is ("PassKit", "IPKDisbursementAuthorizationControllerDelegate")) {
exceptions.Add (ErrorHelper.CreateWarning (4189, $"The class '{@class.Type.FullName}' will not be registered it has been removed from the {App.Platform} SDK."));
continue;
}
Expand Down
6 changes: 6 additions & 0 deletions tools/common/Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ public void GatherFrameworks ()
continue;
}
break;
case "NewsstandKit":
if (Driver.XcodeVersion.Major >= 15) {
Driver.Log (3, "Not linking with the framework {0} because it's not available when using Xcode 15+.", framework.Name);
continue;
}
break;
default:
if (App.IsSimulatorBuild && !App.IsFrameworkAvailableInSimulator (framework.Name)) {
if (App.AreAnyAssembliesTrimmed) {
Expand Down