Skip to content

Merge from internal repo #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2021
Merged

Merge from internal repo #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ae78df
Initial import of the Firebase Unity SDK - 373498385 Handle MutableD…
a-googler May 13, 2021
5b43215
Merge remote-tracking branch 'origin/master' into ghm
May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions cmake/android_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,45 @@
# This file defines the Android dependencies needed by all the modules.

set(FIREBASE_APP_ANDROID_DEPS
"com.google.firebase:firebase-common:19.5.0"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-common:20.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_ANALYTICS_ANDROID_DEPS
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_AUTH_ANDROID_DEPS
"com.google.firebase:firebase-auth:20.0.4"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-auth:21.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_DATABASE_ANDROID_DEPS
"com.google.firebase:firebase-database:19.7.0"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-database:20.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_DYNAMIC_LINKS_ANDROID_DEPS
"com.google.android.gms:play-services-appinvite:18.0.0"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_FUNCTIONS_ANDROID_DEPS
"com.google.firebase:firebase-functions:19.2.0"
"com.google.firebase:firebase-analytics:18.0.3"
)

set(FIREBASE_INSTANCE_ID_ANDROID_DEPS
"com.google.firebase:firebase-iid:21.1.0"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-functions:20.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_MESSAGING_ANDROID_DEPS
"com.google.firebase:firebase-messaging:21.1.0"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-messaging:22.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS
"com.google.firebase:firebase-config:20.0.4"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-config:21.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)

