From 2dda243c9c29cf5e5042635bbb84721e88a37b44 Mon Sep 17 00:00:00 2001 From: a-maurice Date: Thu, 19 May 2022 10:30:16 -0700 Subject: [PATCH] Fix messaging duplicate symbol bug (#301) --- cmake/android_dependencies.cmake | 4 +++- docs/readme.md | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/android_dependencies.cmake b/cmake/android_dependencies.cmake index 0c400021..792b9cfd 100644 --- a/cmake/android_dependencies.cmake +++ b/cmake/android_dependencies.cmake @@ -60,9 +60,11 @@ set(FIREBASE_INSTALLATIONS_ANDROID_DEPS "com.google.firebase:firebase-analytics:21.0.0" ) +# iid is needed by messaging to avoid a conflict with functions set(FIREBASE_MESSAGING_ANDROID_DEPS "com.google.firebase:firebase-messaging:23.0.4" "com.google.firebase:firebase-analytics:21.0.0" + "com.google.firebase:firebase-iid:21.1.0" ) set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS @@ -73,4 +75,4 @@ set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS set(FIREBASE_STORAGE_ANDROID_DEPS "com.google.firebase:firebase-storage:20.0.1" "com.google.firebase:firebase-analytics:21.0.0" -) \ No newline at end of file +) diff --git a/docs/readme.md b/docs/readme.md index cdc31c93..64c51767 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -164,6 +164,8 @@ Release Notes - Analytics: Removed deprecated event names and parameters. - Crashlytics (Android): Fixed a bug with missing symbols when enabling minification via proguard. + - Messaging (Android): Fixed a bug with duplicate symbols when also + using Functions. - Realtime Database (Desktop): Fixed a bug handling server timestamps on 32-bit CPUs. - Storage (Desktop): Set Content-Type HTTP header when uploading with