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

Jump to bottom

[CHIP] Add support for Xcode13 beta2. #12025

Merged
merged 19 commits into from
Jul 1, 2021
Merged

[CHIP] Add support for Xcode13 beta2. #12025

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0eea0e1
[CHIP] Add support for Xcode13 beta1.
mandel-macaque Jun 23, 2021
1d6fac0
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jun 25, 2021
580d723
Remove framework from not supported os.
mandel-macaque Jun 28, 2021
54bb4dd
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jun 28, 2021
805652d
Small style update.
mandel-macaque Jun 28, 2021
e1a541e
Merge branch 'chip-xcode13-beta1' of github.com:mandel-macaque/xamari…
mandel-macaque Jun 28, 2021
815f5b2
Address reviews.
mandel-macaque Jun 28, 2021
675a1c8
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jun 28, 2021
d33146a
Readd framework for mac.
mandel-macaque Jun 28, 2021
177d03a
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jun 28, 2021
b02d9d0
Update src/chip.cs
mandel-macaque Jun 28, 2021
e416449
Update src/chip.cs
mandel-macaque Jun 28, 2021
f1bbc29
Re-add to other platforms for beta 2.
mandel-macaque Jun 29, 2021
2820730
Merge branch 'chip-xcode13-beta1' of github.com:mandel-macaque/xamari…
mandel-macaque Jun 29, 2021
401befe
[CHIP] Fix simulator tests on Release sim
dalexsoto Jun 29, 2021
c2c366c
Address reviews.
mandel-macaque Jun 29, 2021
6740527
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jun 30, 2021
68837db
Update xtro after readding tvOS and watchOS.
mandel-macaque Jun 30, 2021
8b53684
Merge branch 'main' into chip-xcode13-beta1
mandel-macaque Jul 1, 2021
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
1,767 changes: 1,767 additions & 0 deletions src/chip.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/frameworks.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1923,6 +1923,7 @@ MAC_FRAMEWORKS = \
AVKit \
BusinessChat \
CallKit \
Chip \
CFNetwork \
ClassKit \
CloudKit \
Expand Down Expand Up @@ -2023,6 +2024,7 @@ IOS_FRAMEWORKS = \
BusinessChat \
CallKit \
CarPlay \
Chip \
CFNetwork \
ClassKit \
CloudKit \
Expand Down
5 changes: 5 additions & 0 deletions tests/introspection/ApiProtocolTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,11 @@ public void GeneralCase ()
if (Skip (t))
continue;

#if !MONOMAC
if (t.Namespace == "Chip" && Runtime.Arch == Arch.SIMULATOR) // namespace not present in sims as of Xcode13 beta 1
continue;
#endif

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic should go in the Skip method, possibly in the MacApiProtocolTest subclass.

var klass = new Class (t);
if (klass.Handle == IntPtr.Zero) {
// This can often by caused by [Protocol] classes with no [Model] but having a [BaseType].
Expand Down
4 changes: 4 additions & 0 deletions tests/introspection/ApiSelectorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ protected virtual bool Skip (Type type)
if (ca is ModelAttribute)
return true;
}
#if !MONOMAC
if (type.Namespace == "Chip" && Runtime.Arch == Arch.SIMULATOR) // namespace not present in sims as of Xcode13 beta 1
return true;
#endif

