Skip to content

Commit e0e47ee

Browse files
Googlerchkuang-g
authored andcommitted
Initial import of the Firebase Unity SDK - 384821525 Make Crashlytics editor libraries build with Unity 2017+ by chkuang <[email protected]>
- 384817576 Update the Unity version for M99 release by amaurice <[email protected]> - 384782746 Import firebase/firebase-cpp-sdk from GitHub. by amaurice <[email protected]> - 384587863 Also ignore the meta files for the google service files by amaurice <[email protected]> PiperOrigin-RevId: 384821525
1 parent 542d722 commit e0e47ee

File tree

5 files changed

+74
-17
lines changed

5 files changed

+74
-17
lines changed

app/src/swig/app.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ firebase::AppOptions* AppOptionsLoadFromJsonConfig(const char* config);
14071407
// This is a bit of a hack. We need to undefine the header guard for
14081408
// availability.h, because for non-android targets it has already been
14091409
// included, and done nothing. (Because __Android__ was not defined.)
1410-
#undef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
1410+
#undef FIREBASE_APP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
14111411
#endif // !defined(__ANDROID__)
14121412

14131413
%ignore google_play_services::CheckAvailability;
@@ -1430,7 +1430,7 @@ firebase::AppOptions* AppOptionsLoadFromJsonConfig(const char* config);
14301430
// This is a bit of a hack. We need to undefine the header guard for
14311431
// availability.h, because for non-android targets it has already been
14321432
// included, and done nothing. (Because __Android__ was not defined.)
1433-
#undef FIREBASE_APP_CLIENT_CPP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
1433+
#undef FIREBASE_APP_SRC_INCLUDE_GOOGLE_PLAY_SERVICES_AVAILABILITY_H_
14341434
#endif // !defined(__ANDROID__)
14351435

14361436
#include "google_play_services/availability.h"

cmake/firebase_unity_version.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,12 @@
1414

1515
# This file defines the version numbers used by the Firebase Unity SDK.
1616

