[CHIP] Add support for Xcode13 beta2. (#12025)

Co-authored-by: TJ Lambert <[email protected]> Co-authored-by: Alex Soto <[email protected]>
xamarin · Jul 1, 2021 · d99235d · d99235d · vs-mobiletools-engineering-service2 · Jul 1, 2021
1 parent 732c27a
commit d99235d
Show file tree

Hide file tree

Showing 16 changed files with 1,793 additions and 1,615 deletions.
diff --git a/src/chip.cs b/src/chip.cs
diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -1924,6 +1924,7 @@ MAC_FRAMEWORKS =            \
 	BusinessChat            \
 	CallKit \
 	CFNetwork               \
+	Chip                    \
 	ClassKit                \
 	CloudKit                \
 	Contacts                \
@@ -2024,6 +2025,7 @@ IOS_FRAMEWORKS =         \
 	CallKit \
 	CarPlay \
 	CFNetwork \
+	Chip \
 	ClassKit \
 	CloudKit \
 	Contacts \
@@ -2113,6 +2115,7 @@ IOS_FRAMEWORKS =         \
 
 WATCHOS_FRAMEWORKS =        \
 	$(COMMON_FRAMEWORKS)    \
+	Chip                    \
 	ClockKit                \
 	CloudKit                \
 	Contacts                \
@@ -2145,6 +2148,7 @@ TVOS_FRAMEWORKS =           \
 	AudioUnit               \
 	BackgroundTasks         \
 	CFNetwork               \
+	Chip                    \
 	CloudKit                \
 	CoreAnimation           \
 	CoreGraphics            \

diff --git a/tests/introspection/ApiTypoTest.cs b/tests/introspection/ApiTypoTest.cs
@@ -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",
@@ -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;

diff --git a/tests/introspection/iOS/iOSApiProtocolTest.cs b/tests/introspection/iOS/iOSApiProtocolTest.cs
@@ -32,6 +32,7 @@ public iOSApiProtocolTest ()
 		protected override bool Skip (Type type)
 		{
 			switch (type.Namespace) {
+			case "Chip":
 			case "MetalKit":
 			case "MonoTouch.MetalKit":
 			case "MetalPerformanceShaders":

diff --git a/tests/introspection/iOS/iOSApiSelectorTest.cs b/tests/introspection/iOS/iOSApiSelectorTest.cs
@@ -48,6 +48,7 @@ protected override bool Skip (Type type)
 				if ((Runtime.Arch == Arch.SIMULATOR) && !TestRuntime.CheckXcodeVersion (7, 0))
 					return true;
 				break;
+			case "Chip":
 			case "MetalKit":
 			case "MonoTouch.MetalKit":
 			case "MetalPerformanceShaders":

diff --git a/tests/mtouch/RegistrarTest.cs b/tests/mtouch/RegistrarTest.cs
@@ -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.");

diff --git a/tests/xtro-sharpie/MacCatalyst-CHIP.todo → tests/xtro-sharpie/MacCatalyst-CHIP.ignore b/tests/xtro-sharpie/MacCatalyst-CHIP.todo → tests/xtro-sharpie/MacCatalyst-CHIP.ignore
@@ -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

diff --git a/tests/xtro-sharpie/common-CHIP.ignore b/tests/xtro-sharpie/common-CHIP.ignore
@@ -0,0 +1,2 @@
+!missing-field! CHIPVersionNumber not bound
+!missing-field! CHIPVersionString not bound
diff --git a/tests/xtro-sharpie/iOS-CHIP.todo b/tests/xtro-sharpie/iOS-CHIP.todo
diff --git a/tests/xtro-sharpie/macOS-CHIP.todo b/tests/xtro-sharpie/macOS-CHIP.todo
diff --git a/tests/xtro-sharpie/tvOS-CHIP.todo b/tests/xtro-sharpie/tvOS-CHIP.todo
diff --git a/tests/xtro-sharpie/watchOS-CHIP.todo b/tests/xtro-sharpie/watchOS-CHIP.todo
diff --git a/tools/common/Frameworks.cs b/tools/common/Frameworks.cs
@@ -260,6 +260,8 @@ public static Frameworks MacFrameworks {
 					{ "UserNotificationsUI", "UserNotificationsUI", 11,0 },
 
 					{ "AdServices", "AdServices", 11,1 },
+
+					{ "Chip", "CHIP", 12, 0 },
 				};
 			}
 			return mac_frameworks;
@@ -420,6 +422,8 @@ public static Frameworks CreateiOSFrameworks (bool is_simulator_build)
 
 				{ "CoreLocationUI", "CoreLocationUI", 15,0 },
 
+				{ "Chip", "CHIP", new Version (15, 0), NotAvailableInSimulator /* no headers in beta 2 */ }
+
 				// the above MUST be kept in sync with simlauncher
 				// see tools/mtouch/Makefile
 				// please also keep it sorted to ease comparison
@@ -487,6 +491,8 @@ public static Frameworks GetwatchOSFrameworks (bool is_simulator_build)
 				{ "Accessibility", "Accessibility", 7,0 },
 				{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 7,0 },
 
+				{ "Chip", "CHIP", new Version (8, 0), NotAvailableInSimulator /* no headers in beta 2 */ },
+
 			};
 		}
 		return watch_frameworks;
@@ -575,6 +581,8 @@ public static Frameworks TVOSFrameworks {
 					{ "MLCompute", "MLCompute", new Version (14,0), NotAvailableInSimulator },
 					{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 14,0 },
 					{ "Intents", "Intents", 14,0 },
+
+					{ "Chip", "CHIP", new Version (15, 0), NotAvailableInSimulator /* no headers in beta 2 */ },
 				};
 			}
 			return tvos_frameworks;

diff --git a/tools/common/StaticRegistrar.cs b/tools/common/StaticRegistrar.cs
@@ -2142,6 +2142,9 @@ void CheckNamespace (string ns, List<Exception> exceptions)
 					}
 				}
 				goto default;
+			case "Chip":
+				h = "<CHIP/CHIP.h>";
+				break;
 			case "GLKit":
 				// This prevents this warning:
 				//     /Applications/Xcode83.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gl.h:5:2: warning: gl.h and gl3.h are both

diff --git a/tools/common/Target.cs b/tools/common/Target.cs
@@ -222,6 +222,7 @@ public void GatherFrameworks ()
 						case "Metal":
 						case "MetalKit":
 						case "MetalPerformanceShaders":
+						case "CHIP":
 							// some frameworks do not exists on simulators and will result in linker errors if we include them
 							if (App.IsSimulatorBuild)
 								continue;

diff --git a/tools/linker/ObjCExtensions.cs b/tools/linker/ObjCExtensions.cs
@@ -14,6 +14,7 @@ static class Namespaces {
 		public const string AppKit = nameof (AppKit);
 		public const string AVFoundation = nameof (AVFoundation);
 		public const string AVKit = nameof (AVKit);
+		public const string Chip = nameof (Chip);
 		public const string CloudKit = nameof (CloudKit);
 		public const string Contacts = nameof (Contacts);
 		public const string ContactsUI = nameof (ContactsUI);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		!missing-field! CHIPVersionNumber not bound
		!missing-field! CHIPVersionString not bound