Skip to content

Commit 7eb0af0

Browse files
cynthiajoancynthiajoan
authored
Merge pull request #9 from firebase/master
Merge from internal repo
2 parents 33a38e1 + 5b43215 commit 7eb0af0

File tree

4 files changed

+76
-23
lines changed

4 files changed

+76
-23
lines changed

‎cmake/android_dependencies.cmake

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,45 @@
1515
# This file defines the Android dependencies needed by all the modules.
1616

1717
set(FIREBASE_APP_ANDROID_DEPS
18-
"com.google.firebase:firebase-common:19.5.0"
19-
"com.google.firebase:firebase-analytics:18.0.3"
18+
"com.google.firebase:firebase-common:20.0.0"
19+
"com.google.firebase:firebase-analytics:19.0.0"
2020
)
2121

2222
set(FIREBASE_ANALYTICS_ANDROID_DEPS
23-
"com.google.firebase:firebase-analytics:18.0.3"
23+
"com.google.firebase:firebase-analytics:19.0.0"
2424
)
2525

2626
set(FIREBASE_AUTH_ANDROID_DEPS
27-
"com.google.firebase:firebase-auth:20.0.4"
28-
"com.google.firebase:firebase-analytics:18.0.3"
27+
"com.google.firebase:firebase-auth:21.0.0"
28+
"com.google.firebase:firebase-analytics:19.0.0"
2929
)
3030

3131
set(FIREBASE_DATABASE_ANDROID_DEPS
32-
"com.google.firebase:firebase-database:19.7.0"
33-
"com.google.firebase:firebase-analytics:18.0.3"
32+
"com.google.firebase:firebase-database:20.0.0"
33+
"com.google.firebase:firebase-analytics:19.0.0"
3434
)
3535

3636
set(FIREBASE_DYNAMIC_LINKS_ANDROID_DEPS
3737
"com.google.android.gms:play-services-appinvite:18.0.0"
38-
"com.google.firebase:firebase-analytics:18.0.3"
38+
"com.google.firebase:firebase-analytics:19.0.0"
3939
)
4040

4141
set(FIREBASE_FUNCTIONS_ANDROID_DEPS
42-
"com.google.firebase:firebase-functions:19.2.0"
43-
"com.google.firebase:firebase-analytics:18.0.3"
44-
)
45-
46-
set(FIREBASE_INSTANCE_ID_ANDROID_DEPS
47-
"com.google.firebase:firebase-iid:21.1.0"
48-
"com.google.firebase:firebase-analytics:18.0.3"
42+
"com.google.firebase:firebase-functions:20.0.0"
43+
"com.google.firebase:firebase-analytics:19.0.0"
4944
)
5045

5146
set(FIREBASE_MESSAGING_ANDROID_DEPS
52-
"com.google.firebase:firebase-messaging:21.1.0"
53-
"com.google.firebase:firebase-analytics:18.0.3"
47+
"com.google.firebase:firebase-messaging:22.0.0"
48+
"com.google.firebase:firebase-analytics:19.0.0"
5449
)
5550

5651
set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS
57-
"com.google.firebase:firebase-config:20.0.4"
58-
"com.google.firebase:firebase-analytics:18.0.3"
52+
"com.google.firebase:firebase-config:21.0.0"
53+
"com.google.firebase:firebase-analytics:19.0.0"
5954
)
6055

6156
set(FIREBASE_STORAGE_ANDROID_DEPS
62-
"com.google.firebase:firebase-storage:19.2.2"
63-
"com.google.firebase:firebase-analytics:18.0.3"
57+
"com.google.firebase:firebase-storage:20.0.0"
58+
"com.google.firebase:firebase-analytics:19.0.0"
6459
)