17-
set(FIREBASE_UNITY_SDK_VERSION "7.1.0"
17+
set(FIREBASE_UNITY_SDK_VERSION "8.1.0"
1818
CACHE STRING "The version of the Unity SDK, used in the names of files.")
1919

20-
set(FIREBASE_IOS_POD_VERSION "7.8.0"
20+
set(FIREBASE_IOS_POD_VERSION "8.3.0"
2121
CACHE STRING "The version of the top-level Firebase Cocoapod to use.")
2222

23-
set(FIREBASE_INSTANCE_ID_POD_VERSION "4.3.1"
24-
CACHE STRING "The version of the FirebaseInstanceId Cocoapod to use.")
25-
2623
# https://github.com/googlesamples/unity-jar-resolver
2724
set(FIREBASE_UNITY_JAR_RESOLVER_VERSION
2825
"1.2.164"

docs/readme.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,6 @@ Support
163163

164164
Release Notes
165165
-------------
166-
### Unreleased:
167-
- Changes
168-
- Firestore: Added support for Firestore Bundles via
169-
`FirebaseFirestore.LoadBundleAsync()` and
170-
`FirebaseFirestore.GetNamedQueryAsync()`. Bundles contain pre-packaged
171-
data produced with the Firestore Server SDKs and can be used to populate
172-
Firestore's cache without reading documents from the backend.
173-
174166
### 8.1.0:
175167
- Changes
176168
- Database: Fixed a crash around using DataSnapshots within Coroutines
@@ -182,6 +174,11 @@ Release Notes
182174
([#1053](https://github.com/firebase/quickstart-unity/issues/1053)).
183175
- Firestore: Fixed Android crash due to missing QueryEventListener class
184176
([#1080](https://github.com/firebase/quickstart-unity/issues/1080)).
177+
- Firestore: Added support for Firestore Bundles via
178+
`FirebaseFirestore.LoadBundleAsync()` and
179+
`FirebaseFirestore.GetNamedQueryAsync()`. Bundles contain pre-packaged
180+
data produced with the Firestore Server SDKs and can be used to populate
181+
Firestore's cache without reading documents from the backend.
185182

186183
### 8.0.0:
187184
- Breaking Changes

editor/crashlytics/src/iOSPostBuild.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,20 @@ private static string GetMainUnityProjectTargetGuid(object projectObj) {
156156
if (getUnityMainTargetGuid != null) {
157157
return (string)getUnityMainTargetGuid.Invoke(project, new object[] {});
158158
} else {
159-
string targetName = UnityEditor.iOS.Xcode.PBXProject.GetUnityTargetName();
160-
return project.TargetGuidByName(targetName);
159+
// Hardcode the main target name "Unity-iPhone" by default, just in case
160+
// GetUnityTargetName() is not available.
161+
string targetName = "Unity-iPhone";
162+
MethodInfo getUnityTargetName = project.GetType().GetMethod("GetUnityTargetName");
163+
if (getUnityTargetName != null) {
164+
targetName = (string) getUnityTargetName.Invoke(null, new object[] {});
165+
}
166+
167+
MethodInfo targetGuidByName = project.GetType().GetMethod("TargetGuidByName");
168+
if (targetGuidByName != null) {
169+
return (string)targetGuidByName.Invoke(project, new object[] { (object)targetName });
170+
}
161171
}
172+
return "";
162173
}
163174

164175
/// <summary>

unity_packer/guids.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3623,5 +3623,57 @@
36233623
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0": "72dfdc78725f4c9695cbfa6af593ad29",
36243624
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0": "7ab34e4c1a934a6aa46e0e2100c70c1c",
36253625
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0": "745164b2d0e84e3c9fcdacb80782de8b"
3626+
},
3627+
"8.1.0": {
3628+
"Firebase/Editor/FirebaseAnalytics_version-8.1.0_manifest.txt": "f43f4407edeb4b5196b4b81b59a25037",
3629+
"Firebase/Editor/FirebaseAuth_version-8.1.0_manifest.txt": "b796ad27ad91429c8ee4f5f24e615930",
3630+
"Firebase/Editor/FirebaseCrashlytics_version-8.1.0_manifest.txt": "e4184cb9de704cb5b4b7052c61fadbe5",
3631+
"Firebase/Editor/FirebaseDatabase_version-8.1.0_manifest.txt": "7b9ee6b4f59446ff98058cfa9240f7f0",
3632+
"Firebase/Editor/FirebaseDynamicLinks_version-8.1.0_manifest.txt": "1179d67c2e1e423fb3460c82b852bd4a",
3633+
"Firebase/Editor/FirebaseFirestore_version-8.1.0_manifest.txt": "9669c90c1aba487e85b2eafa5bf0756a",
3634+
"Firebase/Editor/FirebaseFunctions_version-8.1.0_manifest.txt": "0d3000e2fdfc4639b5d6e3892bb2bcee",
3635+
"Firebase/Editor/FirebaseInstallations_version-8.1.0_manifest.txt": "ebb921de82674967baab2d7ab855bb75",
3636+
"Firebase/Editor/FirebaseMessaging_version-8.1.0_manifest.txt": "20b661aa5e034d3e985cc29ea6a80572",
3637+
"Firebase/Editor/FirebaseRemoteConfig_version-8.1.0_manifest.txt": "ebe1e70058344f94962404de7adf8b8a",
3638+
"Firebase/Editor/FirebaseStorage_version-8.1.0_manifest.txt": "b6013b4921864c52966dd8d5d9f7043f",
3639+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_1_0.bundle": "66c3d96899f04c85b2a76e6219bff57f",
3640+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_1_0.dll": "e2231ef1873741ff99b0ad64d49ff263",
3641+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_1_0.so": "800767a0ca6b48918df6431c8ba4745a",
3642+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.1.0/firebase-analytics-unity-8.1.0.pom": "3d68da978dd64a399112c745ffda6f60",
3643+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.1.0/firebase-analytics-unity-8.1.0.srcaar": "31f85939d0084ca2bb3c7f91213cb4db",
3644+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.1.0/firebase-app-unity-8.1.0.pom": "86802043eb254e0289eef569dd0292b9",
3645+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.1.0/firebase-app-unity-8.1.0.srcaar": "95bcd36044774e6a9f03902c40094b63",
3646+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.1.0/firebase-auth-unity-8.1.0.pom": "785da56dd8a74d1a812e73facb08344e",
3647+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.1.0/firebase-auth-unity-8.1.0.srcaar": "31625e172f5e4583af7e66b09c46246e",
3648+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.1.0/firebase-config-unity-8.1.0.pom": "fb3f2f8977e74129aac3251546ebdb58",
3649+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.1.0/firebase-config-unity-8.1.0.srcaar": "8af2246ede84416587fafb3f5d3a707c",
3650+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.1.0/firebase-crashlytics-unity-8.1.0.pom": "b50ed07fe6c942a780a1898d4d80b844",
3651+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.1.0/firebase-crashlytics-unity-8.1.0.srcaar": "52a0ff3475ac4fa9bb94258348cccf5f",
3652+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.1.0/firebase-database-unity-8.1.0.pom": "8487eb1ff8de4c7980c759eddfd425dd",
3653+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.1.0/firebase-database-unity-8.1.0.srcaar": "2a04d8ee784345c1a1f1777a81675cf7",
3654+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.1.0/firebase-dynamic-links-unity-8.1.0.pom": "59f5afcd9f5b4ea99b18ba7f1e30378a",
3655+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.1.0/firebase-dynamic-links-unity-8.1.0.srcaar": "c55f918b3cfb4d29a58cdd59ab2d10a7",
3656+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.1.0/firebase-firestore-unity-8.1.0.pom": "2c4971fcffcf4d9bb21b7cf914885e59",
3657+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.1.0/firebase-firestore-unity-8.1.0.srcaar": "facae9dc00bf49bca348118d7b79db64",
3658+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.1.0/firebase-functions-unity-8.1.0.pom": "00a137b769874bfd9976e6da84ac0763",
3659+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.1.0/firebase-functions-unity-8.1.0.srcaar": "50e50d22d8744e2db90994535d6b9078",
3660+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.1.0/firebase-installations-unity-8.1.0.pom": "66180cac8ca14dd7b0bc633259659e3a",
3661+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.1.0/firebase-installations-unity-8.1.0.srcaar": "0d7ffb45b072422c9e4cdcdb43bec2a5",
3662+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.1.0/firebase-messaging-unity-8.1.0.pom": "50cc6480d3f94692b01141f5062f2ab7",
3663+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.1.0/firebase-messaging-unity-8.1.0.srcaar": "b32b61dad60b4f09a0bf8bdac62c8019",
3664+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.1.0/firebase-storage-unity-8.1.0.pom": "d01eade67b4c4f7ca2a06a8dc668d959",
3665+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.1.0/firebase-storage-unity-8.1.0.srcaar": "9e24340a582f4723a81ee410fa48049a",
3666+
"com.google.firebase.analytics/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.1.0": "4529e30eb30b4d8cabd16421accbea21",
3667+
"com.google.firebase.app/Firebase/m2repository/com/google/firebase/firebase-app-unity/8.1.0": "5bd32093a58d41c7af08843cce75d82c",
3668+
"com.google.firebase.auth/Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.1.0": "c1618975745448a3b33eb0d6bd0063c3",
3669+
"com.google.firebase.crashlytics/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.1.0": "d83cc7e1e9da46afb7d549bb1a64ee85",
3670+
"com.google.firebase.database/Firebase/m2repository/com/google/firebase/firebase-database-unity/8.1.0": "7c280407d3d6445495979f5d44eea1e4",
3671+
"com.google.firebase.dynamic-links/Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.1.0": "79ac5535380c4341ab4503049543527f",
3672+
"com.google.firebase.firestore/Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.1.0": "3e29cea5d25e4cb9977d81af48efec52",
3673+
"com.google.firebase.functions/Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.1.0": "4f891ac001744283bfeef2cda135b9c0",
3674+
"com.google.firebase.installations/Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.1.0": "a72337c7398640ad9a435cd8c6363c91",
3675+
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.1.0": "995b0393b87d4fdb8a578ab5d0369eef",
3676+
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/8.1.0": "dab1eabff5c24bb997e194a4cce9103b",
3677+
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.1.0": "910dd7cc4d92434d9033c3ff69c77321"
36263678
}
36273679
}

0 commit comments

Comments
 (0)