switch (type.FullName) {
case "MetalPerformanceShaders.MPSCommandBuffer":
Expand Down
4 changes: 3 additions & 1 deletion tests/introspection/ApiTypoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public virtual bool Skip (MemberInfo methodName, string typo) {
"Cda", // acronym: Clinical Document Architecture
"Cdrom",
"Celu", // Continuously Differentiable Exponential Linear Unit (ML)
"Chip", // framework name
"Cfa", // acronym: Color Filter Array
"Celp", // MPEG4ObjectID
"Characterteristic",
Expand Down Expand Up @@ -1062,9 +1063,10 @@ public void ConstantsCheck ()
break;
#endif
#if !__MACOS__
case "ChipLibrary":
case "MediaSetupLibrary":
case "MLComputeLibrary":
// Xcode 12 beta 2 does not ship this framework/headers for the simulators
// Xcode 12 beta 2 does not ship these framework/headers for the simulators
if (Runtime.Arch == Arch.DEVICE)
Assert.True (CheckLibrary (s), fi.Name);
break;
Expand Down
1 change: 1 addition & 0 deletions tests/mtouch/RegistrarTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ public void MT4134 ()
new { Framework = "QuickLookThumbnailing", Version = "13.0" },
new { Framework = "AutomaticAssessmentConfiguration", Version = "13.4" },
new { Framework = "CoreLocationUI", Version = "15.0" },
new { Framework = "Chip", Version = "15.0" },
};
foreach (var framework in invalidFrameworks)
mtouch.AssertError (4134, $"Your application is using the '{framework.Framework}' framework, which isn't included in the iOS SDK you're using to build your app (this framework was introduced in iOS {framework.Version}, while you're building with the iOS {mtouch.Sdk} SDK.) Please select a newer SDK in your app's iOS Build options.");
Expand Down
3 changes: 1 addition & 2 deletions tests/xtro-sharpie/MacCatalyst-CHIP.todo → tests/xtro-sharpie/MacCatalyst-CHIP.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# framework is missing in Xcode13 beta 1
!missing-enum! CHIPErrorCode not bound
!missing-enum! CHIPOnboardingPayloadType not bound
!missing-enum! CHIPOptionalQRCodeInfoType not bound
!missing-enum! CHIPPairingStatus not bound
!missing-enum! CHIPRendezvousInformationFlags not bound
!missing-field! CHIPErrorDomain not bound
!missing-field! CHIPVersionNumber not bound
!missing-field! CHIPVersionString not bound
!missing-protocol! CHIPDevicePairingDelegate not bound
!missing-protocol! CHIPPersistentStorageDelegate not bound
!missing-selector! +CHIPDeviceController::sharedController not bound
Expand Down
2 changes: 2 additions & 0 deletions tests/xtro-sharpie/common-CHIP.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
!missing-field! CHIPVersionNumber not bound
!missing-field! CHIPVersionString not bound
3 changes: 1 addition & 2 deletions tests/xtro-sharpie/iOS-CHIP.todo → tests/xtro-sharpie/tvOS-CHIP.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# framework is missing in Xcode13 beta 1
!missing-enum! CHIPErrorCode not bound
!missing-enum! CHIPOnboardingPayloadType not bound
!missing-enum! CHIPOptionalQRCodeInfoType not bound
!missing-enum! CHIPPairingStatus not bound
!missing-enum! CHIPRendezvousInformationFlags not bound
!missing-field! CHIPErrorDomain not bound
!missing-field! CHIPVersionNumber not bound
!missing-field! CHIPVersionString not bound
!missing-protocol! CHIPDevicePairingDelegate not bound
!missing-protocol! CHIPPersistentStorageDelegate not bound
!missing-selector! +CHIPDeviceController::sharedController not bound
Expand Down
403 changes: 0 additions & 403 deletions tests/xtro-sharpie/tvOS-CHIP.todo
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/xtro-sharpie/macOS-CHIP.todo → tests/xtro-sharpie/watchOS-CHIP.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# framework is missing in Xcode13 beta 1
!missing-enum! CHIPErrorCode not bound
!missing-enum! CHIPOnboardingPayloadType not bound
!missing-enum! CHIPOptionalQRCodeInfoType not bound
!missing-enum! CHIPPairingStatus not bound
!missing-enum! CHIPRendezvousInformationFlags not bound
!missing-field! CHIPErrorDomain not bound
!missing-field! CHIPVersionNumber not bound
!missing-field! CHIPVersionString not bound
!missing-protocol! CHIPDevicePairingDelegate not bound
!missing-protocol! CHIPPersistentStorageDelegate not bound
!missing-selector! +CHIPDeviceController::sharedController not bound
Expand Down
Loading