[NearbyInterction] Add support for xcode 13 beta 4. (#12351)

xamarin · Aug 5, 2021 · 244232d · 244232d · vs-mobiletools-engineering-service2 · Aug 6, 2021
1 parent 0ffed97
commit 244232d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 47 deletions.
diff --git a/src/NearbyInteraction/Enums.cs b/src/NearbyInteraction/Enums.cs
@@ -13,7 +13,7 @@
 
 namespace NearbyInteraction {
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [ErrorDomain ("NIErrorDomain")]
     [Native]
     public enum NIErrorCode : long
@@ -26,7 +26,7 @@ public enum NIErrorCode : long
         UserDidNotAllow = -5884,
     }
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [Native]
     public enum NINearbyObjectRemovalReason : long
     {

diff --git a/src/NearbyInteraction/NINearbyObject.cs b/src/NearbyInteraction/NINearbyObject.cs
@@ -15,7 +15,7 @@
 using ObjCRuntime;
 using Vector3 = global::OpenTK.Vector3;
 
-#if __IOS__
+#if __IOS__ || WATCH
 namespace NearbyInteraction {
     partial class NINearbyObject
     {
@@ -38,4 +38,4 @@ public static Vector3 DirectionNotAvailable {
     }
 
 }
-#endif //__IOS__
+#endif
diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -2147,6 +2147,7 @@ WATCHOS_FRAMEWORKS =        \
 	MapKit                  \
 	MediaPlayer             \
 	MobileCoreServices      \
+	NearbyInteraction       \
 	PassKit                 \
 	PushKit			\
 	Security                \

diff --git a/src/nearbyinteraction.cs b/src/nearbyinteraction.cs
@@ -15,19 +15,19 @@
 
 namespace NearbyInteraction {
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [BaseType (typeof (NSObject))]
     [DisableDefaultCtor]
     interface NIConfiguration : NSCopying, NSSecureCoding {}
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [BaseType (typeof (NSObject))]
     [DisableDefaultCtor]
     interface NIDiscoveryToken : NSCopying, NSSecureCoding {}
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [BaseType (typeof (NIConfiguration))]
     [DisableDefaultCtor]
@@ -40,7 +40,7 @@ interface NINearbyPeerConfiguration
         IntPtr Constructor (NIDiscoveryToken peerToken);
     }
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [BaseType (typeof (NSObject))]
     [DisableDefaultCtor]
@@ -62,7 +62,7 @@ Vector3 Direction {
         float DistanceNotAvailable { get; }
     }
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [BaseType (typeof (NSObject))]
     interface NISession
@@ -99,7 +99,7 @@ interface NISession
 
     interface INISessionDelegate {}
 
-    [NoWatch, NoTV, NoMac, iOS (14,0)]
+    [Watch (8,0), NoTV, NoMac, iOS (14,0)]
     [MacCatalyst (14,0)]
     [Protocol]
     [Model (AutoGeneratedName = true)]
@@ -120,5 +120,22 @@ interface NISessionDelegate
 
         [Export ("session:didInvalidateWithError:")]
         void DidSessionInvalidate (NISession session, NSError error);
+
+        [Watch (8,0), NoTV, NoMac, iOS (15,0), MacCatalyst (15,0)]
+        [Export ("session:didGenerateShareableConfigurationData:forObject:")]
+        void DidGenerateShareableConfigurationData (NISession session, NSData shareableConfigurationData, NINearbyObject @object);
+    }
+
+    [Watch (8,0), NoTV, NoMac, iOS (15,0), MacCatalyst (15,0)]
+    [BaseType (typeof (NIConfiguration))]
+    [DisableDefaultCtor]
+    interface NINearbyAccessoryConfiguration
+    {
+        [Export ("accessoryDiscoveryToken", ArgumentSemantic.Copy)]
+        NIDiscoveryToken AccessoryDiscoveryToken { get; }
+
+        [Export ("initWithData:error:")]
+        IntPtr Constructor (NSData data, [NullAllowed] out NSError error);
     }
+
 }
diff --git a/tests/xtro-sharpie/MacCatalyst-NearbyInteraction.todo b/tests/xtro-sharpie/MacCatalyst-NearbyInteraction.todo
diff --git a/tests/xtro-sharpie/iOS-NearbyInteraction.todo b/tests/xtro-sharpie/iOS-NearbyInteraction.todo
diff --git a/tests/xtro-sharpie/watchOS-NearbyInteraction.todo b/tests/xtro-sharpie/watchOS-NearbyInteraction.todo
diff --git a/tools/common/Frameworks.cs b/tools/common/Frameworks.cs
@@ -495,6 +495,7 @@ public static Frameworks GetwatchOSFrameworks (bool is_simulator_build)
 				{ "UniformTypeIdentifiers", "UniformTypeIdentifiers", 7,0 },
 
 				{ "Chip", "CHIP", new Version (8, 0), NotAvailableInSimulator /* no headers in beta 2 */ },
+				{ "NearbyInteraction", "NearbyInteraction", 8,0 },
 			};
 		}
 		return watch_frameworks;