[Firebase][CloudMessaging] Updated to version 4.1.1 (Firebase v6.5.0)

* Fixed dependencies of it
2019-08-08 15:46:07 -05:00 · 2019-08-08 15:46:07 -05:00 · 1eebeea476
--- a/Readme.md
+++ b/Readme.md
@ -11,7 +11,7 @@ Xamarin creates and maintains Xamarin.iOS bindings for the Google APIs for iOS L
 | [Xamarin.Firebase.iOS.Analytics][F.Analytics.Name]                           | [6.0.4.0][F.Analytics.Package]               |
 | [Xamarin.Firebase.iOS.Auth][F.Auth.Name]                                     | [5.0.4.1][F.Auth.Package]                    |
 | [Xamarin.Firebase.iOS.CloudFirestore][F.CloudFirestore.Name]                 | [0.13.3.0][F.CloudFirestore.Package]         |
-| [Xamarin.Firebase.iOS.CloudMessaging][F.CloudMessaging.Name]                 | [3.1.2.0][F.CloudMessaging.Package]          |
+| [Xamarin.Firebase.iOS.CloudMessaging][F.CloudMessaging.Name]                 | [4.1.1.0][F.CloudMessaging.Package]          |
 | [Xamarin.Firebase.iOS.Core][F.Core.Name]                                     | [6.1.0.0][F.Core.Package]                    |
 | [Xamarin.Firebase.iOS.Crashlytics][F.Crashlytics.Name]                       | [3.10.3.1][F.Crashlytics.Package]            |
 | [Xamarin.Firebase.iOS.Database][F.Database.Name]                             | [5.0.3.0][F.Database.Package]                |
@ -55,7 +55,7 @@ Here's a table that shows in which global version is located each component of F
 | Firebase Analytics               | **6.0.4.0**       | **6.5.0**      |
 | Firebase Auth                    | **5.0.4.1**       | **5.8.1**      |
 | Firebase Cloud Firestore         | **0.13.3.0**      | **5.8.1**      |
-| Firebase Cloud Messaging         | **3.1.2.0**       | **5.8.1**      |
+| Firebase Cloud Messaging         | **4.1.1.0**       | **6.5.0**      |
 | Firebase Core                    | **6.1.0.0**       | **6.5.0**      |
 | Firebase Database                | **5.0.3.0**       | **5.8.1**      |
 | Firebase Dynamic Links           | **4.0.1.0**       | **6.5.0**      |
--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -46,7 +46,7 @@
 				"git": {
 					"name": "FirebaseMessaging",
 					"repositoryUrl": "https://github.com/firebase/firebase-ios-sdk.git",
-					"commitHash": "1e8fc1ac130eef9d8ee351637436ac6d65129b96"
+					"commitHash": "bac26882e0f36f87fbe651b38333289de8842e69"
 				}
 			}
 		},