‎database/src/MutableData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public bool HasChild(string path) {
166166
/// <param name="path">A relative path</param>
167167
/// <returns>An instance encapsulating the data and priority at the given path</returns>
168168
public MutableData Child(string path) {
169-
return new MutableData(internalData.Child(path), database);
169+
return new MutableData(internalData.GetChild(path), database);
170170
}
171171

172172
/// Two MutableData are considered equal if they contain the same references and priority.

‎database/src/swig/database.i

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ static CppInstanceManager<Database> g_database_instances;
123123
%rename("%s") firebase::database::MutableData::priority;
124124
%rename("%s") firebase::database::MutableData::set_priority;
125125
%rename("%s") firebase::database::MutableData::HasChild;
126-
%rename("%s") firebase::database::MutableData::Child;
127126
%rename("%s") firebase::database::MutableData::ChildrenEnumerator;
128127

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

177176
%newobject firebase::database::MutableData::ChildrenEnumerator;
177+
%rename("%s") firebase::database::MutableData::GetChild;
178178
%extend firebase::database::MutableData {
179179
firebase::database::MutableDataChildrenEnumerator* ChildrenEnumerator() {
180180
return new firebase::database::MutableDataChildrenEnumerator($self->children());
181181
}
182+
183+
// Return a pointer to a move constructed Child, since swig tries to use
184+
// a copy constructor otherwise.
185+
firebase::database::MutableData* GetChild(const char* path) {
186+
return new firebase::database::MutableData($self->Child(path));
187+
}
182188
}

‎unity_packer/guids.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3571,5 +3571,57 @@
35713571
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/7.2.0": "5411c331f88c46db86047f1d91538b2d",
35723572
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/7.2.0": "f25624d599e847b9be878c2ff1b32639",
35733573
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/7.2.0": "67a55124dd0a4612b5e8d6b162e949b9"
3574+
},
3575+
"8.0.0": {
3576+
"Firebase/Editor/FirebaseAnalytics_version-8.0.0_manifest.txt": "22d1aa195c38483aa6715a0843a3a1f7",
3577+
"Firebase/Editor/FirebaseAuth_version-8.0.0_manifest.txt": "02d228df07574cb49e3f6ee56a519d4f",
3578+
"Firebase/Editor/FirebaseCrashlytics_version-8.0.0_manifest.txt": "896b6ec81c7344d1adc2412697db8911",
3579+
"Firebase/Editor/FirebaseDatabase_version-8.0.0_manifest.txt": "0c8f351c66784616a1fa43b4c4116a50",
3580+
"Firebase/Editor/FirebaseDynamicLinks_version-8.0.0_manifest.txt": "69b772bc654040de8b68d9abd42160ad",
3581+
"Firebase/Editor/FirebaseFirestore_version-8.0.0_manifest.txt": "96c536b8615649eb9b903160ebce0562",
3582+
"Firebase/Editor/FirebaseFunctions_version-8.0.0_manifest.txt": "43e0677de8f64c38897d56023d933e96",
3583+
"Firebase/Editor/FirebaseInstallations_version-8.0.0_manifest.txt": "80fbdd6d14fb47f485d6307eb5da3dff",
3584+
"Firebase/Editor/FirebaseMessaging_version-8.0.0_manifest.txt": "bb2e357c66394904b70852b1b107d2b6",
3585+
"Firebase/Editor/FirebaseRemoteConfig_version-8.0.0_manifest.txt": "b38b04ce83ff48eca44fda28ef808f73",
3586+
"Firebase/Editor/FirebaseStorage_version-8.0.0_manifest.txt": "78b2b112c6f4459bb1c232ee51195619",
3587+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.bundle": "8eee7073d8714ef5a88ce7eacd43f23d",
3588+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.dll": "4cba8f5e0a4b436382e025602ea0c436",
3589+
"Firebase/Plugins/x86_64/FirebaseCppApp-8_0_0.so": "de8a9403a0ee4a29a6a13013ac154ffa",
3590+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0/firebase-analytics-unity-8.0.0.pom": "c48c1e7e1e2147e78b46ec9c087835f4",
3591+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0/firebase-analytics-unity-8.0.0.srcaar": "f661527059444de89f7bc2d3765d45ab",
3592+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0/firebase-app-unity-8.0.0.pom": "ecd00fe6fe3e44afad21cb8ebd8b79fb",
3593+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0/firebase-app-unity-8.0.0.srcaar": "f952ee706a374fb9ad273ca33ed589be",
3594+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0/firebase-auth-unity-8.0.0.pom": "bdd688e965b241628b7f67f712b0c250",
3595+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0/firebase-auth-unity-8.0.0.srcaar": "ca5240b383964106befb61bd6e6fbebf",
3596+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0/firebase-config-unity-8.0.0.pom": "3ac318f6da8e42e6b58a09b4b770f2f0",
3597+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0/firebase-config-unity-8.0.0.srcaar": "93ab422bceac44e9b2a766886fba9178",
3598+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0/firebase-crashlytics-unity-8.0.0.pom": "aed06c2b6d5a44c2adb6ab35061fc44b",
3599+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0/firebase-crashlytics-unity-8.0.0.srcaar": "dcb0167e571f40bc99c960f90aa52c7f",
3600+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0/firebase-database-unity-8.0.0.pom": "c2e6299427a1455c8c89d5ee7b4aa0aa",
3601+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0/firebase-database-unity-8.0.0.srcaar": "171079827a2745adb43bcc26da75038b",
3602+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0/firebase-dynamic-links-unity-8.0.0.pom": "3bc81a5104e1433f8bf24cd88b739563",
3603+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0/firebase-dynamic-links-unity-8.0.0.srcaar": "c89fa71b2c414b0180425ac5629b38ca",
3604+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0/firebase-firestore-unity-8.0.0.pom": "6cba8c66d73a4d25975cf8e0fe72b3da",
3605+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0/firebase-firestore-unity-8.0.0.srcaar": "a62920691d50462985d01ae801ab2fef",
3606+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0/firebase-functions-unity-8.0.0.pom": "0316c82772eb4c3cb787722a0c588999",
3607+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0/firebase-functions-unity-8.0.0.srcaar": "e93d96b1ebfe4af092bfded6beec0f9d",
3608+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0/firebase-installations-unity-8.0.0.pom": "a01f166d68c647658961ecaa152075ad",
3609+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0/firebase-installations-unity-8.0.0.srcaar": "8645267d74254f48928e00e727181d61",
3610+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0/firebase-messaging-unity-8.0.0.pom": "0d718cf2f4b140bc8415df4bc303900a",
3611+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0/firebase-messaging-unity-8.0.0.srcaar": "7bc0bc9f04314c3a82d32320377d601b",
3612+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0/firebase-storage-unity-8.0.0.pom": "597480dc0c604e7eb4500871f645eb4a",
3613+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0/firebase-storage-unity-8.0.0.srcaar": "a05b2222e17d45bfbf271761e1fce92c",
3614+
"com.google.firebase.analytics/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/8.0.0": "1aa3e0b75b794addac1ec05c5c8d9565",
3615+
"com.google.firebase.app/Firebase/m2repository/com/google/firebase/firebase-app-unity/8.0.0": "8eeb0c54c12c451ebd47d3111f5cbb0e",
3616+
"com.google.firebase.auth/Firebase/m2repository/com/google/firebase/firebase-auth-unity/8.0.0": "735e4cbbc3ab4bd3ad29fcd597e9e146",
3617+
"com.google.firebase.crashlytics/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/8.0.0": "611c7ad47f674fdf9c787ee4bd95bb0c",
3618+
"com.google.firebase.database/Firebase/m2repository/com/google/firebase/firebase-database-unity/8.0.0": "63bf872d5ce347baaa75c5c119422036",
3619+
"com.google.firebase.dynamic-links/Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/8.0.0": "74bbc910e6664a8e8ad6c0aa0b386821",
3620+
"com.google.firebase.firestore/Firebase/m2repository/com/google/firebase/firebase-firestore-unity/8.0.0": "7a28ccad6e7c4e64ab9113b9b760f8ec",
3621+
"com.google.firebase.functions/Firebase/m2repository/com/google/firebase/firebase-functions-unity/8.0.0": "20e25f7c9f0f4928bfb0b613fe37c854",
3622+
"com.google.firebase.installations/Firebase/m2repository/com/google/firebase/firebase-installations-unity/8.0.0": "adb3888328d4450ea0ec46b2ac77c162",
3623+
"com.google.firebase.messaging/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/8.0.0": "72dfdc78725f4c9695cbfa6af593ad29",
3624+
"com.google.firebase.remote-config/Firebase/m2repository/com/google/firebase/firebase-config-unity/8.0.0": "7ab34e4c1a934a6aa46e0e2100c70c1c",
3625+
"com.google.firebase.storage/Firebase/m2repository/com/google/firebase/firebase-storage-unity/8.0.0": "745164b2d0e84e3c9fcdacb80782de8b"
35743626
}
35753627
}

0 commit comments

Comments
 (0)