Merge remote-tracking branch 'origin/master' into ghm

Author: Cynthia Jiang

CMakeLists.txt

@@ -42,8 +42,6 @@ option(FIREBASE_INCLUDE_DYNAMIC_LINKS
        "Include the Firebase Dynamic Links library." ON)
 option(FIREBASE_INCLUDE_FUNCTIONS
        "Include the Cloud Functions for Firebase library." ON)
-option(FIREBASE_INCLUDE_INSTANCE_ID
-       "Include the Firebase Instance ID library." ON)
 option(FIREBASE_INCLUDE_MESSAGING
        "Include the Firebase Cloud Messaging library." ON)
 option(FIREBASE_INCLUDE_REMOTE_CONFIG
@@ -244,11 +242,6 @@ if (FIREBASE_INCLUDE_FUNCTIONS)
   list(APPEND TARGET_LINK_LIB_NAMES "firebase_functions" "firebase_functions_swig")
   list(APPEND PROJECT_LIST_HEADER "  X(Functions)")
 endif()
-if (FIREBASE_INCLUDE_INSTANCE_ID)
-  add_subdirectory(instance_id)
-  list(APPEND TARGET_LINK_LIB_NAMES "firebase_instance_id" "firebase_instance_id_swig")
-  list(APPEND PROJECT_LIST_HEADER "  X(InstanceId)")
-endif()
 if (FIREBASE_INCLUDE_MESSAGING)
   add_subdirectory(messaging)
   list(APPEND TARGET_LINK_LIB_NAMES "firebase_messaging" "firebase_messaging_swig")

app/src/swig/app.i

@@ -651,10 +651,6 @@ static firebase::AppOptions* AppOptionsLoadFromJsonConfig(const char* config) {
           "Firebase.Installations.FirebaseInstallations, Firebase.Installations",
           "installations"
         ),
-        new EnableModuleParams(
-          "Firebase.InstanceId.FirebaseInstanceId, Firebase.InstanceId",
-          "instance_id"
-        ),
         new EnableModuleParams(
           "Firebase.Invites.FirebaseInvites, Firebase.Invites",
           "invites"

app/src/swig/future.i

@@ -181,6 +181,15 @@ namespace firebase {
     System.Threading.Tasks.TaskCompletionSource<CSTYPE> tcs =
         new System.Threading.Tasks.TaskCompletionSource<CSTYPE>();
 #endif  // TYPE_## %mangle(CTYPE)
+
+    // Check if an exception has occurred previously and propagate it if it has.
+    // This has to be done before accessing the future because the future object
+    // might be invalid.
+    if ($imclassname.SWIGPendingException.Pending) {
+      tcs.SetException($imclassname.SWIGPendingException.Retrieve());
+      return tcs.Task;
+    }
+
     if (fu.status() == FutureStatus.Invalid) {
       tcs.SetException(
         new FirebaseException(0, "Asynchronous operation was not started."));

app/src/unity_main.cpp

@@ -20,6 +20,7 @@
 // the C++ module.
 
 #include <jni.h>
+
 #include "app/src/util.h"
 #include "app/src/util_android.h"
 
@@ -110,7 +111,6 @@ jint JNI_OnLoad(JavaVM *jvm, void *reserved) {
         {"com/google/firebase/dynamiclinks/FirebaseDynamicLinks",
          "dynamic_links"},
         {"com/google/firebase/functions/FirebaseFunctions", "functions"},
-        {"com/google/firebase/iid/FirebaseInstanceId", "instance_id"},
         {"com/google/firebase/installations/FirebaseInstallations",
          "installations"},
         {"com/google/android/gms/appinvite/AppInvite", "invites"},

auth/src/swig/auth.i

@@ -956,7 +956,7 @@ static CppInstanceManager<Auth> g_auth_instances;
 %typemap(csclassmodifiers) firebase::auth::FederatedOAuthProvider
   "public sealed class";
 
-// Provider classes declared in auth/client/cpp/src/included/credential.h
+// Provider classes declared in third_party/firebase/cpp/auth/src/included/credential.h
 // Rename the kProviderId string constant for all of our AuthProviders.
 %rename(ProviderId) firebase::auth::EmailAuthProvider::kProviderId;
 %rename(ProviderId) firebase::auth::FacebookAuthProvider::kProviderId;

cmake/android_dependencies.cmake

@@ -16,49 +16,49 @@
 
 set(FIREBASE_APP_ANDROID_DEPS
     "com.google.firebase:firebase-common:19.5.0"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_ANALYTICS_ANDROID_DEPS
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_AUTH_ANDROID_DEPS
-    "com.google.firebase:firebase-auth:20.0.2"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-auth:20.0.4"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_DATABASE_ANDROID_DEPS
-    "com.google.firebase:firebase-database:19.6.0"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-database:19.7.0"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_DYNAMIC_LINKS_ANDROID_DEPS
     "com.google.android.gms:play-services-appinvite:18.0.0"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_FUNCTIONS_ANDROID_DEPS
     "com.google.firebase:firebase-functions:19.2.0"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_INSTANCE_ID_ANDROID_DEPS
-    "com.google.firebase:firebase-iid:21.0.1"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-iid:21.1.0"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_MESSAGING_ANDROID_DEPS
-    "com.google.firebase:firebase-messaging:21.0.1"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-messaging:21.1.0"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS
-    "com.google.firebase:firebase-config:20.0.3"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-config:20.0.4"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )
 
 set(FIREBASE_STORAGE_ANDROID_DEPS
-    "com.google.firebase:firebase-storage:19.2.1"
-    "com.google.firebase:firebase-analytics:18.0.2"
+    "com.google.firebase:firebase-storage:19.2.2"
+    "com.google.firebase:firebase-analytics:18.0.3"
 )

cmake/swig_fix.py

@@ -139,7 +139,8 @@ def get_transformations(namespace):
       'csharp': [
           swig_post_process.SWIGEnumPostProcessing(),
           NamespaceCMethodsCMake(namespace),
-          swig_post_process.ReplaceExceptionChecks('AppUtil'),
+          swig_post_process.ReplaceExceptionChecks(
+              'AppUtil', ['firebase/firestore/client/unity']),
           swig_post_process.FixSealedClasses(),
           swig_post_process.InternalMethodsToInternalVisibility(),
           swig_post_process.RenameAsyncMethods(),

crashlytics/src/AndroidImpl.cs

@@ -55,6 +55,8 @@ internal AndroidImpl() {
             "Unable to create FirebaseCrashlytics instance.");
         return;
       }
+
+      SetCustomKey(MetadataBuilder.METADATA_KEY, MetadataBuilder.GenerateMetadataJSON());
     }
 
     ~AndroidImpl() {

crashlytics/src/IOSImpl.cs

@@ -49,6 +49,9 @@ internal class IOSImpl : Impl
     [DllImport("__Internal")]
     private static extern void CLUSetKeyValue(string key, string value);
 
+    [DllImport("__Internal")]
+    private static extern void CLUSetInternalKeyValue(string key, string value);
+
     [DllImport("__Internal")]
     private static extern void CLUSetUserIdentifier(string identifier);
 
@@ -68,6 +71,7 @@ private static extern void CLURecordCustomException(string name, string reason,
 
     public IOSImpl() {
       CLUSetDevelopmentPlatform("Unity", Application.unityVersion);
+      CLUSetInternalKeyValue(MetadataBuilder.METADATA_KEY, MetadataBuilder.GenerateMetadataJSON());
     }
 
     public override bool IsSDKInitialized() {

crashlytics/src/Metadata.cs

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Firebase.Crashlytics {
+  using System;
+  using System;
+  using UnityEngine;
+
+  /// <summary>
+  /// Represents the Unity-specific metadata object that is transformed into JSON.
+  ///
+  /// Metadata keys are acronyms to save space as there are limits to the maximum size of Keys in
+  /// the Android and iOS SDK.
+  /// </summary>
+  internal class Metadata {
+    // unityVersion: Version of Unity Engine
+    public string uv;
+    // isDebugBuild: Whether "Development Build" is checked
+    public bool idb;
+
+    // processorType
+    public string pt;
+    // processorCount: Number of cores
+    public int pc;
+    // processorFrequency
+    public int pf;
+
+    // systemMemorySize: RAM size
+    public int sms;
+
+    // graphicsMemorySize
+    public int gms;
+    // graphicsDeviceID
+    public int gdid;
+    // graphicsDeviceVendorID
+    public int gdvid;
+    // graphicsDeviceName
+    public string gdn;
+    // graphicsDeviceVendor
+    public string gdv;
+    // graphicsDeviceVersion
+    public string gdver;
+    // graphicsDeviceType
+    public UnityEngine.Rendering.GraphicsDeviceType gdt;
+
+    // graphicsShaderLevel
+    // https://docs.unity3d.com/540/Documentation/ScriptReference/SystemInfo-graphicsShaderLevel.html
+    public int gsl;
+    // graphicsRenderTargetCount
+    public int grtc;
+    // graphicsCopyTextureSupport
+    public UnityEngine.Rendering.CopyTextureSupport gcts;
+    // graphicsMaxTextureSize
+    public int gmts;
+
+    // screenSize
+    public string ss;
+    // screenDPI
+    public float sdpi;
+    // screenRefreshRate
+    public int srr;
+
+    public Metadata() {
+      uv = Application.unityVersion;
+      idb = Debug.isDebugBuild;
+
+      pt = SystemInfo.processorType;
+      pc = SystemInfo.processorCount;
+      pf = SystemInfo.processorFrequency;
+
+      sms = SystemInfo.systemMemorySize;
+
+      gms = SystemInfo.graphicsMemorySize;
+      gdid = SystemInfo.graphicsDeviceID;
+      gdvid = SystemInfo.graphicsDeviceVendorID;
+      gdn = SystemInfo.graphicsDeviceName;
+      gdv = SystemInfo.graphicsDeviceVendor;
+      gdver = SystemInfo.graphicsDeviceVersion;
+      gdt = SystemInfo.graphicsDeviceType;
+
+      gsl = SystemInfo.graphicsShaderLevel;
+      grtc = SystemInfo.supportedRenderTargetCount;
+      gcts = SystemInfo.copyTextureSupport;
+      gmts = SystemInfo.maxTextureSize;
+
+      ss = String.Format("{0}x{1}", Screen.width, Screen.height);
+      sdpi = Screen.dpi;
+      srr = Screen.currentResolution.refreshRate;
+    }
+  }
+}

crashlytics/src/MetadataBuilder.cs

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Firebase.Crashlytics {
+  using System;
+  using UnityEngine;
+
+  /// <summary>
+  /// Automatically collects metadata and serializes to JSON in a space-efficient way.
+  /// </summary>
+  internal class MetadataBuilder {
+    public static string METADATA_KEY = "com.crashlytics.metadata.unity";
+
+    public static string GenerateMetadataJSON() {
+      try {
+        Metadata metadata = new Metadata();
+        return JsonUtility.ToJson(metadata);
+      } catch (Exception e) {
+        UnityEngine.Debug.LogError(
+            "Failed to generate Unity-specific metadata for Crashlytics due to: " + e.ToString());
+        return "";
+      }
+    }
+  }
+}

crashlytics/src/cpp/android/crashlytics_android.h

@@ -16,14 +16,16 @@
 #define FIREBASE_CRASHLYTICS_CLIENT_CPP_SRC_ANDROID_CRASHLYTICS_ANDROID_H_
 
 #include <jni.h>
+
 #include <map>
 #include <set>
+
+#include "crashlytics/src/cpp/include/firebase/crashlytics.h"
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/internal/common.h"
 #include "app/src/mutex.h"
 #include "app/src/util_android.h"
-#include "crashlytics/src/cpp/include/firebase/crashlytics.h"
 
 namespace firebase {
 namespace crashlytics {

crashlytics/src/cpp/common/crashlytics.cc

@@ -22,13 +22,13 @@
 #include "app/src/cleanup_notifier.h"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/version.h"
-#include "app/src/mutex.h"
 #include "app/src/log.h"
+#include "app/src/mutex.h"
 #include "app/src/util.h"
 
 #if defined(__ANDROID__)
-#include "app/src/util_android.h"
 #include "crashlytics/src/cpp/android/crashlytics_android.h"
+#include "app/src/util_android.h"
 #else
 #include "crashlytics/src/cpp/stub/crashlytics_stub.h"
 #endif  // defined(__ANDROID__)

crashlytics/src/cpp/ios/Crashlytics_PrivateHeaders/Crashlytics_Platform.h

@@ -26,3 +26,5 @@
 @property(nonatomic, strong, nullable) NSString* developmentPlatformVersion;
 
 @end
+
+void FIRCLSUserLoggingRecordInternalKeyValue(NSString* key, id value);

crashlytics/src/cpp/ios/CrashlyticsiOSWrapper.m

@@ -69,6 +69,10 @@ void CLUSetKeyValue(const char *key, const char *value) {
                                         forKey:safeCharToNSString(key)];
 }
 
+void CLUSetInternalKeyValue(const char *key, const char *value) {
+  FIRCLSUserLoggingRecordInternalKeyValue(safeCharToNSString(key), safeCharToNSString(value));
+}
+
 void CLULog(const char *msg) { [[FIRCrashlytics crashlytics] log:safeCharToNSString(msg)]; }
 
 void CLUSetUserIdentifier(const char *identifier) {

crashlytics/src/cpp/stub/crashlytics_stub.h

@@ -17,12 +17,13 @@
 
 #include <map>
 #include <set>
+
+#include "crashlytics/src/cpp/include/firebase/crashlytics.h"
 #include "app/src/cleanup_notifier.h"
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/internal/common.h"
 #include "app/src/mutex.h"
-#include "crashlytics/src/cpp/include/firebase/crashlytics.h"
 
 namespace firebase {
 namespace crashlytics {