Merge pull request #142 from firebase/version_workflow

Fix build error caused by CPP SDK change

Author: cynthiajoan

app/src/cpp_instance_manager.h

@@ -24,7 +24,7 @@
 
 #include "app/src/assert.h"
 #include "app/src/log.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 
 namespace firebase {
 

app/src/swig/app.i

@@ -41,7 +41,7 @@
 
 #include "app/src/include/firebase/app.h"
 #include "app/src/callback.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/app_common.h"
 #include "app/src/log.h"
 #include "app/src/util.h"

auth/src/swig/auth.i

@@ -50,7 +50,7 @@
 #include "app/src/callback.h"
 #include "app/src/cleanup_notifier.h"
 #include "app/src/log.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 #include "app/memory/shared_ptr.h"
 #include "app/src/cpp_instance_manager.h"
 #include "auth/src/include/firebase/auth.h"

crashlytics/src/cpp/android/crashlytics_android.h

@@ -24,7 +24,7 @@
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/internal/common.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/util_android.h"
 
 namespace firebase {

crashlytics/src/cpp/common/crashlytics.cc

@@ -23,7 +23,7 @@
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/version.h"
 #include "app/src/log.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 #include "app/src/util.h"
 
 #if defined(__ANDROID__)

crashlytics/src/cpp/stub/crashlytics_stub.h

@@ -23,7 +23,7 @@
 #include "app/src/future_manager.h"
 #include "app/src/include/firebase/app.h"
 #include "app/src/include/firebase/internal/common.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 
 namespace firebase {
 namespace crashlytics {

database/src/swig/listener.i

@@ -26,7 +26,7 @@ enum ChildChangeType {
 %}
 
 %{
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 
 namespace firebase {
 namespace database {

messaging/src/swig/messaging.i

@@ -53,7 +53,8 @@
 #include <queue>
 #include <string>
 
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
+#include "app/src/log.h"
 
 namespace firebase {
 namespace messaging {
@@ -82,7 +83,7 @@ public:
   // MessageReceived on the main thread.
   virtual void OnMessage(const firebase::messaging::Message& message) {
     QueueItem(&messages_, message);
-    LogDebug("queued message %s", message.message_id.c_str());
+    firebase::LogDebug("queued message %s", message.message_id.c_str());
     SendPendingEvents();
   }
 
@@ -91,7 +92,7 @@ public:
   // TokenReceived on the main thread.
   virtual void OnTokenReceived(const char* token) {
     QueueItem(&tokens_, std::string(token));
-    LogDebug("queued token %s", token);
+    firebase::LogDebug("queued token %s", token);
     SendPendingEvents();
   }
 
@@ -132,7 +133,7 @@ public:
     if (g_message_callback_enabled) {
       while (messages_.size()) {
         const Message &message = messages_.front();
-        LogDebug("sending message %s", message.message_id.c_str());
+        firebase::LogDebug("sending message %s", message.message_id.c_str());
         firebase::callback::AddCallback(
             new firebase::callback::Callback1<firebase::messaging::Message>(
                 message, MessageReceived));
@@ -142,7 +143,7 @@ public:
     if (g_token_callback_enabled) {
       while (tokens_.size()) {
         const std::string &token = tokens_.front();
-        LogDebug("sending token %s", token.c_str());
+        firebase::LogDebug("sending token %s", token.c_str());
         firebase::callback::AddCallback(
             new firebase::callback::CallbackString(
                 token.c_str(), TokenReceived));

storage/src/swig/monitor_controller.h

@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include "app/src/callback.h"
-#include "app/src/mutex.h"
+#include "app/src/include/firebase/internal/mutex.h"
 #include "storage/src/include/firebase/storage.h"
 
 // NOTE: We only define SWIGSTDCALL here so that this header can be built as