--- a/components.cake
+++ b/components.cake
@ -4,7 +4,7 @@ Artifact FIREBASE_AD_MOB_ARTIFACT                  = new Artifact ("Firebase.AdM
 Artifact FIREBASE_ANALYTICS_ARTIFACT               = new Artifact ("Firebase.Analytics",              "6.0.4",    "8.0", ComponentGroup.Firebase, csprojName: "Analytics");
 Artifact FIREBASE_AUTH_ARTIFACT                    = new Artifact ("Firebase.Auth",                   "5.0.4.1",  "8.0", ComponentGroup.Firebase, csprojName: "Auth");
 Artifact FIREBASE_CLOUD_FIRESTORE_ARTIFACT         = new Artifact ("Firebase.CloudFirestore",         "0.13.3",   "8.0", ComponentGroup.Firebase, csprojName: "CloudFirestore");
-Artifact FIREBASE_CLOUD_MESSAGING_ARTIFACT         = new Artifact ("Firebase.CloudMessaging",         "3.1.2",    "8.0", ComponentGroup.Firebase, csprojName: "CloudMessaging");
+Artifact FIREBASE_CLOUD_MESSAGING_ARTIFACT         = new Artifact ("Firebase.CloudMessaging",         "4.1.1",    "8.0", ComponentGroup.Firebase, csprojName: "CloudMessaging");
 Artifact FIREBASE_CORE_ARTIFACT                    = new Artifact ("Firebase.Core",                   "6.1.0",    "8.0", ComponentGroup.Firebase, csprojName: "Core");
 Artifact FIREBASE_CRASHLYTICS_ARTIFACT             = new Artifact ("Firebase.Crashlytics",            "3.10.9",   "8.0", ComponentGroup.Firebase, csprojName: "Crashlytics");
 Artifact FIREBASE_DATABASE_ARTIFACT                = new Artifact ("Firebase.Database",               "5.0.3",    "8.0", ComponentGroup.Firebase, csprojName: "Database");
@ -69,7 +69,7 @@ void SetArtifactsDependencies ()
 	FIREBASE_ANALYTICS_ARTIFACT.Dependencies               = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT };
 	FIREBASE_AUTH_ARTIFACT.Dependencies                    = new [] { FIREBASE_CORE_ARTIFACT };
 	FIREBASE_CLOUD_FIRESTORE_ARTIFACT.Dependencies         = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT };
-	FIREBASE_CLOUD_MESSAGING_ARTIFACT.Dependencies         = new [] { FIREBASE_CORE_ARTIFACT };
+	FIREBASE_CLOUD_MESSAGING_ARTIFACT.Dependencies         = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT };
 	FIREBASE_CORE_ARTIFACT.Dependencies                    = null;
 	FIREBASE_CRASHLYTICS_ARTIFACT.Dependencies             = null;
 	FIREBASE_DATABASE_ARTIFACT.Dependencies                = new [] { FIREBASE_CORE_ARTIFACT };
