Integrate Latest @ 250918462

Ryan Meier · Ryan Meier · commit 66670244cc2b · 2019-06-06T16:09:45.000-07:00
Changes to all...
- Update Firebase C++/Unity to use Firebase iOS 6.1.0
- Add the gssapi_krb5 system library, and the GSS and Foundation frameworks to Mac Desktop builds
Changes to functions/testapp ...
- Update C++ tests to match new iOS behavior.

CL: 250918462
diff --git a/admob/testapp/Podfile b/admob/testapp/Podfile
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # AdMob test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/AdMob', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/AdMob', '6.1.0'
 end
diff --git a/analytics/testapp/Podfile b/analytics/testapp/Podfile
@@ -2,5 +2,5 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Analytics test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
 end
diff --git a/auth/testapp/CMakeLists.txt b/auth/testapp/CMakeLists.txt
@@ -87,9 +87,11 @@ else()
 
   if(APPLE)
     set(ADDITIONAL_LIBS
+      gssapi_krb5
       pthread
       "-framework CoreFoundation"
       "-framework Foundation"
+      "-framework GSS"
       "-framework Security"
     )
   elseif(MSVC)
diff --git a/auth/testapp/Podfile b/auth/testapp/Podfile
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Auth test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/Auth', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/Auth', '6.1.0'
 end
diff --git a/database/testapp/CMakeLists.txt b/database/testapp/CMakeLists.txt
@@ -87,9 +87,11 @@ else()
 
   if(APPLE)
     set(ADDITIONAL_LIBS
+      gssapi_krb5
       pthread
       "-framework CoreFoundation"
       "-framework Foundation"
+      "-framework GSS"
       "-framework Security"
     )
   elseif(MSVC)
diff --git a/database/testapp/Podfile b/database/testapp/Podfile
@@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Firebase Realtime Database test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/Database', '6.0.0'
-  pod 'Firebase/Auth', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/Database', '6.1.0'
+  pod 'Firebase/Auth', '6.1.0'
 end
diff --git a/dynamic_links/testapp/Podfile b/dynamic_links/testapp/Podfile
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Dynamic Links test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/DynamicLinks', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/DynamicLinks', '6.1.0'
 end
diff --git a/functions/testapp/CMakeLists.txt b/functions/testapp/CMakeLists.txt
@@ -87,13 +87,15 @@ else()
 
   if(APPLE)
     set(ADDITIONAL_LIBS
+      gssapi_krb5
       pthread
       "-framework CoreFoundation"
       "-framework Foundation"
+      "-framework GSS"
       "-framework Security"
     )
   elseif(MSVC)
-    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32)
+    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32 rpcrt4 ole32)
   else()
     set(ADDITIONAL_LIBS pthread)
   endif()
diff --git a/functions/testapp/Podfile b/functions/testapp/Podfile
@@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Cloud Functions for Firebase test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/Functions', '6.0.0'
-  pod 'Firebase/Auth', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/Functions', '6.1.0'
+  pod 'Firebase/Auth', '6.1.0'
 end
diff --git a/messaging/testapp/Podfile b/messaging/testapp/Podfile
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # FCM test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/Messaging', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/Messaging', '6.1.0'
 end
diff --git a/messaging/testapp/src/common_main.cc b/messaging/testapp/src/common_main.cc
@@ -155,6 +155,11 @@ extern "C" int common_main(int argc, const char* argv[]) {
       }
       if (message.notification) {
         LogMessage("notification:");
+        if (message.notification->android) {
+          LogMessage("  android:");
+          LogMessage("    channel_id: %s",
+                     message.notification->android->channel_id.c_str());
+        }
         if (!message.notification->title.empty()) {
           LogMessage("  title: %s", message.notification->title.c_str());
         }
diff --git a/remote_config/testapp/CMakeLists.txt b/remote_config/testapp/CMakeLists.txt
@@ -87,12 +87,15 @@ else()
 
   if(APPLE)
     set(ADDITIONAL_LIBS
+      gssapi_krb5
       pthread
       "-framework CoreFoundation"
+      "-framework Foundation"
+      "-framework GSS"
       "-framework Security"
     )
   elseif(MSVC)
-    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32)
+    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32 rpcrt4 ole32)
   else()
     set(ADDITIONAL_LIBS pthread)
   endif()
diff --git a/remote_config/testapp/Podfile b/remote_config/testapp/Podfile
@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Firebase Remote Config test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/RemoteConfig', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/RemoteConfig', '6.1.0'
 end
diff --git a/storage/testapp/CMakeLists.txt b/storage/testapp/CMakeLists.txt
@@ -87,9 +87,11 @@ else()
 
   if(APPLE)
     set(ADDITIONAL_LIBS
+      gssapi_krb5
       pthread
       "-framework CoreFoundation"
       "-framework Foundation"
+      "-framework GSS"
       "-framework Security"
     )
   elseif(MSVC)
diff --git a/storage/testapp/Podfile b/storage/testapp/Podfile
@@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Cloud Storage for Firebase test application.
 target 'testapp' do
-  pod 'Firebase/Analytics', '6.0.0'
-  pod 'Firebase/Storage', '6.0.0'
-  pod 'Firebase/Auth', '6.0.0'
+  pod 'Firebase/Analytics', '6.1.0'
+  pod 'Firebase/Storage', '6.1.0'
+  pod 'Firebase/Auth', '6.1.0'
 end
diff --git a/storage/testapp/src/common_main.cc b/storage/testapp/src/common_main.cc
@@ -78,6 +78,24 @@ void WaitForCompletion(const firebase::FutureBase& future, const char* name) {
   }
 }
 
+void EnsureRefsEqual(
+    std::initializer_list<firebase::storage::StorageReference*> refs) {
+  using firebase::storage::StorageReference;
+  for (StorageReference* ref : refs) {
+    for (StorageReference* compare_to : refs) {
+      if (ref->bucket() != compare_to->bucket()) {
+        LogMessage(
+            "ERROR: StorageReferences unequal. Buckets differ: '%s' vs '%s'",
+            ref->bucket().c_str(), compare_to->bucket().c_str());
+      } else if (ref->full_path() != compare_to->full_path()) {
+        LogMessage(
+            "ERROR: StorageReferences unequal. full_paths differ: '%s' vs '%s'",
+            ref->full_path().c_str(), compare_to->full_path().c_str());
+      }
+    }
+  }
+}
+
 extern "C" int common_main(int argc, const char* argv[]) {
   ::firebase::App* app;
 
@@ -164,9 +182,18 @@ extern "C" int common_main(int argc, const char* argv[]) {
   std::string saved_url = buffer;
 
   // Create a unique child in the storage that we can run our tests in.
-  firebase::storage::StorageReference ref;
+  firebase::storage::StorageReference ref, ref2, ref3, ref4;
   ref = storage->GetReference("test_app_data").Child(saved_url);
 
+  // Create the same reference in a few different manners and ensure they're
+  // equivalent.
+  // NOLINTNEXTLINE intentional redundant string conversion
+  ref2 = storage->GetReference(std::string("test_app_data")).Child(saved_url);
+  std::string url = storage->url() + "/test_app_data";
+  ref3 = storage->GetReferenceFromUrl(url.c_str()).Child(saved_url);
+  ref4 = storage->GetReferenceFromUrl(url).Child(saved_url);
+  EnsureRefsEqual({&ref, &ref2, &ref3, &ref4});
+
   firebase::storage::Metadata test_metadata;
 
   LogMessage("Storage URL: gs://%s%s", ref.bucket().c_str(),
