Initial import of the Firebase Unity SDK - 388549025 Update Installations to handle newer swig versions by amaurice <[email protected]>

  - 388275326 Crashlytics Unity Upload UnityFramework dSYM file and set... by Googler <[email protected]>

PiperOrigin-RevId: 388549025

Author: Googler

docs/readme.md

@@ -163,6 +163,12 @@ Support
 
 Release Notes
 -------------
+### Unreleased:
+-   Changes
+    - Crashlytics: Upload UnityFramework symbols in addition to the main app
+      dSYM file to improve symbolication
+      ([#673](https://github.com/firebase/quickstart-unity/issues/673)).
+
 ### 8.2.0:
 -   Changes
     - Firestore: Removed `Equals` and `GetHashCode` methods from `Query`,

editor/crashlytics/src/iOSPostBuild.cs

@@ -94,9 +94,23 @@ private static void PrepareProject(string projectPath, IFirebaseConfigurationSto
       var pbxProject = new UnityEditor.iOS.Xcode.PBXProject();
       pbxProject.ReadFromFile(projectPath);
 
-      string targetGuid = iOSPostBuild.GetMainUnityProjectTargetGuid(pbxProject);
       string completeRunScriptBody = GetRunScriptBody(configurationStorage);
 
+      string appGUID = iOSPostBuild.GetMainUnityProjectTargetGuid(pbxProject);
+      SetupGUIDForSymbolUploads(pbxProject, completeRunScriptBody, appGUID);
+
+      // In older versions of Unity there is no separate framework GUID, so this can
+      // be empty or null.
+      string frameworkGUID = iOSPostBuild.GetUnityFrameworkTargetGuid(pbxProject);
+      if (!String.IsNullOrEmpty(frameworkGUID)) {
+        SetupGUIDForSymbolUploads(pbxProject, completeRunScriptBody, frameworkGUID);
+      }
+
+      pbxProject.WriteToFile(projectPath);
+    }
+
+    private static void SetupGUIDForSymbolUploads(UnityEditor.iOS.Xcode.PBXProject pbxProject,
+                                                  string completeRunScriptBody, string targetGuid) {
       try {
         // Use reflection to append a Crashlytics Run Script
         BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public;
@@ -117,8 +131,6 @@ private static void PrepareProject(string projectPath, IFirebaseConfigurationSto
       } finally {
         // Set debug information format to DWARF with DSYM
         pbxProject.SetBuildProperty(targetGuid, "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym");
-
-        pbxProject.WriteToFile(projectPath);
       }
     }
 
@@ -140,6 +152,28 @@ internal static iOSBuildPhaseMethodCall GetBuildPhaseMethodCall(string unityVers
       }
     }
 
+    private static string GetUnityFrameworkTargetGuid(UnityEditor.iOS.Xcode.PBXProject project) {
+      // var project = (UnityEditor.iOS.Xcode.PBXProject)projectObj;
+      MethodInfo getUnityFrameworkTargetGuid =
+          project.GetType().GetMethod("GetUnityFrameworkTargetGuid");
+
+      // Starting in Unity 2019.3, TargetGuidByName is deprecated
+      // Use reflection to call the GetUnityFrameworkTargetGuid method if it exists (it was added
+      // ub 2019.3).
+      if (getUnityFrameworkTargetGuid != null) {
+        return (string)getUnityFrameworkTargetGuid.Invoke(project, new object[] {});
+      } else {
+        // Hardcode the main target name "UnityFramework" because there isn't a way to get the
+        // Unity Framework target name.
+        string targetName = "UnityFramework";
+        MethodInfo targetGuidByName = project.GetType().GetMethod("TargetGuidByName");
+        if (targetGuidByName != null) {
+          return (string)targetGuidByName.Invoke(project, new object[] { (object)targetName });
+        } else {
+          return "";
+        }
+      }
+    }
 
     /// <summary>
     /// Get the main Unity project's target GUID

installations/src/swig/installations.i

@@ -175,7 +175,12 @@ static CppInstanceManager<Installations> g_installations_instances;
 
 // Replace the default Dispose() method to remove references to this instance
 // from the map of FirebaseInstallations instances.
+#if SWIG_VERSION >= 0x040000
+%typemap(csdisposing, methodname="Dispose",
+         parameters="bool disposing", methodmodifiers="public")
+#else
 %typemap(csdestruct, methodname="Dispose", methodmodifiers="public")
+#endif
     firebase::installations::Installations {
   lock (installationsByAppCPtr) {
     if (appProxy != null) {