@ -105,7 +105,7 @@ void SetArtifactsPodSpecs ()
 		new PodSpec ("Firebase", "6.5.0", subSpecs: new [] { "AdMob" })
 	};
 	FIREBASE_ANALYTICS_ARTIFACT.PodSpecs = new [] {
-		new PodSpec ("Firebase",             "6.5.0", subSpecs: new [] { "Analytics" })
+		new PodSpec ("Firebase", "6.5.0", subSpecs: new [] { "Analytics" })
 	};
 	FIREBASE_AUTH_ARTIFACT.PodSpecs = new [] {
 		new PodSpec ("Firebase", "5.8.1", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAuth", targetName: "FirebaseAuth", subSpecs: new [] { "Auth" })
@ -120,7 +120,7 @@ void SetArtifactsPodSpecs ()
 		new PodSpec ("gRPC-C++",       "0.0.3",  frameworkSource: FrameworkSource.Pods, frameworkName: "grpcpp"),
 	};
 	FIREBASE_CLOUD_MESSAGING_ARTIFACT.PodSpecs = new [] {
-		new PodSpec ("Firebase", "5.8.1", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseMessaging", targetName: "FirebaseMessaging", subSpecs: new [] { "Messaging" })
+		new PodSpec ("Firebase", "6.5.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseMessaging", targetName: "FirebaseMessaging", subSpecs: new [] { "Messaging" })
 	};
 	FIREBASE_CORE_ARTIFACT.PodSpecs = new [] {
 		new PodSpec ("Firebase",                 "6.5.0",   frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseCore", targetName: "FirebaseCore", subSpecs: new [] { "CoreOnly" }),
@ -132,7 +132,7 @@ void SetArtifactsPodSpecs ()
 		new PodSpec ("GTMSessionFetcher",        "1.2.1",   frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "Full" }),
 		new PodSpec ("leveldb-library",          "1.20.0",  frameworkSource: FrameworkSource.Pods, frameworkName: "leveldb"),
 		new PodSpec ("nanopb",                   "0.3.901", frameworkSource: FrameworkSource.Pods),
-		new PodSpec ("Protobuf",                 "3.6.1",   frameworkSource: FrameworkSource.Pods),
+		new PodSpec ("Protobuf",                 "3.8.0",   frameworkSource: FrameworkSource.Pods),
 		new PodSpec ("GoogleAppMeasurement",     "6.0.4")
 	};
 	FIREBASE_CRASHLYTICS_ARTIFACT.PodSpecs = new [] {
@ -223,6 +223,7 @@ void SetArtifactsExtraPodfileLines ()
 		"end",
 	};

+	FIREBASE_CLOUD_MESSAGING_ARTIFACT.ExtraPodfileLines = staticFrameworkLines;
 	FIREBASE_CORE_ARTIFACT.ExtraPodfileLines = staticFrameworkLines;
 	FIREBASE_DYNAMIC_LINKS_ARTIFACT.ExtraPodfileLines = staticFrameworkLines;
 	FIREBASE_INSTANCE_ID_ARTIFACT.ExtraPodfileLines = staticFrameworkLines;
--- a/source/Firebase/CloudMessaging/ApiDefinition.cs
+++ b/source/Firebase/CloudMessaging/ApiDefinition.cs
@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;

-using UIKit;
 using Foundation;
 using ObjCRuntime;
+using UserNotifications;

 namespace Firebase.CloudMessaging
 {
@ -16,10 +16,6 @@ namespace Firebase.CloudMessaging
 	// typedef void (^FIRMessagingTopicOperationCompletion)(NSError *_Nullable error);
 	delegate void MessagingTopicOperationCompletionHandler ([NullAllowed] NSError error);

-	[Obsolete ("Please listen for the Messaging.ConnectionStateChangedNotification NSNotification instead.")]
-	// typedef void(^FIRMessagingConnectCompletion)(NSError* __nullable error);
-	delegate void ConnectCompletionHandler ([NullAllowed] NSError error);
-
 	// @interface FIRMessagingMessageInfo : NSObject
 	[BaseType (typeof (NSObject), Name = "FIRMessagingMessageInfo")]
 	interface MessageInfo
@ -34,6 +30,10 @@ namespace Firebase.CloudMessaging
 	[BaseType (typeof (NSObject), Name = "FIRMessagingRemoteMessage")]
 	interface RemoteMessage
 	{
+		// @property (readonly, copy, nonatomic) NSString * _Nonnull messageID;
+		[Export ("messageID")]
+		string MessageId { get; }
+
 		// @property(nonatomic, readonly, strong, nonnull) NSDictionary *appData;
 		[Export ("appData", ArgumentSemantic.Strong)]
 		NSDictionary AppData { get; }
@ -53,8 +53,7 @@ namespace Firebase.CloudMessaging
 		[Export ("messaging:didReceiveRegistrationToken:")]
 		void DidReceiveRegistrationToken (Messaging messaging, string fcmToken);

-		// - (void)messaging:(nonnull FIRMessaging *)messaging didReceiveMessage:(nonnull FIRMessagingRemoteMessage *)remoteMessage FIR_SWIFT_NAME(messaging(_:didReceive:) __IOS_AVAILABLE(10.0);
-		[Introduced (PlatformName.iOS, 10, 0, 0)]
+		// - (void)messaging:(nonnull FIRMessaging *)messaging didReceiveMessage:(nonnull FIRMessagingRemoteMessage *)remoteMessage FIR_SWIFT_NAME(messaging(_:didReceive:)
 		[Export("messaging:didReceiveMessage:")]
 		void DidReceiveMessage (Messaging messaging, RemoteMessage remoteMessage);
 	}
@ -107,6 +106,12 @@ namespace Firebase.CloudMessaging
 		[Export ("messaging")]
 		Messaging SharedInstance { get; }

+		// +(FIRMessagingExtensionHelper * _Nonnull)extensionHelper __attribute__((swift_name("serviceExtension()"))) __attribute__((availability(ios, introduced=10.0)));
+		[Introduced (PlatformName.iOS, 10, 0, 0)]
+		[Static]
+		[Export ("extensionHelper")]
+		MessagingExtensionHelper ExtensionHelper { get; }
+
 		// @property(nonatomic, copy, nullable) NSData *APNSToken FIR_SWIFT_NAME(apnsToken);
 		[NullAllowed]
 		[Export("APNSToken", ArgumentSemantic.Copy)]
@ -135,16 +140,6 @@ namespace Firebase.CloudMessaging
 		[Export("deleteFCMTokenForSenderID:completion:")]
 		void DeleteFcmToken(string senderId, MessagingDeleteFcmTokenCompletionHandler completion);

-		// -(void)connectWithCompletion:(FIRMessagingConnectCompletion _Nonnull)handler;
-		[Obsolete ("Use the ShouldEstablishDirectChannel property instead.")]
-		[Export ("connectWithCompletion:")]
-		void Connect (ConnectCompletionHandler handler);
-
-		// -(void)disconnect;
-		[Obsolete("Use the ShouldEstablishDirectChannel property instead.")]
-		[Export ("disconnect")]
-		void Disconnect ();
-
 		// -(void)subscribeToTopic:(NSString * _Nonnull)topic;
 		[Export ("subscribeToTopic:")]
 		void Subscribe (string topic);
@ -174,5 +169,13 @@ namespace Firebase.CloudMessaging
 		[Export ("appDidReceiveMessage:")]
 		MessageInfo AppDidReceiveMessage (NSDictionary message);
 	}
-}

+	// @interface FIRMessagingExtensionHelper : NSObject
+	[Introduced (PlatformName.iOS, 10, 0, 0)]
+	[BaseType (typeof (NSObject), Name = "FIRMessagingExtensionHelper")]
+	interface MessagingExtensionHelper {
+		// -(void)populateNotificationContent:(UNMutableNotificationContent * _Nonnull)content withContentHandler:(void (^ _Nonnull)(UNNotificationContent * _Nonnull))contentHandler;
+		[Export ("populateNotificationContent:withContentHandler:")]
+		void PopulateNotificationContent (UNMutableNotificationContent content, Action<UNNotificationContent> contentHandler);
+	}
+}
--- a/source/Firebase/CloudMessaging/CloudMessaging.csproj
+++ b/source/Firebase/CloudMessaging/CloudMessaging.csproj
@ -6,7 +6,7 @@
    <RootNamespace>Firebase.CloudMessaging</RootNamespace>
    <AssemblyName>Firebase.CloudMessaging</AssemblyName>
    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>3.1.2</FileVersion>
+    <FileVersion>4.1.1</FileVersion>
    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
@ -23,7 +23,7 @@
    <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865576</PackageProjectUrl>
    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=865577</PackageLicenseUrl>
    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>3.1.2</PackageVersion>
+    <PackageVersion>4.1.1</PackageVersion>
  </PropertyGroup>

  <ItemGroup>
@ -45,6 +45,7 @@
    <NativeReference Include="..\..\..\externals\FirebaseMessaging.framework">
      <Kind>Framework</Kind>
      <Frameworks>SystemConfiguration</Frameworks>
+      <WeakFrameworks>UserNotifications</WeakFrameworks>
      <ForceLoad>True</ForceLoad>
      <LinkerFlags>-lsqlite3</LinkerFlags>
    </NativeReference>
--- a/source/Firebase/CloudMessaging/Enums.cs
+++ b/source/Firebase/CloudMessaging/Enums.cs
@ -12,7 +12,8 @@ namespace Firebase.CloudMessaging
 		Timeout = 3,
 		Network = 4,
 		OperationInProgress = 5,
-		InvalidRequest = 7
+		InvalidRequest = 7,
+		InvalidTopicName = 8
 	}

 	[Native]