Merge branch 'main' of https://github.com/hansemannn/titanium-firebas…

…e-analytics

# Conflicts:
#	ios/manifest

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-github: hansemannn
+github: [hansemannn, m1ga]

README.md

@@ -11,7 +11,7 @@ this project maintained and be able to use the latest Firebase SDK's, please see
 thank you!
 
 ## Requirements
-- [x] The [Firebase Core](https://github.com/hansemannn/titanium-firebase-core) module
+- [x] The [Firebase Core](https://github.com/hansemannn/titanium-firebase-core) module (iOS only)
 - [x] iOS: Titanium SDK 6.2.0+
 - [x] Android: Titanium SDK 7.0.0+
 
@@ -137,14 +137,14 @@ non-empty and no more than 256 characters long. Setting userID to `null` removes
 ## Example
 ```js
 // Require the Firebase Core module (own project!)
-var FirebaseCore = require('firebase.core');
+if (OS_IOS) {
+  var FirebaseCore = require('firebase.core');
+  FirebaseCore.configure();
+}
 
 // Require the Firebase Analytics module
 var FirebaseAnalytics = require('firebase.analytics');
 
-// Configure Firebase
-FirebaseCore.configure();
-
 // Get the App Instance ID
 Ti.API.info('App Instance ID: ' + FirebaseAnalytics.appInstanceID);
 

android/build.gradle

@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.google.firebase:firebase-analytics:19.0.0'
-	implementation 'com.google.firebase:firebase-installations:17.0.0'
+	implementation 'com.google.firebase:firebase-analytics:21.0.0'
+	implementation 'com.google.firebase:firebase-installations:17.0.1'
 }

android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.1
+version: 5.1.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-analytics

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 6.2.1
+version: 6.3.0
 apiversion: 2
 architectures: arm64 x86_64
 description: titanium-firebase-analytics

ios/platform/FirebaseAnalytics.xcframework/Info.plist

@@ -6,15 +6,16 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>FirebaseAnalytics.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -77,16 +78,15 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>FirebaseAnalytics.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

ios/platform/FirebaseAnalytics.xcframework/ios-arm64_armv7/FirebaseAnalytics.framework/Headers/FIRAnalytics+AppDelegate.h

@@ -13,16 +13,16 @@ NS_ASSUME_NONNULL_BEGIN
  * Delegate Proxy by adding FirebaseAppDelegateProxyEnabled into your app's Info.plist and setting
  * it to NO, and adding the methods in this category to corresponding delegation handlers.
  *
- * To handle Universal Links, you must return YES in
- * [UIApplicationDelegate application:didFinishLaunchingWithOptions:].
+ * To handle Universal Links, you must return `true` in
+ * UIApplicationDelegate.application(_:didFinishLaunchingWithOptions:).
  */
 @interface FIRAnalytics (AppDelegate)
 
 /**
  * Handles events related to a URL session that are waiting to be processed.
  *
  * For optimal use of Firebase Analytics, call this method from the
- * [UIApplicationDelegate application:handleEventsForBackgroundURLSession:completionHandler]
+ * UIApplicationDelegate.application(_:handleEventsForBackgroundURLSession:completionHandler:)
  * method of the app delegate in your app.
  *
  * @param identifier The identifier of the URL session requiring attention.
@@ -36,20 +36,18 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Handles the event when the app is launched by a URL.
  *
- * Call this method from [UIApplicationDelegate application:openURL:options:] (on iOS 9.0 and
- * above), or [UIApplicationDelegate application:openURL:sourceApplication:annotation:] (on
- * iOS 8.x and below) in your app.
+ * Call this method from UIApplicationDelegate.application(_:open:options:) in your app.
  *
  * @param url The URL resource to open. This resource can be a network resource or a file.
  */
 + (void)handleOpenURL:(NSURL *)url;
 
 /**
  * Handles the event when the app receives data associated with user activity that includes a
- * Universal Link (on iOS 9.0 and above).
+ * Universal Link.
  *
- * Call this method from [UIApplication continueUserActivity:restorationHandler:] in your app
- * delegate (on iOS 9.0 and above).
+ * Call this method from UIApplication.application(_:continue:restorationHandler:) in your app
+ * delegate.
  *
  * @param userActivity The activity object containing the data associated with the task the user
  *     was performing.

ios/platform/FirebaseAnalytics.xcframework/ios-arm64_armv7/FirebaseAnalytics.framework/Headers/FIRAnalytics+Consent.h

@@ -23,7 +23,7 @@ extern FIRConsentStatus const FIRConsentStatusGranted;
 /// device. Use the consent settings to specify individual consent type values. Settings are
 /// persisted across app sessions. By default consent types are set to `ConsentStatus.granted`.
 ///
-/// @param consentSettings An NSDictionary of consent types. Supported consent type keys are
+/// @param consentSettings A Dictionary of consent types. Supported consent type keys are
 ///   `ConsentType.adStorage` and `ConsentType.analyticsStorage`. Valid values are
 ///   `ConsentStatus.granted` and `ConsentStatus.denied`.
 + (void)setConsent:(NSDictionary<FIRConsentType, FIRConsentStatus> *)consentSettings;

ios/platform/FirebaseAnalytics.xcframework/ios-arm64_armv7/FirebaseAnalytics.framework/Headers/FIRAnalytics.h

@@ -62,12 +62,12 @@ NS_SWIFT_NAME(Analytics)
 ///     "google_", and "ga_" prefixes are reserved and should not be used. Note that event names are
 ///     case-sensitive and that logging two events whose names differ only in case will result in
 ///     two distinct events. To manually log screen view events, use the `screen_view` event name.
-/// @param parameters The dictionary of event parameters. Passing nil indicates that the event has
+/// @param parameters The dictionary of event parameters. Passing `nil` indicates that the event has
 ///     no parameters. Parameter names can be up to 40 characters long and must start with an
-///     alphabetic character and contain only alphanumeric characters and underscores. Only NSString
-///     and NSNumber (signed 64-bit integer and 64-bit floating-point number) parameter types are
-///     supported. NSString parameter values can be up to 100 characters long. The "firebase_",
-///     "google_", and "ga_" prefixes are reserved and should not be used for parameter names.
+///     alphabetic character and contain only alphanumeric characters and underscores. Only String,
+///     Int, and Double parameter types are supported. String parameter values can be up to 100
+///     characters long. The "firebase_", "google_", and "ga_" prefixes are reserved and should not
+///     be used for parameter names.
 + (void)logEventWithName:(NSString *)name
               parameters:(nullable NSDictionary<NSString *, id> *)parameters
     NS_SWIFT_NAME(logEvent(_:parameters:));
@@ -83,7 +83,7 @@ NS_SWIFT_NAME(Analytics)
 /// </ul>
 ///
 /// @param value The value of the user property. Values can be up to 36 characters long. Setting the
-///     value to nil removes the user property.
+///     value to `nil` removes the user property.
 /// @param name The name of the user property to set. Should contain 1 to 24 alphanumeric characters
 ///     or underscores and must start with an alphabetic character. The "firebase_", "google_", and
 ///     "ga_" prefixes are reserved and should not be used for user property names.
@@ -94,7 +94,7 @@ NS_SWIFT_NAME(Analytics)
 /// <a href="https://www.google.com/policies/privacy">Google's Privacy Policy</a>
 ///
 /// @param userID The user ID to ascribe to the user of this app on this device, which must be
-///     non-empty and no more than 256 characters long. Setting userID to nil removes the user ID.
+///     non-empty and no more than 256 characters long. Setting userID to `nil` removes the user ID.
 + (void)setUserID:(nullable NSString *)userID;
 
 /// Sets whether analytics collection is enabled for this app on this device. This setting is
@@ -110,14 +110,13 @@ NS_SWIFT_NAME(Analytics)
 ///     session terminates.
 + (void)setSessionTimeoutInterval:(NSTimeInterval)sessionTimeoutInterval;
 
-/// Returns the unique ID for this instance of the application or nil if
+/// Returns the unique ID for this instance of the application or `nil` if
 /// `ConsentType.analyticsStorage` has been set to `ConsentStatus.denied`.
 ///
 /// @see `FIRAnalytics+Consent.h`
 + (nullable NSString *)appInstanceID;
 
 /// Clears all analytics data for this instance from the device and resets the app instance ID.
-/// FIRAnalyticsConfiguration values will be reset to the default values.
 + (void)resetAnalyticsData;
 
 /// Adds parameters that will be set on every event logged from the SDK, including automatic ones.
@@ -129,9 +128,9 @@ NS_SWIFT_NAME(Analytics)
 ///
 /// @param parameters Parameters to be added to the dictionary of parameters added to every event.
 ///     They will be added to the dictionary of default event parameters, replacing any existing
-///     parameter with the same name. Valid parameters are NSString and NSNumber (signed 64-bit
-///     integer and 64-bit floating-point number). Setting a key's value to [NSNull null] will clear
-///     that parameter. Passing in a nil dictionary will clear all parameters.
+///     parameter with the same name. Valid parameters are String, Int, and Double. Setting a key's
+///     value to NSNull() will clear that parameter. Passing in a `nil` dictionary will clear all
+///     parameters.
 + (void)setDefaultEventParameters:(nullable NSDictionary<NSString *, id> *)parameters;
 
 /// Unavailable.