Skip to content

Commit

Permalink
[tools] Skip more types and namespaces when using Xcode 15. (#18938)
Browse files Browse the repository at this point in the history
Backport of #18936.
  • Loading branch information
rolfbjarne authored Sep 7, 2023
1 parent 4bb45eb commit 1c8c4fb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
5 changes: 5 additions & 0 deletions tools/common/Frameworks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,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
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,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
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,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

6 comments on commit 1c8c4fb

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.