Reflect changes made to our Open Source repo in order to fix build errors in release version 7.0.0. Reflecting the work made in the repo so that we don't export the problematic files again.

Fixes include:
  - Using std::mutex in app/heartbeat_date_storage_desktop.  Replaced its use with our own internal implementation of Mutex.
  - ios_pod CmakeList updated with sunmou@'s changes to fallback to the xcframework path for header resolution.
  - Updating main podfile to the new minimum supported iOS version of 10.0.
  - Added heartbeat_date_storage_desktop to app's cmakefile on Desktop and iOS.
  - Removed firebase_firestore_settings_ios files from firestore's cmake file.
  - Removed util_desktop_windows, macos and linux files from database CMakeLists. This implentation had been migrated to firebase/app.
  - Added play-services-base dependency to google_api_resources gradle file.
  - Added new lines to the ends of numerous build.gradle files.

PiperOrigin-RevId: 348119031

Author: DellaBitta

admob/admob_resources/build.gradle

@@ -54,4 +54,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('admob_resources')
+extractAndDexAarFile('admob_resources')

app/CMakeLists.txt

@@ -135,8 +135,6 @@ set(common_SRCS
     src/function_registry.cc
     src/future.cc
     src/future_manager.cc
-    src/heartbeat_date_storage_desktop.cc
-    src/heartbeat_info_desktop.cc
     src/path.cc
     src/reference_counted_future_impl.cc
     src/scheduler.cc
@@ -164,11 +162,15 @@ set(app_android_SRCS
 set(app_ios_SRCS
     src/app_ios.mm
     src/util_ios.mm
+    src/heartbeat_date_storage_desktop.cc
+    src/heartbeat_info_desktop.cc
     src/invites/ios/invites_receiver_internal_ios.mm
     src/invites/ios/invites_ios_startup.mm
     src/uuid_ios_darwin.mm)
 set(app_desktop_SRCS
     src/app_desktop.cc
+    src/heartbeat_date_storage_desktop.cc
+    src/heartbeat_info_desktop.ccx`
     src/invites/stub/invites_receiver_internal_stub.cc
     src/variant_util.cc)
 if(ANDROID)

app/app_resources/build.gradle

@@ -54,4 +54,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('app_resources')
+extractAndDexAarFile('app_resources')

app/google_api_resources/build.gradle

@@ -50,6 +50,7 @@ android {
 
 dependencies {
   implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.android.gms:play-services-base:17.5.0'
   implementation project(':app:app_resources')
 }
 
@@ -58,4 +59,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('google_api_resources')
+extractAndDexAarFile('google_api_resources')

app/invites_resources/build.gradle

@@ -55,4 +55,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('invites_resources')
+extractAndDexAarFile('invites_resources')

app/src/heartbeat_date_storage_desktop.cc

@@ -20,6 +20,7 @@
 #include <utility>
 
 #include "app/src/filesystem.h"
+#include "app/src/mutex.h"
 
 namespace FIREBASE_NAMESPACE {
 
@@ -29,8 +30,8 @@ const char kHeartbeatDir[] = "firebase-heartbeat";
 const char kHeartbeatFilename[] = "HEARTBEAT_INFO_STORAGE";
 
 // Returns the mutex that protects accesses to the storage file.
-std::mutex& FileMutex() {
-  static std::mutex* mutex_ = new std::mutex();
+Mutex& FileMutex() {
+  static Mutex* mutex_ = new Mutex(Mutex::kModeNonRecursive);
   return *mutex_;
 }
 
@@ -47,7 +48,7 @@ std::string GetFilename(std::string& error) {
 }  // namespace
 
 HeartbeatDateStorage::HeartbeatDateStorage() : filename_(GetFilename(error_)) {
-  std::lock_guard<std::mutex> lock(FileMutex());
+  MutexLock lock(FileMutex());
 
   // Ensure the file exists, otherwise the first attempt to read it would
   // fail.
@@ -69,7 +70,7 @@ bool HeartbeatDateStorage::ReadPersisted() {
 
   HeartbeatMap result;
 
-  std::lock_guard<std::mutex> lock(FileMutex());
+  MutexLock lock(FileMutex());
 
   std::ifstream f(filename_);
   if (!f) {
@@ -102,7 +103,7 @@ bool HeartbeatDateStorage::ReadPersisted() {
 bool HeartbeatDateStorage::WritePersisted() const {
   if (!IsValid()) return false;
 
-  std::lock_guard<std::mutex> lock(FileMutex());
+  MutexLock lock(FileMutex());
 
   std::ofstream f(filename_, std::ios_base::trunc);
   if (!f) {

app/src/heartbeat_date_storage_desktop.h

@@ -23,7 +23,6 @@
 
 #include <ctime>
 #include <map>
-#include <mutex>  // NOLINT(build/c++11)
 #include <string>
 
 namespace FIREBASE_NAMESPACE {

database/CMakeLists.txt

@@ -155,18 +155,8 @@ elseif(IOS)
   set(database_platform_SRCS
       "${ios_SRCS}")
 else()
-  # Add platform-specific util files.
-  if(MSVC)
-    set(desktop_extra_SRCS src/desktop/util_desktop_windows.cc)
-  elseif(APPLE)
-    set(desktop_extra_SRCS src/desktop/util_desktop_macos.mm)
-  else()
-    # Linux
-    set(desktop_extra_SRCS src/desktop/util_desktop_linux.cc)
-  endif()
   set(database_platform_SRCS
-        "${desktop_SRCS}"
-        "${desktop_extra_SRCS}")
+        "${desktop_SRCS}")
 endif()
 
 if(ANDROID OR IOS)

firestore/CMakeLists.txt

@@ -131,8 +131,6 @@ set(ios_SRCS
     src/ios/document_snapshot_ios.h
     src/ios/field_value_ios.cc
     src/ios/field_value_ios.h
-    src/ios/firebase_firestore_settings_ios.cc
-    src/ios/firebase_firestore_settings_ios.h
     src/ios/firestore_ios.cc
     src/ios/firestore_ios.h
     src/ios/hard_assert_ios.cc
@@ -247,6 +245,8 @@ elseif(IOS)
       FirebaseFirestore
       abseil
       nanopb
+      gRPC-C++
+      gRPC-Core
   )
 endif()
 

ios_pod/CMakeLists.txt

@@ -122,6 +122,18 @@ function(symlink_pod_headers target_name pod_name dir_name)
     file(GLOB framework_dir ${glob_dir})
   endif()
 
+  # If failed to find headers, try xcframework path.
+  if(NOT EXISTS ${framework_dir})
+    set(glob_dir "${FIREBASE_POD_DIR}/Pods/${pod_name}/${FRAMEWORK_DIR}/*/*.xcframework/*/*.framework/Headers")
+    file(GLOB framework_dirs ${glob_dir})
+    # xcframework contains several frameworks. Their Headers are the same. So it's okay use first framework's Headers
+    list(LENGTH framework_dirs dir_len)
+    if(dir_len GREATER 0)
+      list(GET framework_dirs 0 first_dir)
+      file(GLOB framework_dir ${first_dir})
+    endif()
+  endif()
+
   # Maybe this pod is not a framework, continue
   if(NOT EXISTS ${framework_dir})
     return()

ios_pod/Podfile

@@ -1,5 +1,5 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0'
+platform :ios, '10.0'
 
 target 'GetPods' do
   pod 'Firebase/Core', '7.0.0'