set(FIREBASE_STORAGE_ANDROID_DEPS
"com.google.firebase:firebase-storage:19.2.2"
"com.google.firebase:firebase-analytics:18.0.3"
"com.google.firebase:firebase-storage:20.0.0"
"com.google.firebase:firebase-analytics:19.0.0"
)
2 changes: 1 addition & 1 deletion database/src/MutableData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public bool HasChild(string path) {
/// <param name="path">A relative path</param>
/// <returns>An instance encapsulating the data and priority at the given path</returns>
public MutableData Child(string path) {
return new MutableData(internalData.Child(path), database);
return new MutableData(internalData.GetChild(path), database);
}

/// Two MutableData are considered equal if they contain the same references and priority.
Expand Down
8 changes: 7 additions & 1 deletion database/src/swig/database.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ static CppInstanceManager<Database> g_database_instances;
%rename("%s") firebase::database::MutableData::priority;
%rename("%s") firebase::database::MutableData::set_priority;
%rename("%s") firebase::database::MutableData::HasChild;
%rename("%s") firebase::database::MutableData::Child;
%rename("%s") firebase::database::MutableData::ChildrenEnumerator;

// These methods are unused and trigger the creation of additional classes
Expand Down Expand Up @@ -175,8 +174,15 @@ class MutableDataChildrenEnumerator {
%include "database/src/include/firebase/database/mutable_data.h"

%newobject firebase::database::MutableData::ChildrenEnumerator;
%rename("%s") firebase::database::MutableData::GetChild;
%extend firebase::database::MutableData {
firebase::database::MutableDataChildrenEnumerator* ChildrenEnumerator() {
return new firebase::database::MutableDataChildrenEnumerator($self->children());
}

// Return a pointer to a move constructed Child, since swig tries to use
// a copy constructor otherwise.
firebase::database::MutableData* GetChild(const char* path) {
return new firebase::database::MutableData($self->Child(path));
}
}
52 changes: 52 additions & 0 deletions unity_packer/guids.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3571,5 +3571,57 @@
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.2.0": "5411c331f88c46db86047f1d91538b2d",
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/7.2.0": "f25624d599e847b9be878c2ff1b32639",
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/7.2.0": "67a55124dd0a4612b5e8d6b162e949b9"
},
"8.0.0": {
"Firebase/Editor/FirebaseAnalytics_version-8.0.0_manifest.txt": "22d1aa195c38483aa6715a0843a3a1f7",
"Firebase/Editor/FirebaseAuth_version-8.0.0_manifest.txt": "02d228df07574cb49e3f6ee56a519d4f",
"Firebase/Editor/FirebaseCrashlytics_version-8.0.0_manifest.txt": "896b6ec81c7344d1adc2412697db8911",
"Firebase/Editor/FirebaseDatabase_version-8.0.0_manifest.txt": "0c8f351c66784616a1fa43b4c4116a50",
"Firebase/Editor/FirebaseDynamicLinks_version-8.0.0_manifest.txt": "69b772bc654040de8b68d9abd42160ad",
"Firebase/Editor/FirebaseFirestore_version-8.0.0_manifest.txt": "96c536b8615649eb9b903160ebce0562",
"Firebase/Editor/FirebaseFunctions_version-8.0.0_manifest.txt": "43e0677de8f64c38897d56023d933e96",
"Firebase/Editor/FirebaseInstallations_version-8.0.0_manifest.txt": "80fbdd6d14fb47f485d6307eb5da3dff",
"Firebase/Editor/FirebaseMessaging_version-8.0.0_manifest.txt": "bb2e357c66394904b70852b1b107d2b6",
"Firebase/Editor/FirebaseRemoteConfig_version-8.0.0_manifest.txt": "b38b04ce83ff48eca44fda28ef808f73",
"Firebase/Editor/FirebaseStorage_version-8.0.0_manifest.txt": "78b2b112c6f4459bb1c232ee51195619",
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.bundle": "8eee7073d8714ef5a88ce7eacd43f23d",
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.dll": "4cba8f5e0a4b436382e025602ea0c436",
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.so": "de8a9403a0ee4a29a6a13013ac154ffa",
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0/firebase-analytics-unity-8.0.0.pom": "c48c1e7e1e2147e78b46ec9c087835f4",
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0/firebase-analytics-unity-8.0.0.srcaar": "f661527059444de89f7bc2d3765d45ab",
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0/firebase-app-unity-8.0.0.pom": "ecd00fe6fe3e44afad21cb8ebd8b79fb",
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0/firebase-app-unity-8.0.0.srcaar": "f952ee706a374fb9ad273ca33ed589be",
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0/firebase-auth-unity-8.0.0.pom": "bdd688e965b241628b7f67f712b0c250",
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0/firebase-auth-unity-8.0.0.srcaar": "ca5240b383964106befb61bd6e6fbebf",
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0/firebase-config-unity-8.0.0.pom": "3ac318f6da8e42e6b58a09b4b770f2f0",
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0/firebase-config-unity-8.0.0.srcaar": "93ab422bceac44e9b2a766886fba9178",
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0/firebase-crashlytics-unity-8.0.0.pom": "aed06c2b6d5a44c2adb6ab35061fc44b",
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0/firebase-crashlytics-unity-8.0.0.srcaar": "dcb0167e571f40bc99c960f90aa52c7f",
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0/firebase-database-unity-8.0.0.pom": "c2e6299427a1455c8c89d5ee7b4aa0aa",
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0/firebase-database-unity-8.0.0.srcaar": "171079827a2745adb43bcc26da75038b",
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0/firebase-dynamic-links-unity-8.0.0.pom": "3bc81a5104e1433f8bf24cd88b739563",
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0/firebase-dynamic-links-unity-8.0.0.srcaar": "c89fa71b2c414b0180425ac5629b38ca",
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0/firebase-firestore-unity-8.0.0.pom": "6cba8c66d73a4d25975cf8e0fe72b3da",
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0/firebase-firestore-unity-8.0.0.srcaar": "a62920691d50462985d01ae801ab2fef",
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0/firebase-functions-unity-8.0.0.pom": "0316c82772eb4c3cb787722a0c588999",
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0/firebase-functions-unity-8.0.0.srcaar": "e93d96b1ebfe4af092bfded6beec0f9d",
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0/firebase-installations-unity-8.0.0.pom": "a01f166d68c647658961ecaa152075ad",
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0/firebase-installations-unity-8.0.0.srcaar": "8645267d74254f48928e00e727181d61",
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0/firebase-messaging-unity-8.0.0.pom": "0d718cf2f4b140bc8415df4bc303900a",
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0/firebase-messaging-unity-8.0.0.srcaar": "7bc0bc9f04314c3a82d32320377d601b",
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0/firebase-storage-unity-8.0.0.pom": "597480dc0c604e7eb4500871f645eb4a",
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0/firebase-storage-unity-8.0.0.srcaar": "a05b2222e17d45bfbf271761e1fce92c",
"com.google.firebase.analytics/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0": "1aa3e0b75b794addac1ec05c5c8d9565",
"com.google.firebase.app/Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0": "8eeb0c54c12c451ebd47d3111f5cbb0e",
"com.google.firebase.auth/Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0": "735e4cbbc3ab4bd3ad29fcd597e9e146",
"com.google.firebase.crashlytics/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0": "611c7ad47f674fdf9c787ee4bd95bb0c",
"com.google.firebase.database/Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0": "63bf872d5ce347baaa75c5c119422036",
"com.google.firebase.dynamic-links/Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0": "74bbc910e6664a8e8ad6c0aa0b386821",
"com.google.firebase.firestore/Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0": "7a28ccad6e7c4e64ab9113b9b760f8ec",
"com.google.firebase.functions/Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0": "20e25f7c9f0f4928bfb0b613fe37c854",
"com.google.firebase.installations/Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0": "adb3888328d4450ea0ec46b2ac77c162",
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0": "72dfdc78725f4c9695cbfa6af593ad29",
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0": "7ab34e4c1a934a6aa46e0e2100c70c1c",
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0": "745164b2d0e84e3c9fcdacb80782de8b"
}
}